Light, fluffy, and always free - The AWS Local Emulator alternative
chore(style): replace var in files no open PR touches (#4789)
TATSUNO “Taz” Yasuhiro4e842a85aaf9
diff --git a/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java b/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.javaindex ea94fb6f94..2a348e9193 100644--- a/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java+++ b/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java@@ -17,6 +17,7 @@ import software.amazon.awssdk.services.cognitoidentityprovider.CognitoIdentityPrimport software.amazon.awssdk.services.dynamodb.DynamoDbClient;import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;import software.amazon.awssdk.services.eventbridge.EventBridgeClient;+import software.amazon.awssdk.services.resourceexplorer2.ResourceExplorer2ClientBuilder;import software.amazon.awssdk.services.servicediscovery.ServiceDiscoveryClient;import software.amazon.awssdk.services.emr.EmrClient;import software.amazon.awssdk.services.emrserverless.EmrServerlessClient;@@ -1417,7 +1418,7 @@ public final class TestFixtures {* to exercise a real create against a region that starts with no index.*/public static ResourceExplorer2Client resourceExplorer2Client(Region region) {- var builder = ResourceExplorer2Client.builder().region(region);+ ResourceExplorer2ClientBuilder builder = ResourceExplorer2Client.builder().region(region);if (!isRealAws()) {builder.endpointOverride(ENDPOINT).credentialsProvider(CREDENTIALS);}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AbstractKinesisAnalyticsV2LifecycleTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AbstractKinesisAnalyticsV2LifecycleTest.javaindex 0a4246a42d..7eaaed8189 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AbstractKinesisAnalyticsV2LifecycleTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AbstractKinesisAnalyticsV2LifecycleTest.java@@ -17,6 +17,7 @@ import software.amazon.awssdk.services.kinesisanalyticsv2.model.DeleteApplicatioimport software.amazon.awssdk.services.kinesisanalyticsv2.model.DescribeApplicationRequest;import software.amazon.awssdk.services.kinesisanalyticsv2.model.KinesisAnalyticsV2Exception;import software.amazon.awssdk.services.kinesisanalyticsv2.model.ListApplicationsRequest;+import software.amazon.awssdk.services.kinesisanalyticsv2.model.ListApplicationsResponse;import software.amazon.awssdk.services.kinesisanalyticsv2.model.RuntimeEnvironment;import software.amazon.awssdk.services.kinesisanalyticsv2.model.StartApplicationRequest;import software.amazon.awssdk.services.kinesisanalyticsv2.model.StopApplicationRequest;@@ -134,7 +135,7 @@ abstract class AbstractKinesisAnalyticsV2LifecycleTest {void listApplicationsIncludesCreated() {requireApp();- var response = kda.listApplications(ListApplicationsRequest.builder().build());+ ListApplicationsResponse response = kda.listApplications(ListApplicationsRequest.builder().build());assertThat(response.applicationSummaries()).anyMatch(s -> s.applicationName().equals(applicationName));}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AccessAnalyzerTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AccessAnalyzerTest.javaindex aab6b40c61..d162c3296b 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AccessAnalyzerTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AccessAnalyzerTest.java@@ -4,6 +4,7 @@ import org.jboss.logging.Logger;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.accessanalyzer.AccessAnalyzerClient;+import software.amazon.awssdk.services.accessanalyzer.model.ListAnalyzersResponse;import software.amazon.awssdk.services.accessanalyzer.model.ServiceQuotaExceededException;import software.amazon.awssdk.services.accessanalyzer.model.Type;@@ -28,7 +29,7 @@ class AccessAnalyzerTest {client.createAnalyzer(request -> request.analyzerName(accountName).type(Type.ACCOUNT));client.createAnalyzer(request -> request.analyzerName(unusedName).type(Type.ACCOUNT_UNUSED_ACCESS));- var listed = client.listAnalyzers(request -> {});+ ListAnalyzersResponse listed = client.listAnalyzers(request -> {});assertThat(listed.analyzers()).extracting(analyzer -> analyzer.name()).contains(accountName, unusedName);diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AccountAlternateContactTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AccountAlternateContactTest.javaindex 8b207636c9..dd7cffc8c3 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AccountAlternateContactTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AccountAlternateContactTest.java@@ -4,6 +4,7 @@ import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.account.AccountClient;import software.amazon.awssdk.services.account.model.AlternateContactType;+import software.amazon.awssdk.services.account.model.GetAlternateContactResponse;import static org.assertj.core.api.Assertions.assertThat;import static org.junit.jupiter.api.Assumptions.assumeFalse;@@ -23,7 +24,7 @@ class AccountAlternateContactTest {.phoneNumber("+1 555 0100").title("Security"));- var response = account.getAlternateContact(request -> request+ GetAlternateContactResponse response = account.getAlternateContact(request -> request.alternateContactType(AlternateContactType.SECURITY));assertThat(response.alternateContact()).isNotNull();assertThat(response.alternateContact().emailAddress()).isEqualTo("[email protected]");diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AcmTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AcmTest.javaindex 3c4dee2bac..7bd4fa6c2f 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AcmTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AcmTest.java@@ -330,7 +330,7 @@ class AcmTest {.expiryEvents(e -> e.daysBeforeExpiry(45)).idempotencyToken(TestFixtures.uniqueName()));- var response = acm.getAccountConfiguration(b -> b.build());+ GetAccountConfigurationResponse response = acm.getAccountConfiguration(b -> b.build());assertThat(response.expiryEvents()).isNotNull();assertThat(response.expiryEvents().daysBeforeExpiry()).isEqualTo(45);diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AmazonMqTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AmazonMqTest.javaindex ffffdd3661..fff6673a41 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AmazonMqTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AmazonMqTest.java@@ -14,11 +14,13 @@ import software.amazon.awssdk.services.mq.model.CreateBrokerRequest;import software.amazon.awssdk.services.mq.model.CreateBrokerResponse;import software.amazon.awssdk.services.mq.model.CreateUserRequest;import software.amazon.awssdk.services.mq.model.DeleteBrokerRequest;+import software.amazon.awssdk.services.mq.model.DeleteBrokerResponse;import software.amazon.awssdk.services.mq.model.DeploymentMode;import software.amazon.awssdk.services.mq.model.DescribeBrokerRequest;import software.amazon.awssdk.services.mq.model.DescribeBrokerResponse;import software.amazon.awssdk.services.mq.model.EngineType;import software.amazon.awssdk.services.mq.model.ListBrokersRequest;+import software.amazon.awssdk.services.mq.model.ListBrokersResponse;import software.amazon.awssdk.services.mq.model.MqException;import software.amazon.awssdk.services.mq.model.User;@@ -109,7 +111,7 @@ class AmazonMqTest {void listBrokersIncludesCreated() {requireBroker();- var response = mq.listBrokers(ListBrokersRequest.builder().build());+ ListBrokersResponse response = mq.listBrokers(ListBrokersRequest.builder().build());assertThat(response.brokerSummaries()).anyMatch(b -> b.brokerId().equals(brokerId));}@@ -132,7 +134,7 @@ class AmazonMqTest {void deleteBroker() {requireBroker();- var response = mq.deleteBroker(DeleteBrokerRequest.builder().brokerId(brokerId).build());+ DeleteBrokerResponse response = mq.deleteBroker(DeleteBrokerRequest.builder().brokerId(brokerId).build());assertThat(response.brokerId()).isEqualTo(brokerId);brokerId = null;}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayV2ManagementTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayV2ManagementTest.javaindex 21ec5ab97d..ac4b1a29ed 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayV2ManagementTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayV2ManagementTest.java@@ -12,11 +12,17 @@ import software.amazon.awssdk.services.apigatewayv2.ApiGatewayV2Client;import software.amazon.awssdk.services.apigatewayv2.model.ApiGatewayV2Exception;import software.amazon.awssdk.services.apigatewayv2.model.AuthorizerType;import software.amazon.awssdk.services.apigatewayv2.model.CreateApiRequest;+import software.amazon.awssdk.services.apigatewayv2.model.CreateApiResponse;import software.amazon.awssdk.services.apigatewayv2.model.CreateAuthorizerRequest;+import software.amazon.awssdk.services.apigatewayv2.model.CreateAuthorizerResponse;import software.amazon.awssdk.services.apigatewayv2.model.CreateDeploymentRequest;+import software.amazon.awssdk.services.apigatewayv2.model.CreateDeploymentResponse;import software.amazon.awssdk.services.apigatewayv2.model.CreateIntegrationRequest;+import software.amazon.awssdk.services.apigatewayv2.model.CreateIntegrationResponse;import software.amazon.awssdk.services.apigatewayv2.model.CreateRouteRequest;+import software.amazon.awssdk.services.apigatewayv2.model.CreateRouteResponse;import software.amazon.awssdk.services.apigatewayv2.model.CreateStageRequest;+import software.amazon.awssdk.services.apigatewayv2.model.CreateStageResponse;import software.amazon.awssdk.services.apigatewayv2.model.DeleteApiRequest;import software.amazon.awssdk.services.apigatewayv2.model.DeleteAuthorizerRequest;import software.amazon.awssdk.services.apigatewayv2.model.DeleteDeploymentRequest;@@ -24,17 +30,28 @@ import software.amazon.awssdk.services.apigatewayv2.model.DeleteIntegrationRequeimport software.amazon.awssdk.services.apigatewayv2.model.DeleteRouteRequest;import software.amazon.awssdk.services.apigatewayv2.model.DeleteStageRequest;import software.amazon.awssdk.services.apigatewayv2.model.GetApiRequest;+import software.amazon.awssdk.services.apigatewayv2.model.GetApiResponse;import software.amazon.awssdk.services.apigatewayv2.model.GetApisResponse;import software.amazon.awssdk.services.apigatewayv2.model.GetAuthorizerRequest;+import software.amazon.awssdk.services.apigatewayv2.model.GetAuthorizerResponse;import software.amazon.awssdk.services.apigatewayv2.model.GetAuthorizersRequest;+import software.amazon.awssdk.services.apigatewayv2.model.GetAuthorizersResponse;import software.amazon.awssdk.services.apigatewayv2.model.GetDeploymentRequest;+import software.amazon.awssdk.services.apigatewayv2.model.GetDeploymentResponse;import software.amazon.awssdk.services.apigatewayv2.model.GetDeploymentsRequest;+import software.amazon.awssdk.services.apigatewayv2.model.GetDeploymentsResponse;import software.amazon.awssdk.services.apigatewayv2.model.GetIntegrationRequest;+import software.amazon.awssdk.services.apigatewayv2.model.GetIntegrationResponse;import software.amazon.awssdk.services.apigatewayv2.model.GetIntegrationsRequest;+import software.amazon.awssdk.services.apigatewayv2.model.GetIntegrationsResponse;import software.amazon.awssdk.services.apigatewayv2.model.GetRouteRequest;+import software.amazon.awssdk.services.apigatewayv2.model.GetRouteResponse;import software.amazon.awssdk.services.apigatewayv2.model.GetRoutesRequest;+import software.amazon.awssdk.services.apigatewayv2.model.GetRoutesResponse;import software.amazon.awssdk.services.apigatewayv2.model.GetStageRequest;+import software.amazon.awssdk.services.apigatewayv2.model.GetStageResponse;import software.amazon.awssdk.services.apigatewayv2.model.GetStagesRequest;+import software.amazon.awssdk.services.apigatewayv2.model.GetStagesResponse;import software.amazon.awssdk.services.apigatewayv2.model.IntegrationType;import software.amazon.awssdk.services.apigatewayv2.model.NotFoundException;import software.amazon.awssdk.services.apigatewayv2.model.ProtocolType;@@ -99,7 +116,7 @@ class ApiGatewayV2ManagementTest {@Test@Order(1)void createApi() {- var response = apigwv2.createApi(CreateApiRequest.builder()+ CreateApiResponse response = apigwv2.createApi(CreateApiRequest.builder().name(TestFixtures.uniqueName("http-api")).protocolType(ProtocolType.HTTP).build());@@ -117,7 +134,7 @@ class ApiGatewayV2ManagementTest {@Order(2)void getApi() {requireApi();- var response = apigwv2.getApi(GetApiRequest.builder()+ GetApiResponse response = apigwv2.getApi(GetApiRequest.builder().apiId(apiId).build());@@ -140,7 +157,7 @@ class ApiGatewayV2ManagementTest {@Order(4)void createAuthorizer() {requireApi();- var response = apigwv2.createAuthorizer(CreateAuthorizerRequest.builder()+ CreateAuthorizerResponse response = apigwv2.createAuthorizer(CreateAuthorizerRequest.builder().apiId(apiId).name(TestFixtures.uniqueName("jwt-auth")).authorizerType(AuthorizerType.JWT)@@ -164,14 +181,14 @@ class ApiGatewayV2ManagementTest {void getAndListAuthorizers() {requireApi();requireAuthorizer();- var getResponse = apigwv2.getAuthorizer(GetAuthorizerRequest.builder()+ GetAuthorizerResponse getResponse = apigwv2.getAuthorizer(GetAuthorizerRequest.builder().apiId(apiId).authorizerId(authorizerId).build());assertThat(getResponse.authorizerId()).isEqualTo(authorizerId);- var listResponse = apigwv2.getAuthorizers(GetAuthorizersRequest.builder()+ GetAuthorizersResponse listResponse = apigwv2.getAuthorizers(GetAuthorizersRequest.builder().apiId(apiId).build());@@ -184,7 +201,7 @@ class ApiGatewayV2ManagementTest {@Order(6)void createIntegration() {requireApi();- var response = apigwv2.createIntegration(CreateIntegrationRequest.builder()+ CreateIntegrationResponse response = apigwv2.createIntegration(CreateIntegrationRequest.builder().apiId(apiId).integrationType(IntegrationType.AWS_PROXY).integrationUri("arn:aws:lambda:us-east-1:000000000000:function:phase2-handler")@@ -204,14 +221,14 @@ class ApiGatewayV2ManagementTest {void getAndListIntegrations() {requireApi();requireIntegration();- var getResponse = apigwv2.getIntegration(GetIntegrationRequest.builder()+ GetIntegrationResponse getResponse = apigwv2.getIntegration(GetIntegrationRequest.builder().apiId(apiId).integrationId(integrationId).build());assertThat(getResponse.integrationId()).isEqualTo(integrationId);- var listResponse = apigwv2.getIntegrations(GetIntegrationsRequest.builder()+ GetIntegrationsResponse listResponse = apigwv2.getIntegrations(GetIntegrationsRequest.builder().apiId(apiId).build());@@ -226,7 +243,7 @@ class ApiGatewayV2ManagementTest {requireApi();requireAuthorizer();requireIntegration();- var response = apigwv2.createRoute(CreateRouteRequest.builder()+ CreateRouteResponse response = apigwv2.createRoute(CreateRouteRequest.builder().apiId(apiId).routeKey("GET /phase2").authorizationType("JWT")@@ -247,14 +264,14 @@ class ApiGatewayV2ManagementTest {void getAndListRoutes() {requireApi();requireRoute();- var getResponse = apigwv2.getRoute(GetRouteRequest.builder()+ GetRouteResponse getResponse = apigwv2.getRoute(GetRouteRequest.builder().apiId(apiId).routeId(routeId).build());assertThat(getResponse.routeId()).isEqualTo(routeId);- var listResponse = apigwv2.getRoutes(GetRoutesRequest.builder()+ GetRoutesResponse listResponse = apigwv2.getRoutes(GetRoutesRequest.builder().apiId(apiId).build());@@ -267,7 +284,7 @@ class ApiGatewayV2ManagementTest {@Order(10)void createDeployment() {requireApi();- var response = apigwv2.createDeployment(CreateDeploymentRequest.builder()+ CreateDeploymentResponse response = apigwv2.createDeployment(CreateDeploymentRequest.builder().apiId(apiId).description("phase2 deployment").build());@@ -285,7 +302,7 @@ class ApiGatewayV2ManagementTest {void getAndListDeployments() {requireApi();requireDeployment();- var getResponse = apigwv2.getDeployment(GetDeploymentRequest.builder()+ GetDeploymentResponse getResponse = apigwv2.getDeployment(GetDeploymentRequest.builder().apiId(apiId).deploymentId(deploymentId).build());@@ -293,7 +310,7 @@ class ApiGatewayV2ManagementTest {assertThat(getResponse.deploymentId()).isEqualTo(deploymentId);assertThat(getResponse.description()).isEqualTo("phase2 deployment");- var listResponse = apigwv2.getDeployments(GetDeploymentsRequest.builder()+ GetDeploymentsResponse listResponse = apigwv2.getDeployments(GetDeploymentsRequest.builder().apiId(apiId).build());@@ -307,7 +324,7 @@ class ApiGatewayV2ManagementTest {void createStage() {requireApi();requireDeployment();- var response = apigwv2.createStage(CreateStageRequest.builder()+ CreateStageResponse response = apigwv2.createStage(CreateStageRequest.builder().apiId(apiId).stageName(stageName).deploymentId(deploymentId)@@ -331,7 +348,7 @@ class ApiGatewayV2ManagementTest {void getAndListStages() {requireApi();requireStage();- var getResponse = apigwv2.getStage(GetStageRequest.builder()+ GetStageResponse getResponse = apigwv2.getStage(GetStageRequest.builder().apiId(apiId).stageName(stageName).build());@@ -342,7 +359,7 @@ class ApiGatewayV2ManagementTest {.containsEntry("environment", "test").containsEntry("owner", "platform");- var listResponse = apigwv2.getStages(GetStagesRequest.builder()+ GetStagesResponse listResponse = apigwv2.getStages(GetStagesRequest.builder().apiId(apiId).build());diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayV2WebSocketAndExtendedOpsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayV2WebSocketAndExtendedOpsTest.javaindex 110f938187..ed2937ac01 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayV2WebSocketAndExtendedOpsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayV2WebSocketAndExtendedOpsTest.java@@ -57,7 +57,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@Test @Order(1)@DisplayName("CreateApi (HTTP) populates AWS defaults")void createHttpApiWithDefaults() {- var res = gw.createApi(CreateApiRequest.builder()+ CreateApiResponse res = gw.createApi(CreateApiRequest.builder().name(TestFixtures.uniqueName("http-ext")).protocolType(ProtocolType.HTTP).build());@@ -75,7 +75,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@DisplayName("GetApi (HTTP) returns persisted defaults")void getHttpApiVerifyDefaults() {requireHttpApi();- var res = gw.getApi(GetApiRequest.builder().apiId(httpApiId).build());+ GetApiResponse res = gw.getApi(GetApiRequest.builder().apiId(httpApiId).build());assertThat(res.routeSelectionExpression()).isEqualTo("${request.method} ${request.path}");assertThat(res.apiKeySelectionExpression()).isEqualTo("$request.header.x-api-key");@@ -86,7 +86,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@Test @Order(10)@DisplayName("CreateApi (WEBSOCKET) with routeSelectionExpression")void createWebSocketApi() {- var res = gw.createApi(CreateApiRequest.builder()+ CreateApiResponse res = gw.createApi(CreateApiRequest.builder().name(TestFixtures.uniqueName("ws-ext")).protocolType(ProtocolType.WEBSOCKET).routeSelectionExpression("$request.body.action")@@ -116,7 +116,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@DisplayName("UpdateApi preserves unmodified fields")void updateWebSocketApi() {requireWsApi();- var res = gw.updateApi(UpdateApiRequest.builder()+ UpdateApiResponse res = gw.updateApi(UpdateApiRequest.builder().apiId(wsApiId).name("ws-updated-java").build());@@ -143,7 +143,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@DisplayName("CreateRoute with routeResponseSelectionExpression")void createRouteWithRrse() {requireWsApi();- var res = gw.createRoute(CreateRouteRequest.builder()+ CreateRouteResponse res = gw.createRoute(CreateRouteRequest.builder().apiId(wsApiId).routeKey("$default").authorizationType("NONE")@@ -160,7 +160,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@DisplayName("UpdateRoute preserves unmodified fields")void updateRoute() {requireWsApi(); requireWsRoute();- var res = gw.updateRoute(UpdateRouteRequest.builder()+ UpdateRouteResponse res = gw.updateRoute(UpdateRouteRequest.builder().apiId(wsApiId).routeId(wsRouteId).target("integrations/fake-id")@@ -177,7 +177,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@DisplayName("CreateIntegration")void createIntegration() {requireWsApi();- var res = gw.createIntegration(CreateIntegrationRequest.builder()+ CreateIntegrationResponse res = gw.createIntegration(CreateIntegrationRequest.builder().apiId(wsApiId).integrationType(IntegrationType.HTTP_PROXY).integrationUri("https://example.com")@@ -192,7 +192,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@DisplayName("UpdateIntegration preserves unmodified fields")void updateIntegration() {requireWsApi(); requireIntegration();- var res = gw.updateIntegration(UpdateIntegrationRequest.builder()+ UpdateIntegrationResponse res = gw.updateIntegration(UpdateIntegrationRequest.builder().apiId(wsApiId).integrationId(integrationId).integrationUri("https://updated.example.com")@@ -209,7 +209,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@DisplayName("CreateAuthorizer (JWT) with string identitySource")void createAuthorizer() {requireWsApi();- var res = gw.createAuthorizer(CreateAuthorizerRequest.builder()+ CreateAuthorizerResponse res = gw.createAuthorizer(CreateAuthorizerRequest.builder().apiId(wsApiId).name("jwt-ext-auth").authorizerType(AuthorizerType.JWT)@@ -227,7 +227,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@DisplayName("UpdateAuthorizer preserves unmodified fields")void updateAuthorizer() {requireWsApi(); requireAuthorizer();- var res = gw.updateAuthorizer(UpdateAuthorizerRequest.builder()+ UpdateAuthorizerResponse res = gw.updateAuthorizer(UpdateAuthorizerRequest.builder().apiId(wsApiId).authorizerId(authorizerId).name("jwt-updated")@@ -244,7 +244,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@DisplayName("CreateDeployment")void createDeployment() {requireWsApi();- var res = gw.createDeployment(CreateDeploymentRequest.builder()+ CreateDeploymentResponse res = gw.createDeployment(CreateDeploymentRequest.builder().apiId(wsApiId).description("ext-deploy").build());@@ -257,7 +257,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@DisplayName("UpdateDeployment preserves unmodified fields")void updateDeployment() {requireWsApi(); requireDeployment();- var res = gw.updateDeployment(UpdateDeploymentRequest.builder()+ UpdateDeploymentResponse res = gw.updateDeployment(UpdateDeploymentRequest.builder().apiId(wsApiId).deploymentId(deploymentId).description("updated-deploy")@@ -278,7 +278,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {.autoDeploy(false).build());- var res = gw.updateStage(UpdateStageRequest.builder()+ UpdateStageResponse res = gw.updateStage(UpdateStageRequest.builder().apiId(wsApiId).stageName("dev").autoDeploy(true)@@ -297,7 +297,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {requireWsApi(); requireWsRoute();// Create- var createRes = gw.createRouteResponse(CreateRouteResponseRequest.builder()+ CreateRouteResponseResponse createRes = gw.createRouteResponse(CreateRouteResponseRequest.builder().apiId(wsApiId).routeId(wsRouteId).routeResponseKey("$default")@@ -308,17 +308,17 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {assertThat(createRes.routeResponseKey()).isEqualTo("$default");// Get- var getRes = gw.getRouteResponse(GetRouteResponseRequest.builder()+ GetRouteResponseResponse getRes = gw.getRouteResponse(GetRouteResponseRequest.builder().apiId(wsApiId).routeId(wsRouteId).routeResponseId(routeResponseId).build());assertThat(getRes.routeResponseId()).isEqualTo(routeResponseId);// List- var listRes = gw.getRouteResponses(GetRouteResponsesRequest.builder()+ GetRouteResponsesResponse listRes = gw.getRouteResponses(GetRouteResponsesRequest.builder().apiId(wsApiId).routeId(wsRouteId).build());assertThat(listRes.items()).extracting(RouteResponse::routeResponseId).contains(routeResponseId);// Update- var updateRes = gw.updateRouteResponse(UpdateRouteResponseRequest.builder()+ UpdateRouteResponseResponse updateRes = gw.updateRouteResponse(UpdateRouteResponseRequest.builder().apiId(wsApiId).routeId(wsRouteId).routeResponseId(routeResponseId).routeResponseKey("$updated").build());@@ -340,7 +340,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {requireWsApi(); requireIntegration();// Create- var createRes = gw.createIntegrationResponse(CreateIntegrationResponseRequest.builder()+ CreateIntegrationResponseResponse createRes = gw.createIntegrationResponse(CreateIntegrationResponseRequest.builder().apiId(wsApiId).integrationId(integrationId).integrationResponseKey("$default")@@ -351,19 +351,19 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {assertThat(createRes.contentHandlingStrategy()).hasToString("CONVERT_TO_TEXT");// Get- var getRes = gw.getIntegrationResponse(GetIntegrationResponseRequest.builder()+ GetIntegrationResponseResponse getRes = gw.getIntegrationResponse(GetIntegrationResponseRequest.builder().apiId(wsApiId).integrationId(integrationId).integrationResponseId(integrationResponseId).build());assertThat(getRes.integrationResponseId()).isEqualTo(integrationResponseId);// List- var listRes = gw.getIntegrationResponses(GetIntegrationResponsesRequest.builder()+ GetIntegrationResponsesResponse listRes = gw.getIntegrationResponses(GetIntegrationResponsesRequest.builder().apiId(wsApiId).integrationId(integrationId).build());assertThat(listRes.items()).extracting(IntegrationResponse::integrationResponseId).contains(integrationResponseId);// Update- var updateRes = gw.updateIntegrationResponse(UpdateIntegrationResponseRequest.builder()+ UpdateIntegrationResponseResponse updateRes = gw.updateIntegrationResponse(UpdateIntegrationResponseRequest.builder().apiId(wsApiId).integrationId(integrationId).integrationResponseId(integrationResponseId).contentHandlingStrategy("CONVERT_TO_BINARY")@@ -388,7 +388,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {requireWsApi();// Create- var createRes = gw.createModel(CreateModelRequest.builder()+ CreateModelResponse createRes = gw.createModel(CreateModelRequest.builder().apiId(wsApiId).name("PetModel").schema("{\"type\":\"object\"}")@@ -400,17 +400,17 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {assertThat(createRes.name()).isEqualTo("PetModel");// Get- var getRes = gw.getModel(GetModelRequest.builder()+ GetModelResponse getRes = gw.getModel(GetModelRequest.builder().apiId(wsApiId).modelId(modelId).build());assertThat(getRes.name()).isEqualTo("PetModel");assertThat(getRes.contentType()).isEqualTo("application/json");// List- var listRes = gw.getModels(GetModelsRequest.builder().apiId(wsApiId).build());+ GetModelsResponse listRes = gw.getModels(GetModelsRequest.builder().apiId(wsApiId).build());assertThat(listRes.items()).extracting(Model::modelId).contains(modelId);// Update (merge-patch)- var updateRes = gw.updateModel(UpdateModelRequest.builder()+ UpdateModelResponse updateRes = gw.updateModel(UpdateModelRequest.builder().apiId(wsApiId).modelId(modelId).description("updated description").build());@@ -431,7 +431,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@DisplayName("Create API with tags, TagResource, UntagResource, GetTags")void tagging() {// Create API with initial tags- var createRes = gw.createApi(CreateApiRequest.builder()+ CreateApiResponse createRes = gw.createApi(CreateApiRequest.builder().name(TestFixtures.uniqueName("tag-java")).protocolType(ProtocolType.HTTP).tags(Map.of("initial", "tag"))@@ -449,7 +449,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {.tags(Map.of("env", "production", "team", "platform")).build());- var tags = gw.getTags(GetTagsRequest.builder().resourceArn(arn).build()).tags();+ Map<String, String> tags = gw.getTags(GetTagsRequest.builder().resourceArn(arn).build()).tags();assertThat(tags).containsEntry("initial", "tag");assertThat(tags).containsEntry("env", "production");assertThat(tags).containsEntry("team", "platform");@@ -460,7 +460,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {.tagKeys("initial", "team").build());- var tagsAfter = gw.getTags(GetTagsRequest.builder().resourceArn(arn).build()).tags();+ Map<String, String> tagsAfter = gw.getTags(GetTagsRequest.builder().resourceArn(arn).build()).tags();assertThat(tagsAfter).containsEntry("env", "production");assertThat(tagsAfter).doesNotContainKey("initial");assertThat(tagsAfter).doesNotContainKey("team");@@ -473,7 +473,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {@Test @Order(91)@DisplayName("GetTags on API with no tags returns empty map")void getTagsEmpty() {- var createRes = gw.createApi(CreateApiRequest.builder()+ CreateApiResponse createRes = gw.createApi(CreateApiRequest.builder().name(TestFixtures.uniqueName("notag-java")).protocolType(ProtocolType.HTTP).build());@@ -481,7 +481,7 @@ class ApiGatewayV2WebSocketAndExtendedOpsTest {String arn = "arn:aws:apigateway:us-east-1::/apis/" + noTagApiId;try {- var tags = gw.getTags(GetTagsRequest.builder().resourceArn(arn).build()).tags();+ Map<String, String> tags = gw.getTags(GetTagsRequest.builder().resourceArn(arn).build()).tags();assertThat(tags).isEmpty();} finally {safeDelete(() -> gw.deleteApi(DeleteApiRequest.builder().apiId(noTagApiId).build()));diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayV2WebSocketDataPlaneTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayV2WebSocketDataPlaneTest.javaindex 39247838ba..666b2369bf 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayV2WebSocketDataPlaneTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayV2WebSocketDataPlaneTest.java@@ -187,7 +187,7 @@ class ApiGatewayV2WebSocketDataPlaneTest {private static String createLambda(String prefix, String code, Map<String, String> environment) {String fnName = TestFixtures.uniqueName(prefix);- var builder = CreateFunctionRequest.builder()+ CreateFunctionRequest.Builder builder = CreateFunctionRequest.builder().functionName(fnName).runtime(Runtime.NODEJS20_X).role(ROLE)@@ -205,7 +205,7 @@ class ApiGatewayV2WebSocketDataPlaneTest {}private static String createWsApi(String prefix) {- var res = gw.createApi(CreateApiRequest.builder()+ CreateApiResponse res = gw.createApi(CreateApiRequest.builder().name(TestFixtures.uniqueName(prefix)).protocolType(ProtocolType.WEBSOCKET).routeSelectionExpression("$request.body.action")@@ -215,7 +215,7 @@ class ApiGatewayV2WebSocketDataPlaneTest {}private static String createLambdaIntegration(String apiId, String fnName) {- var res = gw.createIntegration(CreateIntegrationRequest.builder()+ CreateIntegrationResponse res = gw.createIntegration(CreateIntegrationRequest.builder().apiId(apiId).integrationType(IntegrationType.AWS_PROXY).integrationUri("arn:aws:lambda:us-east-1:000000000000:function:" + fnName)@@ -224,8 +224,8 @@ class ApiGatewayV2WebSocketDataPlaneTest {}private static void setupStage(String apiId, Map<String, String> stageVariables) {- var deploy = gw.createDeployment(CreateDeploymentRequest.builder().apiId(apiId).build());- var req = CreateStageRequest.builder()+ CreateDeploymentResponse deploy = gw.createDeployment(CreateDeploymentRequest.builder().apiId(apiId).build());+ CreateStageRequest.Builder req = CreateStageRequest.builder().apiId(apiId).stageName(STAGE).deploymentId(deploy.deploymentId());@@ -382,7 +382,7 @@ class ApiGatewayV2WebSocketDataPlaneTest {String echoIntegId = createLambdaIntegration(apiId, echoFn);- var authRes = gw.createAuthorizer(CreateAuthorizerRequest.builder()+ CreateAuthorizerResponse authRes = gw.createAuthorizer(CreateAuthorizerRequest.builder().apiId(apiId).authorizerType(AuthorizerType.REQUEST).name("ws-auth")@@ -540,7 +540,7 @@ class ApiGatewayV2WebSocketDataPlaneTest {String apiId = createWsApi("stage-vars");// Integration with stage variable reference in URI- var integRes = gw.createIntegration(CreateIntegrationRequest.builder()+ CreateIntegrationResponse integRes = gw.createIntegration(CreateIntegrationRequest.builder().apiId(apiId).integrationType(IntegrationType.AWS_PROXY).integrationUri("arn:aws:lambda:us-east-1:000000000000:function:${stageVariables.functionName}")@@ -578,7 +578,7 @@ class ApiGatewayV2WebSocketDataPlaneTest {String apiId = createWsApi("mock-integ");// MOCK integration for $connect — no Lambda needed- var mockIntegRes = gw.createIntegration(CreateIntegrationRequest.builder()+ CreateIntegrationResponse mockIntegRes = gw.createIntegration(CreateIntegrationRequest.builder().apiId(apiId).integrationType(IntegrationType.MOCK).build());diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AppConfigTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AppConfigTest.javaindex 9b1af1a9d4..425c2a8271 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AppConfigTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AppConfigTest.java@@ -134,7 +134,7 @@ class AppConfigTest {@Test@Order(7)void startConfigurationSession() {- var response = appConfigData.startConfigurationSession(StartConfigurationSessionRequest.builder()+ StartConfigurationSessionResponse response = appConfigData.startConfigurationSession(StartConfigurationSessionRequest.builder().applicationIdentifier(applicationId).environmentIdentifier(environmentId).configurationProfileIdentifier(configurationProfileId)@@ -226,7 +226,7 @@ class AppConfigTest {@Order(13)@DisplayName("Poll interval: requested minimum is returned to the client")void requiredMinimumPollIntervalIsReturned() {- var sessionResponse = appConfigData.startConfigurationSession(StartConfigurationSessionRequest.builder()+ StartConfigurationSessionResponse sessionResponse = appConfigData.startConfigurationSession(StartConfigurationSessionRequest.builder().applicationIdentifier(applicationId).environmentIdentifier(environmentId).configurationProfileIdentifier(configurationProfileId)diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BcmPricingCalculatorTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BcmPricingCalculatorTest.javaindex 0e013f4e18..d32f202f61 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BcmPricingCalculatorTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BcmPricingCalculatorTest.java@@ -4,9 +4,12 @@ import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.bcmpricingcalculator.BcmPricingCalculatorClient;import software.amazon.awssdk.services.bcmpricingcalculator.model.BatchCreateWorkloadEstimateUsageEntry;import software.amazon.awssdk.services.bcmpricingcalculator.model.BatchCreateWorkloadEstimateUsageRequest;+import software.amazon.awssdk.services.bcmpricingcalculator.model.BatchCreateWorkloadEstimateUsageResponse;import software.amazon.awssdk.services.bcmpricingcalculator.model.CreateWorkloadEstimateRequest;+import software.amazon.awssdk.services.bcmpricingcalculator.model.CreateWorkloadEstimateResponse;import software.amazon.awssdk.services.bcmpricingcalculator.model.DeleteWorkloadEstimateRequest;import software.amazon.awssdk.services.bcmpricingcalculator.model.GetWorkloadEstimateRequest;+import software.amazon.awssdk.services.bcmpricingcalculator.model.GetWorkloadEstimateResponse;import software.amazon.awssdk.services.bcmpricingcalculator.model.WorkloadEstimateRateType;import software.amazon.awssdk.services.bcmpricingcalculator.model.WorkloadEstimateStatus;@@ -18,14 +21,14 @@ class BcmPricingCalculatorTest {@Testvoid workloadEstimateLifecycle() {try (BcmPricingCalculatorClient client = TestFixtures.bcmPricingCalculatorClient()) {- var created = client.createWorkloadEstimate(CreateWorkloadEstimateRequest.builder()+ CreateWorkloadEstimateResponse created = client.createWorkloadEstimate(CreateWorkloadEstimateRequest.builder().name("sdk-estimate").clientToken("sdk-estimate-token").rateType(WorkloadEstimateRateType.BEFORE_DISCOUNTS).build());assertNotNull(created.id());- var batch = client.batchCreateWorkloadEstimateUsage(BatchCreateWorkloadEstimateUsageRequest.builder()+ BatchCreateWorkloadEstimateUsageResponse batch = client.batchCreateWorkloadEstimateUsage(BatchCreateWorkloadEstimateUsageRequest.builder().workloadEstimateId(created.id()).clientToken("sdk-usage-token").usage(List.of(BatchCreateWorkloadEstimateUsageEntry.builder()@@ -41,7 +44,7 @@ class BcmPricingCalculatorTest {assertTrue(batch.errors().isEmpty());assertEquals(1, batch.items().size());- var estimate = client.getWorkloadEstimate(GetWorkloadEstimateRequest.builder()+ GetWorkloadEstimateResponse estimate = client.getWorkloadEstimate(GetWorkloadEstimateRequest.builder().identifier(created.id()).build());assertEquals(WorkloadEstimateStatus.VALID, estimate.status());assertEquals(7.592d, estimate.totalCost(), 0.000001d);diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BedrockAgentCoreCredentialProviderTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BedrockAgentCoreCredentialProviderTest.javaindex 0c8548d6e9..c4fe5a54f0 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BedrockAgentCoreCredentialProviderTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BedrockAgentCoreCredentialProviderTest.java@@ -13,8 +13,16 @@ import software.amazon.awssdk.services.bedrockagentcorecontrol.model.CreateApiKeimport software.amazon.awssdk.services.bedrockagentcorecontrol.model.CreateOauth2CredentialProviderRequest;import software.amazon.awssdk.services.bedrockagentcorecontrol.model.CreateOauth2CredentialProviderResponse;import software.amazon.awssdk.services.bedrockagentcorecontrol.model.CredentialProviderVendorType;+import software.amazon.awssdk.services.bedrockagentcorecontrol.model.DeleteApiKeyCredentialProviderResponse;+import software.amazon.awssdk.services.bedrockagentcorecontrol.model.DeleteOauth2CredentialProviderResponse;+import software.amazon.awssdk.services.bedrockagentcorecontrol.model.GetApiKeyCredentialProviderResponse;+import software.amazon.awssdk.services.bedrockagentcorecontrol.model.GetOauth2CredentialProviderResponse;+import software.amazon.awssdk.services.bedrockagentcorecontrol.model.ListApiKeyCredentialProvidersResponse;+import software.amazon.awssdk.services.bedrockagentcorecontrol.model.ListOauth2CredentialProvidersResponse;import software.amazon.awssdk.services.bedrockagentcorecontrol.model.Oauth2ProviderConfigInput;import software.amazon.awssdk.services.bedrockagentcorecontrol.model.SecretSourceType;+import software.amazon.awssdk.services.bedrockagentcorecontrol.model.UpdateApiKeyCredentialProviderResponse;+import software.amazon.awssdk.services.bedrockagentcorecontrol.model.UpdateOauth2CredentialProviderResponse;import java.util.UUID;@@ -62,7 +70,7 @@ class BedrockAgentCoreCredentialProviderTest {@Test@Order(2)void getApiKeyCredentialProvider() {- var response = client.getApiKeyCredentialProvider(builder -> builder.name(apiKeyProviderName));+ GetApiKeyCredentialProviderResponse response = client.getApiKeyCredentialProvider(builder -> builder.name(apiKeyProviderName));assertThat(response.name()).isEqualTo(apiKeyProviderName);assertThat(response.apiKeySecretSourceAsString()).isEqualTo("MANAGED");@@ -74,7 +82,7 @@ class BedrockAgentCoreCredentialProviderTest {@Test@Order(3)void listApiKeyCredentialProviders() {- var response = client.listApiKeyCredentialProviders(builder -> builder.maxResults(100));+ ListApiKeyCredentialProvidersResponse response = client.listApiKeyCredentialProviders(builder -> builder.maxResults(100));assertThat(response.credentialProviders()).anyMatch(provider -> apiKeyProviderName.equals(provider.name()));@@ -83,7 +91,7 @@ class BedrockAgentCoreCredentialProviderTest {@Test@Order(4)void updateApiKeyCredentialProvider() {- var response = client.updateApiKeyCredentialProvider(builder -> builder+ UpdateApiKeyCredentialProviderResponse response = client.updateApiKeyCredentialProvider(builder -> builder.name(apiKeyProviderName).apiKey("rotated-value").apiKeySecretSource(SecretSourceType.MANAGED));@@ -96,7 +104,7 @@ class BedrockAgentCoreCredentialProviderTest {@Test@Order(5)void deleteApiKeyCredentialProvider() {- var response = client.deleteApiKeyCredentialProvider(builder -> builder.name(apiKeyProviderName));+ DeleteApiKeyCredentialProviderResponse response = client.deleteApiKeyCredentialProvider(builder -> builder.name(apiKeyProviderName));assertThat(response.sdkHttpResponse().statusCode()).isEqualTo(204);}@@ -123,7 +131,7 @@ class BedrockAgentCoreCredentialProviderTest {@Test@Order(7)void getOauth2CredentialProvider() {- var response = client.getOauth2CredentialProvider(builder -> builder.name(oauth2ProviderName));+ GetOauth2CredentialProviderResponse response = client.getOauth2CredentialProvider(builder -> builder.name(oauth2ProviderName));assertThat(response.name()).isEqualTo(oauth2ProviderName);assertThat(response.credentialProviderVendorAsString()).isEqualTo("GithubOauth2");@@ -136,7 +144,7 @@ class BedrockAgentCoreCredentialProviderTest {@Test@Order(8)void listOauth2CredentialProviders() {- var response = client.listOauth2CredentialProviders(builder -> builder.maxResults(20));+ ListOauth2CredentialProvidersResponse response = client.listOauth2CredentialProviders(builder -> builder.maxResults(20));assertThat(response.credentialProviders()).anyMatch(provider -> oauth2ProviderName.equals(provider.name())@@ -146,7 +154,7 @@ class BedrockAgentCoreCredentialProviderTest {@Test@Order(9)void updateOauth2CredentialProvider() {- var response = client.updateOauth2CredentialProvider(builder -> builder+ UpdateOauth2CredentialProviderResponse response = client.updateOauth2CredentialProvider(builder -> builder.name(oauth2ProviderName).credentialProviderVendor(CredentialProviderVendorType.GITHUB_OAUTH2).oauth2ProviderConfigInput(Oauth2ProviderConfigInput.fromGithubOauth2ProviderConfig(config -> config@@ -165,7 +173,7 @@ class BedrockAgentCoreCredentialProviderTest {@Test@Order(10)void deleteOauth2CredentialProvider() {- var response = client.deleteOauth2CredentialProvider(builder -> builder.name(oauth2ProviderName));+ DeleteOauth2CredentialProviderResponse response = client.deleteOauth2CredentialProvider(builder -> builder.name(oauth2ProviderName));assertThat(response.sdkHttpResponse().statusCode()).isEqualTo(204);}}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BedrockAgentCoreResourcePolicyTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BedrockAgentCoreResourcePolicyTest.javaindex 659d5a1c14..125b085598 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BedrockAgentCoreResourcePolicyTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BedrockAgentCoreResourcePolicyTest.java@@ -4,8 +4,11 @@ import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.bedrockagentcorecontrol.BedrockAgentCoreControlClient;import software.amazon.awssdk.services.bedrockagentcorecontrol.model.DeleteResourcePolicyRequest;+import software.amazon.awssdk.services.bedrockagentcorecontrol.model.DeleteResourcePolicyResponse;import software.amazon.awssdk.services.bedrockagentcorecontrol.model.GetResourcePolicyRequest;+import software.amazon.awssdk.services.bedrockagentcorecontrol.model.GetResourcePolicyResponse;import software.amazon.awssdk.services.bedrockagentcorecontrol.model.PutResourcePolicyRequest;+import software.amazon.awssdk.services.bedrockagentcorecontrol.model.PutResourcePolicyResponse;import software.amazon.awssdk.services.bedrockagentcorecontrol.model.ResourceNotFoundException;import static org.assertj.core.api.Assertions.assertThat;@@ -31,13 +34,13 @@ class BedrockAgentCoreResourcePolicyTest {void putAndGetResourcePolicy() {try (BedrockAgentCoreControlClient client = TestFixtures.bedrockAgentCoreControlClient()) {String policy = "{\"Version\":\"2012-10-17\",\"Statement\":[]}";- var put = client.putResourcePolicy(PutResourcePolicyRequest.builder()+ PutResourcePolicyResponse put = client.putResourcePolicy(PutResourcePolicyRequest.builder().resourceArn(RESOURCE_ARN).policy(policy).build());assertThat(put.policy()).isEqualTo(policy);- var get = client.getResourcePolicy(GetResourcePolicyRequest.builder()+ GetResourcePolicyResponse get = client.getResourcePolicy(GetResourcePolicyRequest.builder().resourceArn(RESOURCE_ARN).build());assertThat(get.policy()).isEqualTo(policy);@@ -53,7 +56,7 @@ class BedrockAgentCoreResourcePolicyTest {.policy(policy).build());- var deleted = client.deleteResourcePolicy(DeleteResourcePolicyRequest.builder()+ DeleteResourcePolicyResponse deleted = client.deleteResourcePolicy(DeleteResourcePolicyRequest.builder().resourceArn(RESOURCE_ARN).build());assertThat(deleted.sdkHttpResponse().statusCode()).isEqualTo(204);diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BedrockGuardrailTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BedrockGuardrailTest.javaindex a43a339c71..5cf7e45857 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BedrockGuardrailTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/BedrockGuardrailTest.java@@ -22,6 +22,7 @@ import software.amazon.awssdk.services.bedrock.model.TooManyTagsException;import software.amazon.awssdk.services.bedrock.model.UpdateGuardrailResponse;import software.amazon.awssdk.services.bedrock.model.ValidationException;import software.amazon.awssdk.services.kms.KmsClient;+import software.amazon.awssdk.services.kms.model.KeyMetadata;import java.util.ArrayList;import java.util.List;@@ -47,7 +48,7 @@ class BedrockGuardrailTest {name = "sdk-test-guardrail-" + System.currentTimeMillis();kmsAlias = "alias/sdk-test-guardrail-" + System.currentTimeMillis();try (KmsClient kms = TestFixtures.kmsClient()) {- var key = kms.createKey(r -> r.description("sdk compatibility guardrail key")).keyMetadata();+ KeyMetadata key = kms.createKey(r -> r.description("sdk compatibility guardrail key")).keyMetadata();kmsKeyId = key.keyId();kmsKeyArn = key.arn();kms.createAlias(r -> r.aliasName(kmsAlias).targetKeyId(kmsKeyId));diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CWWireDebugTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CWWireDebugTest.javaindex 8e80d2d5ee..9d93ba2fa5 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CWWireDebugTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CWWireDebugTest.java@@ -5,9 +5,11 @@ import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;import software.amazon.awssdk.core.interceptor.*;import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;+import software.amazon.awssdk.core.sync.RequestBody;import software.amazon.awssdk.regions.Region;import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;import software.amazon.awssdk.services.cloudwatch.model.*;+import java.util.Optional;import java.util.concurrent.atomic.AtomicReference;class CWWireDebugTest {@@ -19,7 +21,7 @@ class CWWireDebugTest {@Overridepublic void beforeTransmission(Context.BeforeTransmission context, ExecutionAttributes attrs) {try {- var body = context.requestBody();+ Optional<RequestBody> body = context.requestBody();if (body.isPresent()) {String b = new String(body.get().contentStreamProvider().newStream().readAllBytes());if (b.contains("PutMetricData")) {diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFrontOriginCustomHeadersTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFrontOriginCustomHeadersTest.javaindex 156cd085ea..16fa2fd78e 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFrontOriginCustomHeadersTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFrontOriginCustomHeadersTest.java@@ -5,10 +5,12 @@ import software.amazon.awssdk.services.cloudfront.CloudFrontClient;import software.amazon.awssdk.services.cloudfront.model.CreateDistributionResponse;import software.amazon.awssdk.services.cloudfront.model.CustomHeaders;import software.amazon.awssdk.services.cloudfront.model.DistributionConfig;+import software.amazon.awssdk.services.cloudfront.model.DistributionSummary;import software.amazon.awssdk.services.cloudfront.model.GetDistributionConfigResponse;import software.amazon.awssdk.services.cloudfront.model.Origin;import software.amazon.awssdk.services.cloudfront.model.OriginCustomHeader;import software.amazon.awssdk.services.cloudfront.model.S3OriginConfig;+import software.amazon.awssdk.services.cloudfront.model.UpdateDistributionResponse;import software.amazon.awssdk.services.cloudfront.model.ViewerProtocolPolicy;import java.util.List;@@ -74,7 +76,7 @@ class CloudFrontOriginCustomHeadersTest {request -> request.id(created.distribution().id()));assertOriginShapes(fetched.distributionConfig().origins().items());- var listed = cloudFront.listDistributions(request -> request.maxItems("100"))+ DistributionSummary listed = cloudFront.listDistributions(request -> request.maxItems("100")).distributionList().items().stream()@@ -88,11 +90,11 @@ class CloudFrontOriginCustomHeadersTest {String id = distributionId;GetDistributionConfigResponse current = cloudFront.getDistributionConfig(request -> request.id(id));- var disabled = current.distributionConfig()+ DistributionConfig disabled = current.distributionConfig().toBuilder().enabled(false).build();- var updated = cloudFront.updateDistribution(request -> request+ UpdateDistributionResponse updated = cloudFront.updateDistribution(request -> request.id(id).ifMatch(current.eTag()).distributionConfig(disabled));diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFrontResponseHeadersPolicyTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFrontResponseHeadersPolicyTest.javaindex c6af090590..d74123c537 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFrontResponseHeadersPolicyTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFrontResponseHeadersPolicyTest.java@@ -3,10 +3,14 @@ package com.floci.test;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.cloudfront.CloudFrontClient;import software.amazon.awssdk.services.cloudfront.model.CreateResponseHeadersPolicyResponse;+import software.amazon.awssdk.services.cloudfront.model.GetResponseHeadersPolicyConfigResponse;+import software.amazon.awssdk.services.cloudfront.model.GetResponseHeadersPolicyResponse;import software.amazon.awssdk.services.cloudfront.model.NoSuchResponseHeadersPolicyException;import software.amazon.awssdk.services.cloudfront.model.PreconditionFailedException;import software.amazon.awssdk.services.cloudfront.model.ResponseHeadersPolicyConfig;+import software.amazon.awssdk.services.cloudfront.model.ResponseHeadersPolicyList;import software.amazon.awssdk.services.cloudfront.model.ResponseHeadersPolicyType;+import software.amazon.awssdk.services.cloudfront.model.UpdateResponseHeadersPolicyResponse;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertNotEquals;@@ -44,7 +48,7 @@ class CloudFrontResponseHeadersPolicyTest {.name());String id = policyId;- var fetched = cloudFront.getResponseHeadersPolicy(+ GetResponseHeadersPolicyResponse fetched = cloudFront.getResponseHeadersPolicy(request -> request.id(id));assertEquals(etag, fetched.eTag());assertEquals("created",@@ -77,7 +81,7 @@ class CloudFrontResponseHeadersPolicyTest {.get(0).override());- var fetchedConfig = cloudFront.getResponseHeadersPolicyConfig(+ GetResponseHeadersPolicyConfigResponse fetchedConfig = cloudFront.getResponseHeadersPolicyConfig(request -> request.id(id));assertEquals(etag, fetchedConfig.eTag());assertEquals("created-value",@@ -94,7 +98,7 @@ class CloudFrontResponseHeadersPolicyTest {.serverTimingHeadersConfig().enabled());- var listed = cloudFront.listResponseHeadersPolicies(request -> request+ ResponseHeadersPolicyList listed = cloudFront.listResponseHeadersPolicies(request -> request.type(ResponseHeadersPolicyType.CUSTOM).maxItems("100")).responseHeadersPolicyList();@@ -110,7 +114,7 @@ class CloudFrontResponseHeadersPolicyTest {.responseHeadersPolicyConfig(policyConfig(suffix, "stale", "stale-value"))));- var updated = cloudFront.updateResponseHeadersPolicy(request -> request+ UpdateResponseHeadersPolicyResponse updated = cloudFront.updateResponseHeadersPolicy(request -> request.id(id).ifMatch(created.eTag()).responseHeadersPolicyConfig(policyConfig(diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFrontTrustedKeyGroupsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFrontTrustedKeyGroupsTest.javaindex 68bb202f61..714c8198fd 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFrontTrustedKeyGroupsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFrontTrustedKeyGroupsTest.java@@ -8,7 +8,9 @@ import software.amazon.awssdk.services.cloudfront.model.CreatePublicKeyResponse;import software.amazon.awssdk.services.cloudfront.model.DistributionConfig;import software.amazon.awssdk.services.cloudfront.model.GetDistributionConfigResponse;import software.amazon.awssdk.services.cloudfront.model.GetDistributionResponse;+import software.amazon.awssdk.services.cloudfront.model.KeyGroup;import software.amazon.awssdk.services.cloudfront.model.S3OriginConfig;+import software.amazon.awssdk.services.cloudfront.model.UpdateDistributionResponse;import software.amazon.awssdk.services.cloudfront.model.ViewerProtocolPolicy;import java.security.KeyPairGenerator;@@ -62,7 +64,7 @@ class CloudFrontTrustedKeyGroupsTest {request -> request.id(createdKeyGroupId)).keyGroupConfig().items());- var listedKeyGroup =+ KeyGroup listedKeyGroup =cloudFront.listKeyGroups(request -> request.maxItems("100")).keyGroupList().items()@@ -146,11 +148,11 @@ class CloudFrontTrustedKeyGroupsTest {GetDistributionConfigResponse current =cloudFront.getDistributionConfig(request -> request.id(id));- var disabled = current.distributionConfig()+ DistributionConfig disabled = current.distributionConfig().toBuilder().enabled(false).build();- var updated = cloudFront.updateDistribution(+ UpdateDistributionResponse updated = cloudFront.updateDistribution(request -> request.id(id).ifMatch(current.eTag())diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsCrossAccountPolicyTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsCrossAccountPolicyTest.javaindex 2c86ea56ae..c9f0d87b36 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsCrossAccountPolicyTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsCrossAccountPolicyTest.java@@ -3,8 +3,11 @@ package com.floci.test;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;+import software.amazon.awssdk.services.cloudwatchlogs.model.DescribeAccountPoliciesResponse;import software.amazon.awssdk.services.cloudwatchlogs.model.InvalidParameterException;import software.amazon.awssdk.services.cloudwatchlogs.model.LimitExceededException;+import software.amazon.awssdk.services.cloudwatchlogs.model.PutAccountPolicyResponse;+import software.amazon.awssdk.services.cloudwatchlogs.model.PutDestinationResponse;import static org.assertj.core.api.Assertions.assertThat;import static org.assertj.core.api.Assertions.assertThatThrownBy;@@ -21,7 +24,7 @@ class CloudWatchLogsCrossAccountPolicyTest {assumeFalse(TestFixtures.isRealAws(), "Uses emulator-only destination ARNs and persistent test resources");try (CloudWatchLogsClient logs = TestFixtures.cloudWatchLogsClient()) {- var putDestination = logs.putDestination(request -> request+ PutDestinationResponse putDestination = logs.putDestination(request -> request.destinationName(DESTINATION_NAME).targetArn("arn:aws:kinesis:us-east-1:000000000000:stream/floci-sdk-logs").roleArn("arn:aws:iam::000000000000:role/floci-sdk-logs"));@@ -34,7 +37,7 @@ class CloudWatchLogsCrossAccountPolicyTest {.destinationName(DESTINATION_NAME).accessPolicy("{\"Version\":\"2012-10-17\",\"Statement\":[]}"));- var putPolicy = logs.putAccountPolicy(request -> request+ PutAccountPolicyResponse putPolicy = logs.putAccountPolicy(request -> request.policyName(POLICY_NAME).policyType("TRANSFORMER_POLICY").policyDocument("[{\"parseJSON\":{}}]")@@ -45,7 +48,7 @@ class CloudWatchLogsCrossAccountPolicyTest {assertThat(putPolicy.accountPolicy().policyName()).isEqualTo(POLICY_NAME);assertThat(putPolicy.accountPolicy().policyTypeAsString()).isEqualTo("TRANSFORMER_POLICY");- var policies = logs.describeAccountPolicies(request -> request.policyType("TRANSFORMER_POLICY"));+ DescribeAccountPoliciesResponse policies = logs.describeAccountPolicies(request -> request.policyType("TRANSFORMER_POLICY"));assertThat(policies.accountPolicies()).anySatisfy(policy -> {assertThat(policy.policyName()).isEqualTo(POLICY_NAME);@@ -53,7 +56,7 @@ class CloudWatchLogsCrossAccountPolicyTest {.isEqualTo("LogGroupNamePrefix = \"/floci/sdk-cross-account/\"");});- var fieldIndex = logs.putAccountPolicy(request -> request+ PutAccountPolicyResponse fieldIndex = logs.putAccountPolicy(request -> request.policyName("floci-sdk-field-index-quoted-value").policyType("FIELD_INDEX_POLICY").policyDocument("{\"Fields\":[\"requestId\"]}")diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeDeployEcsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeDeployEcsTest.javaindex 9482ac5e22..61398c45d7 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeDeployEcsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeDeployEcsTest.java@@ -10,11 +10,13 @@ import software.amazon.awssdk.services.codedeploy.CodeDeployClient;import software.amazon.awssdk.services.codedeploy.model.AppSpecContent;import software.amazon.awssdk.services.codedeploy.model.BatchGetDeploymentTargetsResponse;import software.amazon.awssdk.services.codedeploy.model.ComputePlatform;+import software.amazon.awssdk.services.codedeploy.model.CreateApplicationResponse;import software.amazon.awssdk.services.codedeploy.model.CreateDeploymentGroupResponse;import software.amazon.awssdk.services.codedeploy.model.CreateDeploymentResponse;import software.amazon.awssdk.services.codedeploy.model.DeploymentOption;import software.amazon.awssdk.services.codedeploy.model.DeploymentStatus;import software.amazon.awssdk.services.codedeploy.model.DeploymentStyle;+import software.amazon.awssdk.services.codedeploy.model.DeploymentTarget;import software.amazon.awssdk.services.codedeploy.model.DeploymentType;import software.amazon.awssdk.services.codedeploy.model.ECSService;import software.amazon.awssdk.services.codedeploy.model.GetDeploymentResponse;@@ -29,8 +31,10 @@ import software.amazon.awssdk.services.ecs.EcsClient;import software.amazon.awssdk.services.ecs.model.CreateClusterResponse;import software.amazon.awssdk.services.ecs.model.CreateServiceResponse;import software.amazon.awssdk.services.ecs.model.DeploymentControllerType;+import software.amazon.awssdk.services.ecs.model.DescribeTaskSetsResponse;import software.amazon.awssdk.services.ecs.model.RegisterTaskDefinitionResponse;import software.amazon.awssdk.services.elasticloadbalancingv2.ElasticLoadBalancingV2Client;+import software.amazon.awssdk.services.elasticloadbalancingv2.model.Action;import software.amazon.awssdk.services.elasticloadbalancingv2.model.ActionTypeEnum;import software.amazon.awssdk.services.elasticloadbalancingv2.model.CreateListenerResponse;import software.amazon.awssdk.services.elasticloadbalancingv2.model.CreateLoadBalancerResponse;@@ -39,8 +43,10 @@ import software.amazon.awssdk.services.elasticloadbalancingv2.model.DescribeRuleimport software.amazon.awssdk.services.elasticloadbalancingv2.model.IpAddressType;import software.amazon.awssdk.services.elasticloadbalancingv2.model.LoadBalancerTypeEnum;import software.amazon.awssdk.services.elasticloadbalancingv2.model.ProtocolEnum;+import software.amazon.awssdk.services.elasticloadbalancingv2.model.Rule;import java.util.List;+import java.util.Optional;import static org.assertj.core.api.Assertions.assertThat;@@ -167,11 +173,11 @@ class CodeDeployEcsTest {assertThat(listenerArn).isNotNull();DescribeRulesResponse resp = elb.describeRules(r -> r.listenerArn(listenerArn));- var defaultRule = resp.rules().stream()+ Optional<Rule> defaultRule = resp.rules().stream().filter(rule -> rule.isDefault()).findFirst();assertThat(defaultRule).isPresent();- var forwardAction = defaultRule.get().actions().stream()+ Optional<Action> forwardAction = defaultRule.get().actions().stream().filter(a -> ActionTypeEnum.FORWARD.equals(a.type())).findFirst();assertThat(forwardAction).isPresent();@@ -223,7 +229,7 @@ class CodeDeployEcsTest {@Test@Order(9)void createEcsApplication() {- var resp = codedeploy.createApplication(r -> r+ CreateApplicationResponse resp = codedeploy.createApplication(r -> r.applicationName(APP_NAME).computePlatform(ComputePlatform.ECS));@@ -353,7 +359,7 @@ class CodeDeployEcsTest {.targetIds(targetIds));assertThat(resp.deploymentTargets()).hasSize(1);- var target = resp.deploymentTargets().get(0);+ DeploymentTarget target = resp.deploymentTargets().get(0);assertThat(target.deploymentTargetTypeAsString()).isEqualTo("ECSTarget");assertThat(target.ecsTarget()).isNotNull();assertThat(target.ecsTarget().statusAsString()).isEqualTo("Succeeded");@@ -369,12 +375,12 @@ class CodeDeployEcsTest {assertThat(greenTgArn).isNotNull();DescribeRulesResponse resp = elb.describeRules(r -> r.listenerArn(listenerArn));- var defaultRule = resp.rules().stream()+ Optional<Rule> defaultRule = resp.rules().stream().filter(rule -> rule.isDefault()).findFirst();assertThat(defaultRule).isPresent();- var forwardAction = defaultRule.get().actions().stream()+ Optional<Action> forwardAction = defaultRule.get().actions().stream().filter(a -> ActionTypeEnum.FORWARD.equals(a.type())).findFirst();assertThat(forwardAction).isPresent();@@ -385,7 +391,7 @@ class CodeDeployEcsTest {@Order(17)void ecsTaskSetCreatedForGreenDeployment() {// The green task set should exist and be PRIMARY after deployment- var taskSets = ecs.describeTaskSets(r -> r+ DescribeTaskSetsResponse taskSets = ecs.describeTaskSets(r -> r.cluster(CLUSTER).service(SERVICE));diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeDeployTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeDeployTest.javaindex 7b4c833553..badece0426 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeDeployTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeDeployTest.java@@ -23,6 +23,7 @@ import software.amazon.awssdk.services.codedeploy.model.DeploymentReadyAction;import software.amazon.awssdk.services.codedeploy.model.DeploymentStatus;import software.amazon.awssdk.services.codedeploy.model.DeploymentStyle;import software.amazon.awssdk.services.codedeploy.model.DeploymentType;+import software.amazon.awssdk.services.codedeploy.model.GetApplicationResponse;import software.amazon.awssdk.services.codedeploy.model.GetDeploymentConfigResponse;import software.amazon.awssdk.services.codedeploy.model.GetDeploymentGroupResponse;import software.amazon.awssdk.services.codedeploy.model.GetDeploymentResponse;@@ -132,7 +133,7 @@ class CodeDeployTest {@Test@Order(5)void getApplication() {- var resp = codedeploy.getApplication(r -> r.applicationName("sdk-lambda-app"));+ GetApplicationResponse resp = codedeploy.getApplication(r -> r.applicationName("sdk-lambda-app"));assertThat(resp.application().applicationName()).isEqualTo("sdk-lambda-app");assertThat(resp.application().computePlatform()).isEqualTo(ComputePlatform.LAMBDA);assertThat(resp.application().linkedToGitHub()).isFalse();diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ControlCatalogTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ControlCatalogTest.javaindex cfff4dd349..37e699821f 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ControlCatalogTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ControlCatalogTest.java@@ -3,7 +3,9 @@ package com.floci.test;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.controlcatalog.ControlCatalogClient;import software.amazon.awssdk.services.controlcatalog.model.ControlFilter;+import software.amazon.awssdk.services.controlcatalog.model.GetControlResponse;import software.amazon.awssdk.services.controlcatalog.model.ImplementationFilter;+import software.amazon.awssdk.services.controlcatalog.model.ListControlsResponse;import software.amazon.awssdk.services.controlcatalog.model.ResourceNotFoundException;import static org.junit.jupiter.api.Assertions.assertEquals;@@ -21,12 +23,12 @@ class ControlCatalogTest {@Testvoid controlLookupAndFilteringUseAwsSdkContracts() {try (ControlCatalogClient client = TestFixtures.controlCatalogClient()) {- var control = client.getControl(request -> request.controlArn(CONTROL_ARN));+ GetControlResponse control = client.getControl(request -> request.controlArn(CONTROL_ARN));assertEquals(CONTROL_ARN, control.arn());assertEquals(RCP, control.implementation().type());assertEquals("CT.S3.PV.5", control.implementation().identifier());- var page = client.listControls(request -> request+ ListControlsResponse page = client.listControls(request -> request.maxResults(2).filter(ControlFilter.builder().implementations(ImplementationFilter.builder().types(RCP).build())@@ -37,7 +39,7 @@ class ControlCatalogTest {assertTrue(page.controls().stream().allMatch(item -> item.governedProviders().contains("AWS")));assertFalse(page.nextToken().isBlank());- var secondPage = client.listControls(request -> request+ ListControlsResponse secondPage = client.listControls(request -> request.maxResults(2).nextToken(page.nextToken()).filter(ControlFilter.builder()@@ -47,7 +49,7 @@ class ControlCatalogTest {assertEquals(2, secondPage.controls().size());assertFalse(secondPage.nextToken().isBlank());- var finalPage = client.listControls(request -> request+ ListControlsResponse finalPage = client.listControls(request -> request.maxResults(2).nextToken(secondPage.nextToken()).filter(ControlFilter.builder()@@ -56,7 +58,7 @@ class ControlCatalogTest {.build()));assertEquals(1, finalPage.controls().size());assertNull(finalPage.nextToken());- var arns = new HashSet<String>();+ HashSet<String> arns = new HashSet<>();page.controls().forEach(item -> arns.add(item.arn()));secondPage.controls().forEach(item -> arns.add(item.arn()));finalPage.controls().forEach(item -> arns.add(item.arn()));diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DetectiveOrganizationAdministrationTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DetectiveOrganizationAdministrationTest.javaindex 4c3cfd3438..d17aff38a0 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DetectiveOrganizationAdministrationTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DetectiveOrganizationAdministrationTest.java@@ -4,6 +4,8 @@ import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.detective.DetectiveClient;import software.amazon.awssdk.services.detective.model.Account;+import software.amazon.awssdk.services.detective.model.CreateMembersResponse;+import software.amazon.awssdk.services.organizations.OrganizationsClient;import java.util.List;@@ -21,7 +23,7 @@ class DetectiveOrganizationAdministrationTest {void organizationAdministrationUsesAwsSdk() {assumeFalse(TestFixtures.isRealAws(), "Avoids changing Detective organization settings in real AWS");- try (var organizations = TestFixtures.organizationsClient(MANAGEMENT_ACCOUNT);+ try (OrganizationsClient organizations = TestFixtures.organizationsClient(MANAGEMENT_ACCOUNT);DetectiveClient management = TestFixtures.detectiveClient(MANAGEMENT_ACCOUNT);DetectiveClient administrator = TestFixtures.detectiveClient(ADMIN_ACCOUNT)) {try {@@ -44,13 +46,13 @@ class DetectiveOrganizationAdministrationTest {assertThat(administrator.describeOrganizationConfiguration(request -> request.graphArn(graphArn)).autoEnable()).isTrue();- var created = administrator.createMembers(request -> request+ CreateMembersResponse created = administrator.createMembers(request -> request.graphArn(graphArn).accounts(List.of(Account.builder().accountId(MEMBER_ACCOUNT).build())));assertThat(created.members()).extracting(member -> member.accountId()).containsExactly(MEMBER_ACCOUNT);assertThat(created.unprocessedAccounts()).isEmpty();- var duplicate = administrator.createMembers(request -> request+ CreateMembersResponse duplicate = administrator.createMembers(request -> request.graphArn(graphArn).accounts(List.of(Account.builder().accountId(MEMBER_ACCOUNT).build())));assertThat(duplicate.members()).isEmpty();diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbAccessPathValidationTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbAccessPathValidationTest.javaindex 9d65ba440e..300660695b 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbAccessPathValidationTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbAccessPathValidationTest.java@@ -16,7 +16,9 @@ import software.amazon.awssdk.services.dynamodb.model.KeyType;import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex;import software.amazon.awssdk.services.dynamodb.model.Projection;import software.amazon.awssdk.services.dynamodb.model.ProjectionType;+import software.amazon.awssdk.services.dynamodb.model.QueryResponse;import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;+import software.amazon.awssdk.services.dynamodb.model.ScanResponse;import software.amazon.awssdk.services.dynamodb.model.Select;import java.util.Map;@@ -97,7 +99,7 @@ class DynamoDbAccessPathValidationTest {@Testvoid acceptsTableKeyConditionsInEitherOrder() {- var response = ddb.query(request -> request+ QueryResponse response = ddb.query(request -> request.tableName(TABLE).keyConditionExpression("sk >= :sk AND pk = :pk").expressionAttributeValues(Map.of(@@ -160,7 +162,7 @@ class DynamoDbAccessPathValidationTest {@Testvoid acceptsProjectedGsiAttributesAndLsiTableFetch() {- var gsiResponse = ddb.query(request -> request+ QueryResponse gsiResponse = ddb.query(request -> request.tableName(TABLE).indexName("status-index").keyConditionExpression("#status = :status")@@ -169,7 +171,7 @@ class DynamoDbAccessPathValidationTest {.projectionExpression("pk, #status, summary"));assertThat(gsiResponse.count()).isZero();- var lsiResponse = ddb.query(request -> request+ QueryResponse lsiResponse = ddb.query(request -> request.tableName(TABLE).indexName("alternate-index").keyConditionExpression("pk = :pk")@@ -177,7 +179,7 @@ class DynamoDbAccessPathValidationTest {.select(Select.ALL_ATTRIBUTES));assertThat(lsiResponse.count()).isZero();- var lsiScanResponse = ddb.scan(request -> request+ ScanResponse lsiScanResponse = ddb.scan(request -> request.tableName(TABLE).indexName("alternate-index").projectionExpression("details"));diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbImportTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbImportTest.javaindex 5cd217ebc6..85b76eecb2 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbImportTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbImportTest.java@@ -38,8 +38,8 @@ class DynamoDbImportTest {ddb.deleteTable(DeleteTableRequest.builder().tableName(TABLE_NAME).build());} catch (Exception ignored) {}try {- var objects = s3.listObjectsV2(ListObjectsV2Request.builder().bucket(BUCKET_NAME).build());- for (var obj : objects.contents()) {+ ListObjectsV2Response objects = s3.listObjectsV2(ListObjectsV2Request.builder().bucket(BUCKET_NAME).build());+ for (S3Object obj : objects.contents()) {s3.deleteObject(DeleteObjectRequest.builder().bucket(BUCKET_NAME).key(obj.key()).build());}@@ -77,9 +77,9 @@ class DynamoDbImportTest {@Test@Order(1)void importTable_returnsInProgress() {- var resp = ddb.importTable(importRequest());+ ImportTableResponse resp = ddb.importTable(importRequest());- var desc = resp.importTableDescription();+ ImportTableDescription desc = resp.importTableDescription();assertThat(desc.importArn()).contains("/import/");assertThat(desc.importStatus()).isEqualTo(ImportStatus.IN_PROGRESS);assertThat(desc.tableArn()).endsWith(":table/" + TABLE_NAME);@@ -98,7 +98,7 @@ class DynamoDbImportTest {void listImports_containsImport() {assertThat(importArn).isNotNull();- var resp = ddb.listImports(ListImportsRequest.builder().build());+ ListImportsResponse resp = ddb.listImports(ListImportsRequest.builder().build());assertThat(resp.importSummaryList()).extracting(ImportSummary::importArn)@@ -110,8 +110,8 @@ class DynamoDbImportTest {void describeImport_reachesCompleted() throws Exception {assertThat(importArn).isNotNull();- var desc = describeImport();- var deadline = System.currentTimeMillis() + 10_000;+ ImportTableDescription desc = describeImport();+ long deadline = System.currentTimeMillis() + 10_000;while (desc.importStatus() == ImportStatus.IN_PROGRESS && System.currentTimeMillis() < deadline) {Thread.sleep(100);desc = describeImport();@@ -129,10 +129,10 @@ class DynamoDbImportTest {@Test@Order(4)void importedTable_isActiveAndHoldsTheItems() {- var table = ddb.describeTable(DescribeTableRequest.builder().tableName(TABLE_NAME).build());+ DescribeTableResponse table = ddb.describeTable(DescribeTableRequest.builder().tableName(TABLE_NAME).build());assertThat(table.table().tableStatus()).isEqualTo(TableStatus.ACTIVE);- var scan = ddb.scan(ScanRequest.builder().tableName(TABLE_NAME).build());+ ScanResponse scan = ddb.scan(ScanRequest.builder().tableName(TABLE_NAME).build());assertThat(scan.count()).isEqualTo(2);assertThat(scan.items()).extracting(item -> item.get("pk").s())diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ElasticBeanstalkTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ElasticBeanstalkTest.javaindex 8a8799901a..de1ab84fa8 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ElasticBeanstalkTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ElasticBeanstalkTest.java@@ -7,15 +7,24 @@ import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.elasticbeanstalk.ElasticBeanstalkClient;import software.amazon.awssdk.services.elasticbeanstalk.model.ConfigurationOptionSetting;import software.amazon.awssdk.services.elasticbeanstalk.model.CreateApplicationRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.CreateApplicationResponse;import software.amazon.awssdk.services.elasticbeanstalk.model.CreateApplicationVersionRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.CreateApplicationVersionResponse;import software.amazon.awssdk.services.elasticbeanstalk.model.CreateEnvironmentRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.CreateEnvironmentResponse;+import software.amazon.awssdk.services.elasticbeanstalk.model.DescribeApplicationVersionsResponse;import software.amazon.awssdk.services.elasticbeanstalk.model.DescribeApplicationsRequest;import software.amazon.awssdk.services.elasticbeanstalk.model.DescribeApplicationVersionsRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.DescribeApplicationsResponse;import software.amazon.awssdk.services.elasticbeanstalk.model.DescribeConfigurationSettingsRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.DescribeConfigurationSettingsResponse;import software.amazon.awssdk.services.elasticbeanstalk.model.DescribeEnvironmentsRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.DescribeEnvironmentsResponse;import software.amazon.awssdk.services.elasticbeanstalk.model.S3Location;import software.amazon.awssdk.services.elasticbeanstalk.model.TerminateEnvironmentRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.TerminateEnvironmentResponse;import software.amazon.awssdk.services.elasticbeanstalk.model.UpdateEnvironmentRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.UpdateEnvironmentResponse;import static org.assertj.core.api.Assertions.assertThat;@@ -52,7 +61,7 @@ class ElasticBeanstalkTest {String versionLabel = "v1";String cnamePrefix = TestFixtures.uniqueName("sdk-eb-cname");- var application = elasticBeanstalk.createApplication(CreateApplicationRequest.builder()+ CreateApplicationResponse application = elasticBeanstalk.createApplication(CreateApplicationRequest.builder().applicationName(applicationName).description("Elastic Beanstalk SDK compatibility app").build());@@ -62,7 +71,7 @@ class ElasticBeanstalkTest {.endsWith(":application/" + applicationName);assertThat(application.application().configurationTemplates()).contains("default");- var version = elasticBeanstalk.createApplicationVersion(CreateApplicationVersionRequest.builder()+ CreateApplicationVersionResponse version = elasticBeanstalk.createApplicationVersion(CreateApplicationVersionRequest.builder().applicationName(applicationName).versionLabel(versionLabel).description("Initial SDK version")@@ -76,7 +85,7 @@ class ElasticBeanstalkTest {assertThat(version.applicationVersion().versionLabel()).isEqualTo(versionLabel);assertThat(version.applicationVersion().sourceBundle().s3Bucket()).isEqualTo("source-bucket");- var environment = elasticBeanstalk.createEnvironment(CreateEnvironmentRequest.builder()+ CreateEnvironmentResponse environment = elasticBeanstalk.createEnvironment(CreateEnvironmentRequest.builder().applicationName(applicationName).environmentName(environmentName).versionLabel(versionLabel)@@ -95,7 +104,7 @@ class ElasticBeanstalkTest {assertThat(environment.healthAsString()).isEqualTo("Green");assertThat(environment.cname()).isEqualTo(cnamePrefix + ".elasticbeanstalk.local");- var applications = elasticBeanstalk.describeApplications(DescribeApplicationsRequest.builder()+ DescribeApplicationsResponse applications = elasticBeanstalk.describeApplications(DescribeApplicationsRequest.builder().applicationNames(applicationName).build());assertThat(applications.applications()).singleElement().satisfies(app -> {@@ -104,7 +113,7 @@ class ElasticBeanstalkTest {assertThat(app.versions()).contains(versionLabel);});- var versions = elasticBeanstalk.describeApplicationVersions(DescribeApplicationVersionsRequest.builder()+ DescribeApplicationVersionsResponse versions = elasticBeanstalk.describeApplicationVersions(DescribeApplicationVersionsRequest.builder().applicationName(applicationName).versionLabels(versionLabel).build());@@ -114,7 +123,7 @@ class ElasticBeanstalkTest {assertThat(appVersion.sourceBundle().s3Key()).isEqualTo("app-v1.zip");});- var described = elasticBeanstalk.describeEnvironments(DescribeEnvironmentsRequest.builder()+ DescribeEnvironmentsResponse described = elasticBeanstalk.describeEnvironments(DescribeEnvironmentsRequest.builder().applicationName(applicationName).environmentNames(environmentName).build());@@ -124,7 +133,7 @@ class ElasticBeanstalkTest {assertThat(env.endpointURL()).startsWith("awseb-");});- var updated = elasticBeanstalk.updateEnvironment(UpdateEnvironmentRequest.builder()+ UpdateEnvironmentResponse updated = elasticBeanstalk.updateEnvironment(UpdateEnvironmentRequest.builder().environmentName(environmentName).description("Updated SDK environment").optionSettings(ConfigurationOptionSetting.builder()@@ -137,7 +146,7 @@ class ElasticBeanstalkTest {assertThat(updated.environmentName()).isEqualTo(environmentName);assertThat(updated.description()).isEqualTo("Updated SDK environment");- var settings = elasticBeanstalk.describeConfigurationSettings(DescribeConfigurationSettingsRequest.builder()+ DescribeConfigurationSettingsResponse settings = elasticBeanstalk.describeConfigurationSettings(DescribeConfigurationSettingsRequest.builder().applicationName(applicationName).environmentName(environmentName).build());@@ -148,13 +157,13 @@ class ElasticBeanstalkTest {assertThat(option.value()).isEqualTo("prod");}));- var terminated = elasticBeanstalk.terminateEnvironment(TerminateEnvironmentRequest.builder()+ TerminateEnvironmentResponse terminated = elasticBeanstalk.terminateEnvironment(TerminateEnvironmentRequest.builder().environmentName(environmentName).build());assertThat(terminated.environmentName()).isEqualTo(environmentName);assertThat(terminated.statusAsString()).isEqualTo("Terminated");- var deletedEnvironments = elasticBeanstalk.describeEnvironments(DescribeEnvironmentsRequest.builder()+ DescribeEnvironmentsResponse deletedEnvironments = elasticBeanstalk.describeEnvironments(DescribeEnvironmentsRequest.builder().applicationName(applicationName).environmentNames(environmentName).includeDeleted(true)diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/FisTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/FisTest.javaindex 61933b3e5c..a9e74e2cb9 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/FisTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/FisTest.java@@ -4,19 +4,31 @@ import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.fis.FisClient;import software.amazon.awssdk.services.fis.model.AccountTargeting;+import software.amazon.awssdk.services.fis.model.Action;import software.amazon.awssdk.services.fis.model.ActionsMode;import software.amazon.awssdk.services.fis.model.CreateExperimentTemplateActionInput;+import software.amazon.awssdk.services.fis.model.CreateExperimentTemplateRequest;import software.amazon.awssdk.services.fis.model.CreateExperimentTemplateStopConditionInput;import software.amazon.awssdk.services.fis.model.CreateExperimentTemplateTargetInput;import software.amazon.awssdk.services.fis.model.EmptyTargetResolutionMode;+import software.amazon.awssdk.services.fis.model.Experiment;import software.amazon.awssdk.services.fis.model.ExperimentStatus;+import software.amazon.awssdk.services.fis.model.ExperimentTargetAccountConfiguration;+import software.amazon.awssdk.services.fis.model.ExperimentTemplate;+import software.amazon.awssdk.services.fis.model.ListActionsResponse;+import software.amazon.awssdk.services.fis.model.ListTargetResourceTypesResponse;+import software.amazon.awssdk.services.fis.model.ResolvedTarget;import software.amazon.awssdk.services.fis.model.ResourceNotFoundException;+import software.amazon.awssdk.services.fis.model.SafetyLever;import software.amazon.awssdk.services.fis.model.SafetyLeverStatus;import software.amazon.awssdk.services.fis.model.SafetyLeverStatusInput;import software.amazon.awssdk.services.fis.model.ServiceQuotaExceededException;+import software.amazon.awssdk.services.fis.model.TargetAccountConfiguration;+import software.amazon.awssdk.services.fis.model.TargetResourceType;import software.amazon.awssdk.services.fis.model.ValidationException;import java.util.LinkedHashMap;+import java.util.List;import java.util.Map;import static org.assertj.core.api.Assertions.assertThat;@@ -41,12 +53,12 @@ class FisTest {boolean targetAccountConfigurationExists = false;try (FisClient fis = TestFixtures.fisClient()) {- var action = fis.getAction(request -> request.id(ACTION_ID)).action();+ Action action = fis.getAction(request -> request.id(ACTION_ID)).action();assertThat(action.id()).isEqualTo(ACTION_ID);assertThat(action.arn()).endsWith("action/" + ACTION_ID);assertThat(action.targets()).containsKey("Instances");- var firstActionsPage = fis.listActions(request -> request.maxResults(1));+ ListActionsResponse firstActionsPage = fis.listActions(request -> request.maxResults(1));assertThat(firstActionsPage.actions()).hasSize(1);assertThat(firstActionsPage.nextToken()).isNotBlank();assertThat(fis.listActions(request -> request@@ -87,29 +99,29 @@ class FisTest {.isInstanceOfSatisfying(ValidationException.class,exception -> assertThat(exception.statusCode()).isEqualTo(400));- var targetResourceType = fis.getTargetResourceType(request -> request+ TargetResourceType targetResourceType = fis.getTargetResourceType(request -> request.resourceType(RESOURCE_TYPE)).targetResourceType();assertThat(targetResourceType.resourceType()).isEqualTo(RESOURCE_TYPE);- var firstResourceTypesPage = fis.listTargetResourceTypes(request -> request.maxResults(1));+ ListTargetResourceTypesResponse firstResourceTypesPage = fis.listTargetResourceTypes(request -> request.maxResults(1));assertThat(firstResourceTypesPage.targetResourceTypes()).hasSize(1);assertThat(firstResourceTypesPage.nextToken()).isNotBlank();assertThat(fis.listTargetResourceTypes(request -> request.maxResults(1).nextToken(firstResourceTypesPage.nextToken())).targetResourceTypes()).hasSize(1);- var initialLever = fis.getSafetyLever(request -> request.id("default")).safetyLever();+ SafetyLever initialLever = fis.getSafetyLever(request -> request.id("default")).safetyLever();assertThat(initialLever.id()).isEqualTo("default");assertThat(initialLever.arn()).endsWith("safety-lever/default");- var engagedLever = fis.updateSafetyLeverState(request -> request+ SafetyLever engagedLever = fis.updateSafetyLeverState(request -> request.id("default").state(state -> state.status(SafetyLeverStatusInput.ENGAGED).reason("SDK compatibility test"))).safetyLever();assertThat(engagedLever.state().status()).isEqualTo(SafetyLeverStatus.ENGAGED);- var disengagedLever = fis.updateSafetyLeverState(request -> request+ SafetyLever disengagedLever = fis.updateSafetyLeverState(request -> request.id("default").state(state -> state.status(SafetyLeverStatusInput.DISENGAGED)@@ -117,7 +129,7 @@ class FisTest {assertThat(disengagedLever.state().status()).isEqualTo(SafetyLeverStatus.DISENGAGED);String clientToken = TestFixtures.uniqueName("fis-template");- var createRequest = software.amazon.awssdk.services.fis.model.CreateExperimentTemplateRequest+ CreateExperimentTemplateRequest createRequest = CreateExperimentTemplateRequest.builder().clientToken(clientToken).description("FIS SDK compatibility template")@@ -154,7 +166,7 @@ class FisTest {"arn:aws:cloudwatch::000000000000:dashboard/fis-sdk")))).build();- var createdTemplate = fis.createExperimentTemplate(createRequest).experimentTemplate();+ ExperimentTemplate createdTemplate = fis.createExperimentTemplate(createRequest).experimentTemplate();templateId = createdTemplate.id();String activeTemplateId = templateId;assertThat(activeTemplateId).isNotBlank();@@ -173,12 +185,12 @@ class FisTest {assertThat(fis.createExperimentTemplate(createRequest).experimentTemplate().id()).isEqualTo(activeTemplateId);- var fetchedTemplate = fis.getExperimentTemplate(request -> request.id(activeTemplateId))+ ExperimentTemplate fetchedTemplate = fis.getExperimentTemplate(request -> request.id(activeTemplateId)).experimentTemplate();assertThat(fetchedTemplate.id()).isEqualTo(activeTemplateId);assertThat(fetchedTemplate.creationTime()).isNotNull();- var updatedTemplate = fis.updateExperimentTemplate(request -> request+ ExperimentTemplate updatedTemplate = fis.updateExperimentTemplate(request -> request.id(activeTemplateId).description("Updated through the AWS SDK")).experimentTemplate();assertThat(updatedTemplate.description()).isEqualTo("Updated through the AWS SDK");@@ -187,7 +199,7 @@ class FisTest {.experimentTemplates()).anyMatch(template -> activeTemplateId.equals(template.id()));- var createdTargetAccount = fis.createTargetAccountConfiguration(request -> request+ TargetAccountConfiguration createdTargetAccount = fis.createTargetAccountConfiguration(request -> request.clientToken(TestFixtures.uniqueName("fis-account")).experimentTemplateId(activeTemplateId).accountId(ACCOUNT_ID)@@ -198,12 +210,12 @@ class FisTest {assertThat(createdTargetAccount.accountId()).isEqualTo(ACCOUNT_ID);assertThat(createdTargetAccount.roleArn()).isEqualTo(TARGET_ROLE_ARN);- var fetchedTargetAccount = fis.getTargetAccountConfiguration(request -> request+ TargetAccountConfiguration fetchedTargetAccount = fis.getTargetAccountConfiguration(request -> request.experimentTemplateId(activeTemplateId).accountId(ACCOUNT_ID)).targetAccountConfiguration();assertThat(fetchedTargetAccount.description()).isEqualTo("compatibility target account");- var updatedTargetAccount = fis.updateTargetAccountConfiguration(request -> request+ TargetAccountConfiguration updatedTargetAccount = fis.updateTargetAccountConfiguration(request -> request.experimentTemplateId(activeTemplateId).accountId(ACCOUNT_ID).roleArn(TARGET_ROLE_ARN)@@ -232,7 +244,7 @@ class FisTest {.containsEntry("suite", "sdk-compat").doesNotContainKey("owner");- var startedExperiment = fis.startExperiment(request -> request+ Experiment startedExperiment = fis.startExperiment(request -> request.clientToken(TestFixtures.uniqueName("fis-experiment")).experimentTemplateId(activeTemplateId).experimentOptions(options -> options.actionsMode(ActionsMode.SKIP_ALL))@@ -245,7 +257,7 @@ class FisTest {assertThat(startedExperiment.state().status()).isIn(ExperimentStatus.RUNNING, ExperimentStatus.COMPLETED);- var fetchedExperiment = fis.getExperiment(request -> request.id(experimentId)).experiment();+ Experiment fetchedExperiment = fis.getExperiment(request -> request.id(experimentId)).experiment();assertThat(fetchedExperiment.id()).isEqualTo(experimentId);assertThat(fetchedExperiment.tags()).containsEntry("mode", "safe-preview");@@ -254,7 +266,7 @@ class FisTest {.maxResults(100)).experiments()).anyMatch(experiment -> experimentId.equals(experiment.id()));- var resolvedTargets = fis.listExperimentResolvedTargets(request -> request+ List<ResolvedTarget> resolvedTargets = fis.listExperimentResolvedTargets(request -> request.experimentId(experimentId).targetName("instances").maxResults(100)).resolvedTargets();@@ -262,7 +274,7 @@ class FisTest {.anyMatch(target -> "instances".equals(target.targetName())&& RESOURCE_TYPE.equals(target.resourceType()));- var experimentTargetAccount = fis.getExperimentTargetAccountConfiguration(request -> request+ ExperimentTargetAccountConfiguration experimentTargetAccount = fis.getExperimentTargetAccountConfiguration(request -> request.experimentId(experimentId).accountId(ACCOUNT_ID)).targetAccountConfiguration();assertThat(experimentTargetAccount.accountId()).isEqualTo(ACCOUNT_ID);@@ -272,7 +284,7 @@ class FisTest {.experimentId(experimentId)).targetAccountConfigurations()).anyMatch(configuration -> ACCOUNT_ID.equals(configuration.accountId()));- var stoppedExperiment = fis.stopExperiment(request -> request.id(experimentId)).experiment();+ Experiment stoppedExperiment = fis.stopExperiment(request -> request.id(experimentId)).experiment();assertThat(stoppedExperiment.id()).isEqualTo(experimentId);assertThat(stoppedExperiment.state().status()).isIn(ExperimentStatus.STOPPED, ExperimentStatus.COMPLETED);diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/GlueCatalogTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/GlueCatalogTest.javaindex 3afd35859c..9f02e3172a 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/GlueCatalogTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/GlueCatalogTest.java@@ -6,14 +6,19 @@ import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.glue.GlueClient;import software.amazon.awssdk.services.glue.model.BatchCreatePartitionRequest;+import software.amazon.awssdk.services.glue.model.BatchCreatePartitionResponse;import software.amazon.awssdk.services.glue.model.BatchDeleteConnectionRequest;+import software.amazon.awssdk.services.glue.model.BatchDeleteTableResponse;import software.amazon.awssdk.services.glue.model.ConditionCheckFailureException;import software.amazon.awssdk.services.glue.model.DeleteResourcePolicyRequest;import software.amazon.awssdk.services.glue.model.ExistCondition;+import software.amazon.awssdk.services.glue.model.GetColumnStatisticsForPartitionResponse;+import software.amazon.awssdk.services.glue.model.GetColumnStatisticsForTableResponse;import software.amazon.awssdk.services.glue.model.GetResourcePoliciesRequest;import software.amazon.awssdk.services.glue.model.GetResourcePolicyRequest;import software.amazon.awssdk.services.glue.model.GetResourcePolicyResponse;import software.amazon.awssdk.services.glue.model.GetDataCatalogEncryptionSettingsRequest;+import software.amazon.awssdk.services.glue.model.Partition;import software.amazon.awssdk.services.glue.model.PutResourcePolicyRequest;import software.amazon.awssdk.services.glue.model.BatchDeleteConnectionResponse;import software.amazon.awssdk.services.glue.model.Connection;@@ -28,6 +33,7 @@ import software.amazon.awssdk.services.glue.model.GetConnectionRequest;import software.amazon.awssdk.services.glue.model.GetConnectionsFilter;import software.amazon.awssdk.services.glue.model.GetConnectionsRequest;import software.amazon.awssdk.services.glue.model.PhysicalConnectionRequirements;+import software.amazon.awssdk.services.glue.model.Table;import software.amazon.awssdk.services.glue.model.UpdateConnectionRequest;import software.amazon.awssdk.services.glue.model.BatchDeleteTableRequest;import software.amazon.awssdk.services.glue.model.BatchGetPartitionRequest;@@ -75,6 +81,7 @@ import software.amazon.awssdk.services.glue.model.UpdateUserDefinedFunctionRequeimport software.amazon.awssdk.services.glue.model.UserDefinedFunction;import software.amazon.awssdk.services.glue.model.UserDefinedFunctionInput;import software.amazon.awssdk.services.resourcegroupstaggingapi.ResourceGroupsTaggingApiClient;+import software.amazon.awssdk.services.resourcegroupstaggingapi.model.GetResourcesResponse;import java.time.Instant;import java.util.List;@@ -181,7 +188,7 @@ class GlueCatalogTest {.tableInput(tableInput("created")).build());- var createdTable = glue.getTable(GetTableRequest.builder()+ Table createdTable = glue.getTable(GetTableRequest.builder().databaseName(DATABASE_NAME).name(TABLE_NAME).build()).table();@@ -225,7 +232,7 @@ class GlueCatalogTest {.tableName(TABLE_NAME).columnName("id").build());- var deletedStatistics = glue.getColumnStatisticsForTable(GetColumnStatisticsForTableRequest.builder()+ GetColumnStatisticsForTableResponse deletedStatistics = glue.getColumnStatisticsForTable(GetColumnStatisticsForTableRequest.builder().databaseName(DATABASE_NAME).tableName(TABLE_NAME).columnNames("id")@@ -241,7 +248,7 @@ class GlueCatalogTest {.versionId(createdTable.versionId()).tableInput(tableInput("updated")).build());- var updatedTable = glue.getTable(GetTableRequest.builder()+ Table updatedTable = glue.getTable(GetTableRequest.builder().databaseName(DATABASE_NAME).name(TABLE_NAME).build()).table();@@ -262,7 +269,7 @@ class GlueCatalogTest {.values("2027").build()).build());- var batchCreatePartition = glue.batchCreatePartition(BatchCreatePartitionRequest.builder()+ BatchCreatePartitionResponse batchCreatePartition = glue.batchCreatePartition(BatchCreatePartitionRequest.builder().databaseName(DATABASE_NAME).tableName(TABLE_NAME).partitionInputList(PartitionInput.builder()@@ -308,7 +315,7 @@ class GlueCatalogTest {assertThat(error.partitionValueList()).containsExactly("missing");assertThat(error.errorDetail().errorCode()).isEqualTo("EntityNotFoundException");});- var partition = glue.getPartition(GetPartitionRequest.builder()+ Partition partition = glue.getPartition(GetPartitionRequest.builder().databaseName(DATABASE_NAME).tableName(TABLE_NAME).partitionValues("2026")@@ -396,7 +403,7 @@ class GlueCatalogTest {.build()).build()).build());- var statistics = glue.getColumnStatisticsForPartition(GetColumnStatisticsForPartitionRequest.builder()+ GetColumnStatisticsForPartitionResponse statistics = glue.getColumnStatisticsForPartition(GetColumnStatisticsForPartitionRequest.builder().databaseName(DATABASE_NAME).tableName(TABLE_NAME).partitionValues("2026")@@ -520,7 +527,7 @@ class GlueCatalogTest {.tableInput(tableInput(BATCH_DELETE_DATABASE_NAME, SECOND_TABLE_NAME, "batch delete second table")).build());- var response = glue.batchDeleteTable(BatchDeleteTableRequest.builder()+ BatchDeleteTableResponse response = glue.batchDeleteTable(BatchDeleteTableRequest.builder().databaseName(BATCH_DELETE_DATABASE_NAME).tablesToDelete(TABLE_NAME, SECOND_TABLE_NAME).build());@@ -553,7 +560,7 @@ class GlueCatalogTest {.build());String databaseArn = "arn:aws:glue:us-east-1:000000000000:database/" + DATABASE_TAGGED_NAME;- var response = tagging.getResources(b -> b.resourceARNList(databaseArn));+ GetResourcesResponse response = tagging.getResources(b -> b.resourceARNList(databaseArn));assertThat(response.resourceTagMappingList()).singleElement().satisfies(mapping -> {assertThat(mapping.resourceARN()).isEqualTo(databaseArn);diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/GlueSchemaRegistryTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/GlueSchemaRegistryTest.javaindex ece875cdfb..3f181f5253 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/GlueSchemaRegistryTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/GlueSchemaRegistryTest.java@@ -16,37 +16,51 @@ import org.junit.jupiter.params.provider.EnumSource;import org.junit.jupiter.params.provider.MethodSource;import software.amazon.awssdk.services.glue.GlueClient;import software.amazon.awssdk.services.glue.model.CheckSchemaVersionValidityRequest;+import software.amazon.awssdk.services.glue.model.CheckSchemaVersionValidityResponse;import software.amazon.awssdk.services.glue.model.Compatibility;import software.amazon.awssdk.services.glue.model.CreateRegistryRequest;+import software.amazon.awssdk.services.glue.model.CreateRegistryResponse;import software.amazon.awssdk.services.glue.model.CreateSchemaRequest;+import software.amazon.awssdk.services.glue.model.CreateSchemaResponse;import software.amazon.awssdk.services.glue.model.DataFormat;import software.amazon.awssdk.services.glue.model.DeleteRegistryRequest;import software.amazon.awssdk.services.glue.model.DeleteSchemaRequest;import software.amazon.awssdk.services.glue.model.DeleteSchemaVersionsRequest;+import software.amazon.awssdk.services.glue.model.DeleteSchemaVersionsResponse;import software.amazon.awssdk.services.glue.model.EntityNotFoundException;import software.amazon.awssdk.services.glue.model.GetRegistryRequest;import software.amazon.awssdk.services.glue.model.GetSchemaByDefinitionRequest;+import software.amazon.awssdk.services.glue.model.GetSchemaByDefinitionResponse;import software.amazon.awssdk.services.glue.model.GetSchemaRequest;import software.amazon.awssdk.services.glue.model.GetSchemaVersionRequest;+import software.amazon.awssdk.services.glue.model.GetSchemaVersionResponse;import software.amazon.awssdk.services.glue.model.GetSchemaVersionsDiffRequest;+import software.amazon.awssdk.services.glue.model.GetSchemaVersionsDiffResponse;import software.amazon.awssdk.services.glue.model.GetTagsRequest;import software.amazon.awssdk.services.glue.model.InvalidInputException;import software.amazon.awssdk.services.glue.model.ListRegistriesRequest;+import software.amazon.awssdk.services.glue.model.ListSchemaVersionsResponse;import software.amazon.awssdk.services.glue.model.ListSchemasRequest;import software.amazon.awssdk.services.glue.model.ListSchemaVersionsRequest;import software.amazon.awssdk.services.glue.model.MetadataKeyValuePair;import software.amazon.awssdk.services.glue.model.PutSchemaVersionMetadataRequest;+import software.amazon.awssdk.services.glue.model.PutSchemaVersionMetadataResponse;import software.amazon.awssdk.services.glue.model.QuerySchemaVersionMetadataRequest;+import software.amazon.awssdk.services.glue.model.QuerySchemaVersionMetadataResponse;import software.amazon.awssdk.services.glue.model.RegisterSchemaVersionRequest;+import software.amazon.awssdk.services.glue.model.RegisterSchemaVersionResponse;import software.amazon.awssdk.services.glue.model.RegistryId;import software.amazon.awssdk.services.glue.model.RemoveSchemaVersionMetadataRequest;+import software.amazon.awssdk.services.glue.model.RemoveSchemaVersionMetadataResponse;import software.amazon.awssdk.services.glue.model.SchemaDiffType;import software.amazon.awssdk.services.glue.model.SchemaId;import software.amazon.awssdk.services.glue.model.SchemaVersionNumber;import software.amazon.awssdk.services.glue.model.TagResourceRequest;import software.amazon.awssdk.services.glue.model.UntagResourceRequest;import software.amazon.awssdk.services.glue.model.UpdateRegistryRequest;+import software.amazon.awssdk.services.glue.model.UpdateRegistryResponse;import software.amazon.awssdk.services.glue.model.UpdateSchemaRequest;+import software.amazon.awssdk.services.glue.model.UpdateSchemaResponse;import java.util.HashMap;import java.util.Map;@@ -292,7 +306,7 @@ class GlueSchemaRegistryTest {String schemaName = TestFixtures.uniqueName("default-orders");try (GlueClient glue = TestFixtures.glueClient()) {- var created = glue.createSchema(CreateSchemaRequest.builder()+ CreateSchemaResponse created = glue.createSchema(CreateSchemaRequest.builder().schemaName(schemaName).dataFormat(DataFormat.AVRO).schemaDefinition(AVRO_V1)@@ -306,7 +320,7 @@ class GlueSchemaRegistryTest {assertThat(glue.getRegistry(GetRegistryRequest.builder().build()).registryName()).isEqualTo(AWSSchemaRegistryConstants.DEFAULT_REGISTRY_NAME);- var updatedRegistry = glue.updateRegistry(UpdateRegistryRequest.builder()+ UpdateRegistryResponse updatedRegistry = glue.updateRegistry(UpdateRegistryRequest.builder().registryId(RegistryId.builder().registryName(AWSSchemaRegistryConstants.DEFAULT_REGISTRY_NAME).build())@@ -346,7 +360,7 @@ class GlueSchemaRegistryTest {.registryName(registryName).build());try {- var json = glue.createSchema(CreateSchemaRequest.builder()+ CreateSchemaResponse json = glue.createSchema(CreateSchemaRequest.builder().registryId(RegistryId.builder().registryName(registryName).build()).schemaName(jsonSchemaName).dataFormat(DataFormat.JSON)@@ -358,7 +372,7 @@ class GlueSchemaRegistryTest {.schemaVersionId(json.schemaVersionId()).build()).schemaDefinition()).isEqualTo(JSON_SCHEMA);- var protobuf = glue.createSchema(CreateSchemaRequest.builder()+ CreateSchemaResponse protobuf = glue.createSchema(CreateSchemaRequest.builder().registryId(RegistryId.builder().registryName(registryName).build()).schemaName(protobufSchemaName).dataFormat(DataFormat.PROTOBUF)@@ -374,7 +388,7 @@ class GlueSchemaRegistryTest {.dataFormat(DataFormat.JSON).schemaDefinition(JSON_SCHEMA).build()).valid()).isTrue();- var invalidJson = glue.checkSchemaVersionValidity(CheckSchemaVersionValidityRequest.builder()+ CheckSchemaVersionValidityResponse invalidJson = glue.checkSchemaVersionValidity(CheckSchemaVersionValidityRequest.builder().dataFormat(DataFormat.JSON).schemaDefinition("{not-json").build());@@ -401,15 +415,15 @@ class GlueSchemaRegistryTest {*/@Testvoid sdkClientValidatesAndCanonicalizesProtobufSchemas() {- var registryName = TestFixtures.uniqueName("java-gsr-protobuf-validation");- var schemaName = TestFixtures.uniqueName("protobuf-validated");+ String registryName = TestFixtures.uniqueName("java-gsr-protobuf-validation");+ String schemaName = TestFixtures.uniqueName("protobuf-validated");- try (var glue = TestFixtures.glueClient()) {+ try (GlueClient glue = TestFixtures.glueClient()) {glue.createRegistry(CreateRegistryRequest.builder().registryName(registryName).build());try {- var invalid = glue.checkSchemaVersionValidity(CheckSchemaVersionValidityRequest.builder()+ CheckSchemaVersionValidityResponse invalid = glue.checkSchemaVersionValidity(CheckSchemaVersionValidityRequest.builder().dataFormat(DataFormat.PROTOBUF).schemaDefinition(PROTOBUF_SCHEMA_INVALID).build());@@ -425,7 +439,7 @@ class GlueSchemaRegistryTest {.build())).isInstanceOf(InvalidInputException.class);- var created = glue.createSchema(CreateSchemaRequest.builder()+ CreateSchemaResponse created = glue.createSchema(CreateSchemaRequest.builder().registryId(RegistryId.builder().registryName(registryName).build()).schemaName(schemaName).dataFormat(DataFormat.PROTOBUF)@@ -433,7 +447,7 @@ class GlueSchemaRegistryTest {.schemaDefinition(PROTOBUF_SCHEMA).build());- var reregistered = glue.registerSchemaVersion(RegisterSchemaVersionRequest.builder()+ RegisterSchemaVersionResponse reregistered = glue.registerSchemaVersion(RegisterSchemaVersionRequest.builder().schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName)@@ -615,7 +629,7 @@ class GlueSchemaRegistryTest {.schemaDefinition(AVRO_COMPAT_BASE).build());- var register = RegisterSchemaVersionRequest.builder()+ RegisterSchemaVersionRequest register = RegisterSchemaVersionRequest.builder().schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName)@@ -701,7 +715,7 @@ class GlueSchemaRegistryTest {String schemaName = TestFixtures.uniqueName("meta-schema");try (GlueClient glue = TestFixtures.glueClient()) {- var registry = glue.createRegistry(CreateRegistryRequest.builder()+ CreateRegistryResponse registry = glue.createRegistry(CreateRegistryRequest.builder().registryName(registryName).tags(Map.of("env", "test")).build());@@ -730,7 +744,7 @@ class GlueSchemaRegistryTest {.doesNotContainKey("env").containsEntry("team", "platform");- var schema = glue.createSchema(CreateSchemaRequest.builder()+ CreateSchemaResponse schema = glue.createSchema(CreateSchemaRequest.builder().registryId(RegistryId.builder().registryName(registryName).build()).schemaName(schemaName).dataFormat(DataFormat.AVRO)@@ -742,7 +756,7 @@ class GlueSchemaRegistryTest {.resourceArn(schema.schemaArn()).build()).tags()).containsEntry("purpose", "metadata");- var putMetadata = glue.putSchemaVersionMetadata(PutSchemaVersionMetadataRequest.builder()+ PutSchemaVersionMetadataResponse putMetadata = glue.putSchemaVersionMetadata(PutSchemaVersionMetadataRequest.builder().schemaVersionId(schema.schemaVersionId()).metadataKeyValue(MetadataKeyValuePair.builder().metadataKey("stage")@@ -752,7 +766,7 @@ class GlueSchemaRegistryTest {assertThat(putMetadata.registryName()).isEqualTo(registryName);assertThat(putMetadata.schemaName()).isEqualTo(schemaName);assertThat(putMetadata.latestVersion()).isTrue();- var metadata = glue.querySchemaVersionMetadata(QuerySchemaVersionMetadataRequest.builder()+ QuerySchemaVersionMetadataResponse metadata = glue.querySchemaVersionMetadata(QuerySchemaVersionMetadataRequest.builder().schemaVersionId(schema.schemaVersionId()).build());assertThat(metadata.metadataInfoMap()).containsKey("stage");@@ -765,7 +779,7 @@ class GlueSchemaRegistryTest {.metadataValue("qa").build()).build());- var updatedMetadata = glue.querySchemaVersionMetadata(QuerySchemaVersionMetadataRequest.builder()+ QuerySchemaVersionMetadataResponse updatedMetadata = glue.querySchemaVersionMetadata(QuerySchemaVersionMetadataRequest.builder().schemaVersionId(schema.schemaVersionId()).metadataList(MetadataKeyValuePair.builder().metadataKey("stage")@@ -776,7 +790,7 @@ class GlueSchemaRegistryTest {assertThat(updatedMetadata.metadataInfoMap().get("stage").otherMetadataValueList()).anyMatch(item -> "prod".equals(item.metadataValue()));- var removeMetadata = glue.removeSchemaVersionMetadata(RemoveSchemaVersionMetadataRequest.builder()+ RemoveSchemaVersionMetadataResponse removeMetadata = glue.removeSchemaVersionMetadata(RemoveSchemaVersionMetadataRequest.builder().schemaVersionId(schema.schemaVersionId()).metadataKeyValue(MetadataKeyValuePair.builder().metadataKey("stage")@@ -786,7 +800,7 @@ class GlueSchemaRegistryTest {assertThat(removeMetadata.registryName()).isEqualTo(registryName);assertThat(removeMetadata.schemaName()).isEqualTo(schemaName);assertThat(removeMetadata.latestVersion()).isTrue();- var afterRemoval = glue.querySchemaVersionMetadata(QuerySchemaVersionMetadataRequest.builder()+ QuerySchemaVersionMetadataResponse afterRemoval = glue.querySchemaVersionMetadata(QuerySchemaVersionMetadataRequest.builder().schemaVersionId(schema.schemaVersionId()).build());assertThat(afterRemoval.metadataInfoMap().get("stage").metadataValue()).isEqualTo("prod");@@ -804,13 +818,13 @@ class GlueSchemaRegistryTest {String schemaName = TestFixtures.uniqueName("orders");try (GlueClient glue = TestFixtures.glueClient()) {- var registry = glue.createRegistry(CreateRegistryRequest.builder()+ CreateRegistryResponse registry = glue.createRegistry(CreateRegistryRequest.builder().registryName(registryName).build());assertThat(registry.registryName()).isEqualTo(registryName);assertThat(registry.registryArn()).contains(":registry/" + registryName);- var created = glue.createSchema(CreateSchemaRequest.builder()+ CreateSchemaResponse created = glue.createSchema(CreateSchemaRequest.builder().registryId(RegistryId.builder().registryName(registryName).build()).schemaName(schemaName).dataFormat(DataFormat.AVRO)@@ -820,20 +834,20 @@ class GlueSchemaRegistryTest {assertThat(created.schemaName()).isEqualTo(schemaName);assertThat(created.schemaVersionId()).isNotBlank();- var registered = glue.registerSchemaVersion(RegisterSchemaVersionRequest.builder()+ RegisterSchemaVersionResponse registered = glue.registerSchemaVersion(RegisterSchemaVersionRequest.builder().schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName).build()).schemaDefinition(AVRO_V2).build());assertThat(registered.versionNumber()).isEqualTo(2L);- var byDefinition = glue.getSchemaByDefinition(GetSchemaByDefinitionRequest.builder()+ GetSchemaByDefinitionResponse byDefinition = glue.getSchemaByDefinition(GetSchemaByDefinitionRequest.builder().schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName).build()).schemaDefinition(AVRO_V2).build());assertThat(byDefinition.schemaVersionId()).isEqualTo(registered.schemaVersionId());assertThat(byDefinition.dataFormat()).isEqualTo(DataFormat.AVRO);- var diff = glue.getSchemaVersionsDiff(GetSchemaVersionsDiffRequest.builder()+ GetSchemaVersionsDiffResponse diff = glue.getSchemaVersionsDiff(GetSchemaVersionsDiffRequest.builder().schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName).build()).firstSchemaVersionNumber(SchemaVersionNumber.builder().versionNumber(1L).build()).secondSchemaVersionNumber(SchemaVersionNumber.builder().versionNumber(2L).build())@@ -841,7 +855,7 @@ class GlueSchemaRegistryTest {.build());assertThat(diff.diff()).contains("--- v1", "+++ v2", "amount");- var compatibilityUpdate = glue.updateSchema(UpdateSchemaRequest.builder()+ UpdateSchemaResponse compatibilityUpdate = glue.updateSchema(UpdateSchemaRequest.builder().schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName).build()).compatibility(Compatibility.FORWARD).build());@@ -851,14 +865,14 @@ class GlueSchemaRegistryTest {.schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName).build()).build()).compatibility()).isEqualTo(Compatibility.FORWARD);- var firstPage = glue.listSchemaVersions(ListSchemaVersionsRequest.builder()+ ListSchemaVersionsResponse firstPage = glue.listSchemaVersions(ListSchemaVersionsRequest.builder().schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName).build()).maxResults(1).build());assertThat(firstPage.schemas()).hasSize(1);assertThat(firstPage.nextToken()).isNotBlank();- var secondPage = glue.listSchemaVersions(ListSchemaVersionsRequest.builder()+ ListSchemaVersionsResponse secondPage = glue.listSchemaVersions(ListSchemaVersionsRequest.builder().schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName).build()).maxResults(1).nextToken(firstPage.nextToken())@@ -866,20 +880,20 @@ class GlueSchemaRegistryTest {assertThat(secondPage.schemas()).hasSize(1);assertThat(secondPage.nextToken()).isNull();- var checkpointUpdate = glue.updateSchema(UpdateSchemaRequest.builder()+ UpdateSchemaResponse checkpointUpdate = glue.updateSchema(UpdateSchemaRequest.builder().schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName).build()).schemaVersionNumber(SchemaVersionNumber.builder().versionNumber(2L).build()).build());assertThat(checkpointUpdate.schemaName()).isEqualTo(schemaName);assertThat(checkpointUpdate.registryName()).isEqualTo(registryName);- var deleted = glue.deleteSchemaVersions(DeleteSchemaVersionsRequest.builder()+ DeleteSchemaVersionsResponse deleted = glue.deleteSchemaVersions(DeleteSchemaVersionsRequest.builder().schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName).build()).versions("1").build());assertThat(deleted.schemaVersionErrors()).isEmpty();- var latest = glue.getSchemaVersion(GetSchemaVersionRequest.builder()+ GetSchemaVersionResponse latest = glue.getSchemaVersion(GetSchemaVersionRequest.builder().schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName).build()).schemaVersionNumber(SchemaVersionNumber.builder().latestVersion(true).build()).build());@@ -1038,7 +1052,7 @@ class GlueSchemaRegistryTest {.schemaDefinition(firstSchemaDefinition).build());- var register = RegisterSchemaVersionRequest.builder()+ RegisterSchemaVersionRequest register = RegisterSchemaVersionRequest.builder().schemaId(SchemaId.builder().registryName(registryName).schemaName(schemaName)diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamTest.javaindex 28aa4766e5..bc98fb6fc0 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamTest.java@@ -88,6 +88,7 @@ import software.amazon.awssdk.services.iam.model.PutRolePolicyRequest;import software.amazon.awssdk.services.iam.model.RemoveRoleFromInstanceProfileRequest;import software.amazon.awssdk.services.iam.model.RemoveUserFromGroupRequest;import software.amazon.awssdk.services.iam.model.SimulatePrincipalPolicyRequest;+import software.amazon.awssdk.services.iam.model.SimulatePrincipalPolicyResponse;import software.amazon.awssdk.services.iam.model.StatusType;import software.amazon.awssdk.services.iam.model.SummaryKeyType;import software.amazon.awssdk.services.iam.model.Tag;@@ -489,7 +490,7 @@ class IamTest {@Test@Order(24)void simulatePrincipalPolicy() {- var response = iam.simulatePrincipalPolicy(SimulatePrincipalPolicyRequest.builder()+ SimulatePrincipalPolicyResponse response = iam.simulatePrincipalPolicy(SimulatePrincipalPolicyRequest.builder().policySourceArn("arn:aws:iam::000000000000:user/" + USER_NAME).actionNames("s3:GetObject", "ec2:RunInstances").resourceArns("*")diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IdentityStoreTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IdentityStoreTest.javaindex 18e56995d3..97fc26b6b1 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IdentityStoreTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IdentityStoreTest.java@@ -6,14 +6,20 @@ import software.amazon.awssdk.services.identitystore.IdentitystoreClient;import software.amazon.awssdk.services.identitystore.model.AlternateIdentifier;import software.amazon.awssdk.services.identitystore.model.AttributeOperation;import software.amazon.awssdk.services.identitystore.model.CreateGroupMembershipRequest;+import software.amazon.awssdk.services.identitystore.model.CreateGroupMembershipResponse;import software.amazon.awssdk.services.identitystore.model.CreateGroupRequest;+import software.amazon.awssdk.services.identitystore.model.CreateGroupResponse;import software.amazon.awssdk.services.identitystore.model.CreateUserRequest;+import software.amazon.awssdk.services.identitystore.model.CreateUserResponse;import software.amazon.awssdk.services.identitystore.model.DeleteGroupMembershipRequest;import software.amazon.awssdk.services.identitystore.model.DeleteGroupRequest;import software.amazon.awssdk.services.identitystore.model.DeleteUserRequest;import software.amazon.awssdk.services.identitystore.model.DescribeGroupMembershipRequest;+import software.amazon.awssdk.services.identitystore.model.DescribeGroupMembershipResponse;import software.amazon.awssdk.services.identitystore.model.DescribeGroupRequest;+import software.amazon.awssdk.services.identitystore.model.DescribeGroupResponse;import software.amazon.awssdk.services.identitystore.model.DescribeUserRequest;+import software.amazon.awssdk.services.identitystore.model.DescribeUserResponse;import software.amazon.awssdk.services.identitystore.model.Email;import software.amazon.awssdk.services.identitystore.model.Filter;import software.amazon.awssdk.services.identitystore.model.GetGroupIdRequest;@@ -40,7 +46,7 @@ class IdentityStoreTest {@Testvoid completeIdentityStoreApiUsesAwsSdk() {try (IdentitystoreClient client = TestFixtures.identityStoreClient()) {- var group = client.createGroup(CreateGroupRequest.builder()+ CreateGroupResponse group = client.createGroup(CreateGroupRequest.builder().identityStoreId(STORE).displayName("PlatformAdmins").description("Platform administrators")@@ -48,7 +54,7 @@ class IdentityStoreTest {assertTrue(group.groupId().startsWith("1234567890-"));assertEquals(STORE, group.identityStoreId());- var user = client.createUser(CreateUserRequest.builder()+ CreateUserResponse user = client.createUser(CreateUserRequest.builder().identityStoreId(STORE).userName("[email protected]").displayName("Identity Store SDK")@@ -57,12 +63,12 @@ class IdentityStoreTest {assertTrue(user.userId().startsWith("1234567890-"));assertEquals(STORE, user.identityStoreId());- var describedGroup = client.describeGroup(DescribeGroupRequest.builder()+ DescribeGroupResponse describedGroup = client.describeGroup(DescribeGroupRequest.builder().identityStoreId(STORE).groupId(group.groupId()).build());assertEquals("PlatformAdmins", describedGroup.displayName());assertNotNull(describedGroup.createdAt());- var describedUser = client.describeUser(DescribeUserRequest.builder()+ DescribeUserResponse describedUser = client.describeUser(DescribeUserRequest.builder().identityStoreId(STORE).userId(user.userId()).build());assertEquals("[email protected]", describedUser.userName());assertEquals("[email protected]", describedUser.emails().get(0).value());@@ -117,7 +123,7 @@ class IdentityStoreTest {.identityStoreId(STORE).memberId(member).groupIds(group.groupId()).build()).results().get(0).membershipExists());- var membership = client.createGroupMembership(CreateGroupMembershipRequest.builder()+ CreateGroupMembershipResponse membership = client.createGroupMembership(CreateGroupMembershipRequest.builder().identityStoreId(STORE).groupId(group.groupId()).memberId(member).build());assertTrue(membership.membershipId().startsWith("1234567890-"));@@ -125,7 +131,7 @@ class IdentityStoreTest {.identityStoreId(STORE).memberId(member).groupIds(group.groupId()).build()).results().get(0).membershipExists());- var describedMembership = client.describeGroupMembership(DescribeGroupMembershipRequest.builder()+ DescribeGroupMembershipResponse describedMembership = client.describeGroupMembership(DescribeGroupMembershipRequest.builder().identityStoreId(STORE).membershipId(membership.membershipId()).build());assertEquals(group.groupId(), describedMembership.groupId());assertEquals(user.userId(), describedMembership.memberId().userId());diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Inspector2OrganizationConfigurationTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Inspector2OrganizationConfigurationTest.javaindex 01f595f9cb..723edcde40 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Inspector2OrganizationConfigurationTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Inspector2OrganizationConfigurationTest.java@@ -5,9 +5,16 @@ import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.inspector2.Inspector2Client;import software.amazon.awssdk.services.inspector2.model.AutoEnable;+import software.amazon.awssdk.services.inspector2.model.BatchGetAccountStatusResponse;+import software.amazon.awssdk.services.inspector2.model.DescribeOrganizationConfigurationResponse;+import software.amazon.awssdk.services.inspector2.model.DisableDelegatedAdminAccountResponse;+import software.amazon.awssdk.services.inspector2.model.EnableDelegatedAdminAccountResponse;+import software.amazon.awssdk.services.inspector2.model.EnableResponse;import software.amazon.awssdk.services.inspector2.model.ResourceScanType;+import software.amazon.awssdk.services.inspector2.model.UpdateOrganizationConfigurationResponse;import software.amazon.awssdk.services.organizations.OrganizationsClient;import software.amazon.awssdk.services.organizations.model.AlreadyInOrganizationException;+import software.amazon.awssdk.services.organizations.model.CreateAccountResponse;import static org.assertj.core.api.Assertions.assertThat;import static org.junit.jupiter.api.Assumptions.assumeFalse;@@ -37,7 +44,7 @@ class Inspector2OrganizationConfigurationTest {Inspector2Client administrator = TestFixtures.inspector2Client(delegatedAdminAccount)) {assertThat(management.listDelegatedAdminAccounts(request -> {}).delegatedAdminAccounts()).isEmpty();- var enabled = management.enableDelegatedAdminAccount(request -> request+ EnableDelegatedAdminAccountResponse enabled = management.enableDelegatedAdminAccount(request -> request.delegatedAdminAccountId(delegatedAdminAccount));delegatedAdminEnabled = true;assertThat(enabled.delegatedAdminAccountId()).isEqualTo(delegatedAdminAccount);@@ -49,7 +56,7 @@ class Inspector2OrganizationConfigurationTest {assertThat(account.statusAsString()).isEqualTo("ENABLED");});- var enableMember = administrator.enable(request -> request+ EnableResponse enableMember = administrator.enable(request -> request.accountIds(inspectedMemberAccount).resourceTypes(ResourceScanType.EC2));assertThat(enableMember.accounts()).singleElement().satisfies(account -> {@@ -58,7 +65,7 @@ class Inspector2OrganizationConfigurationTest {assertThat(account.resourceStatus().ecrAsString()).isEqualTo("DISABLED");});- var firstStatus = administrator.batchGetAccountStatus(+ BatchGetAccountStatusResponse firstStatus = administrator.batchGetAccountStatus(request -> request.accountIds(inspectedMemberAccount));assertThat(firstStatus.accounts()).singleElement().satisfies(account -> {assertThat(account.accountId()).isEqualTo(inspectedMemberAccount);@@ -66,7 +73,7 @@ class Inspector2OrganizationConfigurationTest {assertThat(account.resourceState().ec2().statusAsString()).isEqualTo("ENABLING");assertThat(account.resourceState().ecr().statusAsString()).isEqualTo("DISABLED");});- var converged = administrator.batchGetAccountStatus(+ BatchGetAccountStatusResponse converged = administrator.batchGetAccountStatus(request -> request.accountIds(inspectedMemberAccount));assertThat(converged.accounts()).singleElement().satisfies(account -> {assertThat(account.state().statusAsString()).isEqualTo("ENABLED");@@ -74,7 +81,7 @@ class Inspector2OrganizationConfigurationTest {assertThat(account.resourceState().ecr().statusAsString()).isEqualTo("DISABLED");});- var updated = administrator.updateOrganizationConfiguration(request -> request+ UpdateOrganizationConfigurationResponse updated = administrator.updateOrganizationConfiguration(request -> request.autoEnable(AutoEnable.builder().ec2(true).ecr(true)@@ -86,10 +93,10 @@ class Inspector2OrganizationConfigurationTest {assertThat(updated.autoEnable().ecr()).isTrue();assertThat(updated.autoEnable().codeRepository()).isTrue();- var described = administrator.describeOrganizationConfiguration(request -> {});+ DescribeOrganizationConfigurationResponse described = administrator.describeOrganizationConfiguration(request -> {});assertThat(described.autoEnable().codeRepository()).isTrue();- var disabled = management.disableDelegatedAdminAccount(request -> request+ DisableDelegatedAdminAccountResponse disabled = management.disableDelegatedAdminAccount(request -> request.delegatedAdminAccountId(delegatedAdminAccount));delegatedAdminEnabled = false;assertThat(disabled.delegatedAdminAccountId()).isEqualTo(delegatedAdminAccount);@@ -149,7 +156,7 @@ class Inspector2OrganizationConfigurationTest {private static String createMemberAccount(OrganizationsClient organizations, String prefix) {String suffix = TestFixtures.uniqueName(prefix);- var response = organizations.createAccount(request -> request+ CreateAccountResponse response = organizations.createAccount(request -> request.accountName(suffix).email(suffix + "@example.com"));return response.createAccountStatus().accountId();diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IotTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IotTest.javaindex 16143aa29a..812a4dad6d 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IotTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IotTest.java@@ -14,13 +14,20 @@ import software.amazon.awssdk.services.iot.model.CertificateMode;import software.amazon.awssdk.services.iot.model.CertificateStatus;import software.amazon.awssdk.services.iot.model.Action;import software.amazon.awssdk.services.iot.model.AddThingToThingGroupRequest;+import software.amazon.awssdk.services.iot.model.CreateDomainConfigurationResponse;+import software.amazon.awssdk.services.iot.model.CreateJobResponse;import software.amazon.awssdk.services.iot.model.CreateKeysAndCertificateRequest;import software.amazon.awssdk.services.iot.model.CreateDomainConfigurationRequest;import software.amazon.awssdk.services.iot.model.CreateJobRequest;+import software.amazon.awssdk.services.iot.model.CreateKeysAndCertificateResponse;import software.amazon.awssdk.services.iot.model.CreatePolicyRequest;+import software.amazon.awssdk.services.iot.model.CreatePolicyResponse;import software.amazon.awssdk.services.iot.model.CreateThingGroupRequest;+import software.amazon.awssdk.services.iot.model.CreateThingGroupResponse;import software.amazon.awssdk.services.iot.model.CreateThingRequest;+import software.amazon.awssdk.services.iot.model.CreateThingResponse;import software.amazon.awssdk.services.iot.model.CreateThingTypeRequest;+import software.amazon.awssdk.services.iot.model.CreateThingTypeResponse;import software.amazon.awssdk.services.iot.model.CreateTopicRuleRequest;import software.amazon.awssdk.services.iot.model.DeleteDomainConfigurationRequest;import software.amazon.awssdk.services.iot.model.DeleteThingGroupRequest;@@ -28,11 +35,16 @@ import software.amazon.awssdk.services.iot.model.DeleteTopicRuleRequest;import software.amazon.awssdk.services.iot.model.DeleteThingRequest;import software.amazon.awssdk.services.iot.model.DeleteThingTypeRequest;import software.amazon.awssdk.services.iot.model.DescribeCertificateRequest;+import software.amazon.awssdk.services.iot.model.DescribeCertificateResponse;import software.amazon.awssdk.services.iot.model.DescribeDomainConfigurationRequest;+import software.amazon.awssdk.services.iot.model.DescribeDomainConfigurationResponse;import software.amazon.awssdk.services.iot.model.DescribeEndpointRequest;+import software.amazon.awssdk.services.iot.model.DescribeEndpointResponse;import software.amazon.awssdk.services.iot.model.DescribeJobRequest;import software.amazon.awssdk.services.iot.model.DescribeThingRequest;+import software.amazon.awssdk.services.iot.model.DescribeThingResponse;import software.amazon.awssdk.services.iot.model.DescribeThingTypeRequest;+import software.amazon.awssdk.services.iot.model.DescribeThingTypeResponse;import software.amazon.awssdk.services.iot.model.DomainConfigurationStatus;import software.amazon.awssdk.services.iot.model.DomainConfigurationSummary;import software.amazon.awssdk.services.iot.model.DomainType;@@ -42,20 +54,29 @@ import software.amazon.awssdk.services.iot.model.DetachPolicyRequest;import software.amazon.awssdk.services.iot.model.DetachThingPrincipalRequest;import software.amazon.awssdk.services.iot.model.EnableTopicRuleRequest;import software.amazon.awssdk.services.iot.model.GetPolicyRequest;+import software.amazon.awssdk.services.iot.model.GetPolicyResponse;import software.amazon.awssdk.services.iot.model.GetTopicRuleRequest;+import software.amazon.awssdk.services.iot.model.GetTopicRuleResponse;import software.amazon.awssdk.services.iot.model.InvalidRequestException;import software.amazon.awssdk.services.iot.model.ListCertificatesRequest;+import software.amazon.awssdk.services.iot.model.ListCertificatesResponse;import software.amazon.awssdk.services.iot.model.ListDomainConfigurationsRequest;+import software.amazon.awssdk.services.iot.model.ListDomainConfigurationsResponse;import software.amazon.awssdk.services.iot.model.ListJobExecutionsForThingRequest;import software.amazon.awssdk.services.iot.model.ListJobsRequest;import software.amazon.awssdk.services.iot.model.ListPoliciesRequest;+import software.amazon.awssdk.services.iot.model.ListPoliciesResponse;+import software.amazon.awssdk.services.iot.model.ListTagsForResourceResponse;import software.amazon.awssdk.services.iot.model.ListThingGroupsForThingRequest;+import software.amazon.awssdk.services.iot.model.ListThingPrincipalsResponse;import software.amazon.awssdk.services.iot.model.ListThingsInThingGroupRequest;import software.amazon.awssdk.services.iot.model.ListThingsRequest;import software.amazon.awssdk.services.iot.model.ListTagsForResourceRequest;import software.amazon.awssdk.services.iot.model.ListThingPrincipalsRequest;import software.amazon.awssdk.services.iot.model.ListThingTypesRequest;+import software.amazon.awssdk.services.iot.model.ListThingsResponse;import software.amazon.awssdk.services.iot.model.ListTopicRulesRequest;+import software.amazon.awssdk.services.iot.model.ListTopicRulesResponse;import software.amazon.awssdk.services.iot.model.RemoveThingFromThingGroupRequest;import software.amazon.awssdk.services.iot.model.ServerCertificateStatus;import software.amazon.awssdk.services.iot.model.ServiceType;@@ -70,6 +91,7 @@ import software.amazon.awssdk.services.iot.model.TopicRulePayload;import software.amazon.awssdk.services.iot.model.UpdateDomainConfigurationRequest;import software.amazon.awssdk.services.iot.model.UntagResourceRequest;import software.amazon.awssdk.services.iot.model.UpdateCertificateRequest;+import software.amazon.awssdk.services.iot.model.UpdateDomainConfigurationResponse;import software.amazon.awssdk.services.iot.model.UpdateThingRequest;import software.amazon.awssdk.services.iot.model.UpdateThingTypeRequest;import software.amazon.awssdk.services.iot.model.VersionConflictException;@@ -77,18 +99,25 @@ import software.amazon.awssdk.services.iotdataplane.IotDataPlaneClient;import software.amazon.awssdk.services.iotdataplane.model.DeleteConnectionRequest;import software.amazon.awssdk.services.iotdataplane.model.DeleteThingShadowRequest;import software.amazon.awssdk.services.iotdataplane.model.GetThingShadowRequest;+import software.amazon.awssdk.services.iotdataplane.model.GetThingShadowResponse;import software.amazon.awssdk.services.iotdataplane.model.ListNamedShadowsForThingRequest;+import software.amazon.awssdk.services.iotdataplane.model.ListNamedShadowsForThingResponse;import software.amazon.awssdk.services.iotdataplane.model.PublishRequest;import software.amazon.awssdk.services.iotdataplane.model.UpdateThingShadowRequest;+import software.amazon.awssdk.services.iotdataplane.model.UpdateThingShadowResponse;import software.amazon.awssdk.services.iotjobsdataplane.IotJobsDataPlaneClient;import software.amazon.awssdk.services.iotjobsdataplane.model.GetPendingJobExecutionsRequest;+import software.amazon.awssdk.services.iotjobsdataplane.model.GetPendingJobExecutionsResponse;import software.amazon.awssdk.services.iotjobsdataplane.model.JobExecutionStatus;import software.amazon.awssdk.services.iotjobsdataplane.model.StartNextPendingJobExecutionRequest;+import software.amazon.awssdk.services.iotjobsdataplane.model.StartNextPendingJobExecutionResponse;import software.amazon.awssdk.services.iotjobsdataplane.model.UpdateJobExecutionRequest;+import software.amazon.awssdk.services.iotjobsdataplane.model.UpdateJobExecutionResponse;import software.amazon.awssdk.services.sqs.SqsClient;import software.amazon.awssdk.services.sqs.model.CreateQueueRequest;import software.amazon.awssdk.services.sqs.model.DeleteQueueRequest;import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;+import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;import java.io.ByteArrayOutputStream;import java.io.IOException;@@ -115,7 +144,7 @@ class IotTest {@Testvoid describeEndpoint() {- var response = iot.describeEndpoint(DescribeEndpointRequest.builder()+ DescribeEndpointResponse response = iot.describeEndpoint(DescribeEndpointRequest.builder().endpointType("iot:Data-ATS").build());@@ -142,14 +171,14 @@ class IotTest {.build())).isInstanceOf(ResourceNotFoundException.class);- var managed = iot.describeDomainConfiguration(DescribeDomainConfigurationRequest.builder()+ DescribeDomainConfigurationResponse managed = iot.describeDomainConfiguration(DescribeDomainConfigurationRequest.builder().domainConfigurationName("iot:Data-ATS").build());assertThat(managed.domainType()).isEqualTo(DomainType.AWS_MANAGED);assertThat(managed.domainConfigurationStatus()).isEqualTo(DomainConfigurationStatus.ENABLED);assertThat(managed.domainName()).isNotBlank();- var created = iot.createDomainConfiguration(CreateDomainConfigurationRequest.builder()+ CreateDomainConfigurationResponse created = iot.createDomainConfiguration(CreateDomainConfigurationRequest.builder().domainConfigurationName(name).domainName("iot.java.example.com").serverCertificateArns(certificateArn)@@ -171,7 +200,7 @@ class IotTest {.build())).isInstanceOf(ResourceAlreadyExistsException.class);- var described = iot.describeDomainConfiguration(DescribeDomainConfigurationRequest.builder()+ DescribeDomainConfigurationResponse described = iot.describeDomainConfiguration(DescribeDomainConfigurationRequest.builder().domainConfigurationName(name).build());assertThat(described.domainConfigurationArn()).isEqualTo(created.domainConfigurationArn());@@ -187,7 +216,7 @@ class IotTest {assertThat(described.lastStatusChangeDate()).isNotNull();assertThat(described.tlsConfig().securityPolicy()).isEqualTo("IoTSecurityPolicy_TLS13_1_2_2022_10");- var enabled = iot.updateDomainConfiguration(UpdateDomainConfigurationRequest.builder()+ UpdateDomainConfigurationResponse enabled = iot.updateDomainConfiguration(UpdateDomainConfigurationRequest.builder().domainConfigurationName(name).domainConfigurationStatus(DomainConfigurationStatus.ENABLED).build());@@ -197,12 +226,12 @@ class IotTest {.build()).domainConfigurationStatus()).isEqualTo(DomainConfigurationStatus.ENABLED);- var tags = iot.listTagsForResource(ListTagsForResourceRequest.builder()+ ListTagsForResourceResponse tags = iot.listTagsForResource(ListTagsForResourceRequest.builder().resourceArn(created.domainConfigurationArn()).build());assertThat(tags.tags()).extracting(Tag::key).contains("env");- var listed = iot.listDomainConfigurations(ListDomainConfigurationsRequest.builder()+ ListDomainConfigurationsResponse listed = iot.listDomainConfigurations(ListDomainConfigurationsRequest.builder().serviceType(ServiceType.DATA).build());assertThat(listed.domainConfigurations())@@ -214,7 +243,7 @@ class IotTest {.build())).isInstanceOf(InvalidRequestException.class);- var updated = iot.updateDomainConfiguration(UpdateDomainConfigurationRequest.builder()+ UpdateDomainConfigurationResponse updated = iot.updateDomainConfiguration(UpdateDomainConfigurationRequest.builder().domainConfigurationName(name).domainConfigurationStatus(DomainConfigurationStatus.DISABLED).build());@@ -244,14 +273,14 @@ class IotTest {assertThatThrownBy(() -> iot.describeThing(DescribeThingRequest.builder().thingName(thingName).build())).isInstanceOf(ResourceNotFoundException.class);- var created = iot.createThing(CreateThingRequest.builder()+ CreateThingResponse created = iot.createThing(CreateThingRequest.builder().thingName(thingName).attributePayload(AttributePayload.builder().attributes(Map.of("env", "java")).build()).build());assertThat(created.thingName()).isEqualTo(thingName);assertThat(created.thingArn()).endsWith(":thing/" + thingName);- var idempotent = iot.createThing(CreateThingRequest.builder()+ CreateThingResponse idempotent = iot.createThing(CreateThingRequest.builder().thingName(thingName).attributePayload(AttributePayload.builder().attributes(Map.of("env", "java")).build()).build());@@ -260,18 +289,18 @@ class IotTest {assertThatThrownBy(() -> iot.createThing(CreateThingRequest.builder().thingName(thingName).build())).isInstanceOf(ResourceAlreadyExistsException.class);- var described = iot.describeThing(DescribeThingRequest.builder().thingName(thingName).build());+ DescribeThingResponse described = iot.describeThing(DescribeThingRequest.builder().thingName(thingName).build());assertThat(described.attributes()).containsEntry("env", "java");iot.createThing(CreateThingRequest.builder().thingName(otherThingName).build());- var listed = iot.listThings(ListThingsRequest.builder().build());+ ListThingsResponse listed = iot.listThings(ListThingsRequest.builder().build());assertThat(listed.things()).anyMatch(thing -> thingName.equals(thing.thingName()));- var firstPage = iot.listThings(ListThingsRequest.builder().maxResults(1).build());+ ListThingsResponse firstPage = iot.listThings(ListThingsRequest.builder().maxResults(1).build());assertThat(firstPage.things()).hasSize(1);assertThat(firstPage.nextToken()).isNotBlank();- var secondPage = iot.listThings(ListThingsRequest.builder()+ ListThingsResponse secondPage = iot.listThings(ListThingsRequest.builder().maxResults(1).nextToken(firstPage.nextToken()).build());@@ -299,7 +328,7 @@ class IotTest {.build())).isInstanceOf(VersionConflictException.class);- var updated = iot.describeThing(DescribeThingRequest.builder().thingName(thingName).build());+ DescribeThingResponse updated = iot.describeThing(DescribeThingRequest.builder().thingName(thingName).build());assertThat(updated.attributes()).containsEntry("env", "versioned").containsEntry("owner", "iot");iot.deleteThing(DeleteThingRequest.builder().thingName(thingName).build());@@ -316,10 +345,10 @@ class IotTest {} catch (Exception ignored) {}- var created = iot.createThing(CreateThingRequest.builder().thingName(thingName).build());+ CreateThingResponse created = iot.createThing(CreateThingRequest.builder().thingName(thingName).build());String thingArn = created.thingArn();- var emptyTags = iot.listTagsForResource(ListTagsForResourceRequest.builder()+ ListTagsForResourceResponse emptyTags = iot.listTagsForResource(ListTagsForResourceRequest.builder().resourceArn(thingArn).build());assertThat(emptyTags.tags()).isEmpty();@@ -330,7 +359,7 @@ class IotTest {Tag.builder().key("owner").value("iot").build()).build());- var tags = iot.listTagsForResource(ListTagsForResourceRequest.builder()+ ListTagsForResourceResponse tags = iot.listTagsForResource(ListTagsForResourceRequest.builder().resourceArn(thingArn).build());assertThat(tags.tags()).extracting(Tag::key).containsExactlyInAnyOrder("env", "owner");@@ -341,7 +370,7 @@ class IotTest {.tagKeys("env").build());- var remainingTags = iot.listTagsForResource(ListTagsForResourceRequest.builder()+ ListTagsForResourceResponse remainingTags = iot.listTagsForResource(ListTagsForResourceRequest.builder().resourceArn(thingArn).build());assertThat(remainingTags.tags()).extracting(Tag::key).containsExactly("owner");@@ -354,13 +383,13 @@ class IotTest {@Testvoid certificatesPoliciesAndAttachments() {- var cert = iot.createKeysAndCertificate(CreateKeysAndCertificateRequest.builder()+ CreateKeysAndCertificateResponse cert = iot.createKeysAndCertificate(CreateKeysAndCertificateRequest.builder().setAsActive(true).build());assertThat(cert.certificatePem()).contains("BEGIN CERTIFICATE");assertThat(cert.keyPair().publicKey()).contains("BEGIN PUBLIC KEY");- var described = iot.describeCertificate(DescribeCertificateRequest.builder()+ DescribeCertificateResponse described = iot.describeCertificate(DescribeCertificateRequest.builder().certificateId(cert.certificateId()).build());assertThat(described.certificateDescription().status()).isEqualTo(CertificateStatus.ACTIVE);@@ -370,7 +399,7 @@ class IotTest {assertThat(cert.certificateId()).matches("[0-9a-f]{64}");assertThat(cert.keyPair().privateKey()).startsWith("-----BEGIN RSA PRIVATE KEY-----");- var certs = iot.listCertificates(ListCertificatesRequest.builder().build());+ ListCertificatesResponse certs = iot.listCertificates(ListCertificatesRequest.builder().build());assertThat(certs.certificates()).anyMatch(item -> cert.certificateArn().equals(item.certificateArn()));iot.updateCertificate(UpdateCertificateRequest.builder()@@ -384,16 +413,16 @@ class IotTest {String policyName = "java-iot-policy";String policyDocument = "{\"Version\":\"2012-10-17\",\"Statement\":[]}";- var policy = iot.createPolicy(CreatePolicyRequest.builder()+ CreatePolicyResponse policy = iot.createPolicy(CreatePolicyRequest.builder().policyName(policyName).policyDocument(policyDocument).build());assertThat(policy.policyName()).isEqualTo(policyName);- var gotPolicy = iot.getPolicy(GetPolicyRequest.builder().policyName(policyName).build());+ GetPolicyResponse gotPolicy = iot.getPolicy(GetPolicyRequest.builder().policyName(policyName).build());assertThat(gotPolicy.policyDocument()).contains("2012-10-17");- var policies = iot.listPolicies(ListPoliciesRequest.builder().build());+ ListPoliciesResponse policies = iot.listPolicies(ListPoliciesRequest.builder().build());assertThat(policies.policies()).anyMatch(item -> policyName.equals(item.policyName()));iot.attachPolicy(AttachPolicyRequest.builder().policyName(policyName).target(cert.certificateArn()).build());@@ -409,7 +438,7 @@ class IotTest {.thingName(thingName).principal(cert.certificateArn()).build());- var principals = iot.listThingPrincipals(ListThingPrincipalsRequest.builder().thingName(thingName).build());+ ListThingPrincipalsResponse principals = iot.listThingPrincipals(ListThingPrincipalsRequest.builder().thingName(thingName).build());assertThat(principals.principals()).contains(cert.certificateArn());iot.detachThingPrincipal(DetachThingPrincipalRequest.builder().thingName(thingName)@@ -430,7 +459,7 @@ class IotTest {.build())).isInstanceOf(software.amazon.awssdk.services.iotdataplane.model.ResourceNotFoundException.class);- var updated = iotData.updateThingShadow(UpdateThingShadowRequest.builder()+ UpdateThingShadowResponse updated = iotData.updateThingShadow(UpdateThingShadowRequest.builder().thingName(thingName).payload(SdkBytes.fromUtf8String("{\"state\":{\"desired\":{\"color\":\"blue\"}}}")).build());@@ -440,7 +469,7 @@ class IotTest {.thingName(thingName).payload(SdkBytes.fromUtf8String("{\"state\":{\"reported\":{\"color\":\"green\"}}}")).build());- var got = iotData.getThingShadow(GetThingShadowRequest.builder().thingName(thingName).build());+ GetThingShadowResponse got = iotData.getThingShadow(GetThingShadowRequest.builder().thingName(thingName).build());assertThat(got.payload().asUtf8String()).contains("blue").contains("green");iotData.updateThingShadow(UpdateThingShadowRequest.builder()@@ -448,7 +477,7 @@ class IotTest {.shadowName("settings").payload(SdkBytes.fromUtf8String("{\"state\":{\"desired\":{\"mode\":\"auto\"}}}")).build());- var named = iotData.listNamedShadowsForThing(ListNamedShadowsForThingRequest.builder()+ ListNamedShadowsForThingResponse named = iotData.listNamedShadowsForThing(ListNamedShadowsForThingRequest.builder().thingName(thingName).build());assertThat(named.results()).contains("settings");@@ -485,12 +514,12 @@ class IotTest {.build()).build());- var got = iot.getTopicRule(GetTopicRuleRequest.builder().ruleName(ruleName).build());+ GetTopicRuleResponse got = iot.getTopicRule(GetTopicRuleRequest.builder().ruleName(ruleName).build());assertThat(got.rule().ruleName()).isEqualTo(ruleName);assertThat(got.rule().actions().get(0).sqs().queueUrl()).isEqualTo(queueUrl);iot.disableTopicRule(DisableTopicRuleRequest.builder().ruleName(ruleName).build());- var listed = iot.listTopicRules(ListTopicRulesRequest.builder().build());+ ListTopicRulesResponse listed = iot.listTopicRules(ListTopicRulesRequest.builder().build());assertThat(listed.rules()).anyMatch(rule -> ruleName.equals(rule.ruleName()) && rule.ruleDisabled());iot.enableTopicRule(EnableTopicRuleRequest.builder().ruleName(ruleName).build());@@ -499,7 +528,7 @@ class IotTest {.payload(SdkBytes.fromUtf8String("java-rule-payload")).build());- var received = sqs.receiveMessage(ReceiveMessageRequest.builder()+ ReceiveMessageResponse received = sqs.receiveMessage(ReceiveMessageRequest.builder().queueUrl(queueUrl).maxNumberOfMessages(1).build());@@ -534,10 +563,10 @@ class IotTest {} catch (Exception ignored) {}- var jobsEndpoint = iot.describeEndpoint(DescribeEndpointRequest.builder().endpointType("iot:Jobs").build());+ DescribeEndpointResponse jobsEndpoint = iot.describeEndpoint(DescribeEndpointRequest.builder().endpointType("iot:Jobs").build());assertThat(jobsEndpoint.endpointAddress()).isNotBlank();- var createdType = iot.createThingType(CreateThingTypeRequest.builder()+ CreateThingTypeResponse createdType = iot.createThingType(CreateThingTypeRequest.builder().thingTypeName(thingType).thingTypeProperties(ThingTypeProperties.builder().thingTypeDescription("java type")@@ -545,7 +574,7 @@ class IotTest {.build()).build());assertThat(createdType.thingTypeName()).isEqualTo(thingType);- var describedType = iot.describeThingType(DescribeThingTypeRequest.builder().thingTypeName(thingType).build());+ DescribeThingTypeResponse describedType = iot.describeThingType(DescribeThingTypeRequest.builder().thingTypeName(thingType).build());assertThat(describedType.thingTypeProperties().thingTypeDescription()).isEqualTo("java type");assertThat(iot.listThingTypes(ListThingTypesRequest.builder().build()).thingTypes()).anyMatch(type -> thingType.equals(type.thingTypeName()));@@ -558,14 +587,14 @@ class IotTest {.build()).build());- var createdThing = iot.createThing(CreateThingRequest.builder()+ CreateThingResponse createdThing = iot.createThing(CreateThingRequest.builder().thingName(thingName).thingTypeName(thingType).attributePayload(AttributePayload.builder().attributes(Map.of("model", "j1")).build()).build());assertThat(iot.describeThing(DescribeThingRequest.builder().thingName(thingName).build()).thingTypeName()).isEqualTo(thingType);- var createdGroup = iot.createThingGroup(CreateThingGroupRequest.builder()+ CreateThingGroupResponse createdGroup = iot.createThingGroup(CreateThingGroupRequest.builder().thingGroupName(groupName).thingGroupProperties(ThingGroupProperties.builder().thingGroupDescription("java group")@@ -578,7 +607,7 @@ class IotTest {assertThat(iot.listThingGroupsForThing(ListThingGroupsForThingRequest.builder().thingName(thingName).build()).thingGroups()).anyMatch(group -> groupName.equals(group.groupName()));- var createdJob = iot.createJob(CreateJobRequest.builder()+ CreateJobResponse createdJob = iot.createJob(CreateJobRequest.builder().jobId(jobId).targets(createdThing.thingArn()).document("{\"operation\":\"reboot\"}")@@ -590,14 +619,14 @@ class IotTest {assertThat(iot.listJobExecutionsForThing(ListJobExecutionsForThingRequest.builder().thingName(thingName).build()).executionSummaries()).anyMatch(execution -> jobId.equals(execution.jobId()));- var pending = iotJobsData.getPendingJobExecutions(GetPendingJobExecutionsRequest.builder().thingName(thingName).build());+ GetPendingJobExecutionsResponse pending = iotJobsData.getPendingJobExecutions(GetPendingJobExecutionsRequest.builder().thingName(thingName).build());assertThat(pending.queuedJobs()).anyMatch(job -> jobId.equals(job.jobId()));- var started = iotJobsData.startNextPendingJobExecution(StartNextPendingJobExecutionRequest.builder()+ StartNextPendingJobExecutionResponse started = iotJobsData.startNextPendingJobExecution(StartNextPendingJobExecutionRequest.builder().thingName(thingName).statusDetails(Map.of("phase", "download")).build());assertThat(started.execution().status()).isEqualTo(JobExecutionStatus.IN_PROGRESS);- var updated = iotJobsData.updateJobExecution(UpdateJobExecutionRequest.builder()+ UpdateJobExecutionResponse updated = iotJobsData.updateJobExecution(UpdateJobExecutionRequest.builder().thingName(thingName).jobId(jobId).status(JobExecutionStatus.SUCCEEDED)diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KinesisEfoTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KinesisEfoTest.javaindex 91ef3c79c6..1d107976d2 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KinesisEfoTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KinesisEfoTest.java@@ -12,9 +12,12 @@ import software.amazon.awssdk.services.kinesis.KinesisAsyncClient;import software.amazon.awssdk.services.kinesis.KinesisClient;import software.amazon.awssdk.services.kinesis.model.ConsumerStatus;import software.amazon.awssdk.services.kinesis.model.DescribeStreamConsumerRequest;+import software.amazon.awssdk.services.kinesis.model.DescribeStreamConsumerResponse;import software.amazon.awssdk.services.kinesis.model.DescribeStreamRequest;+import software.amazon.awssdk.services.kinesis.model.DescribeStreamResponse;import software.amazon.awssdk.services.kinesis.model.PutRecordRequest;import software.amazon.awssdk.services.kinesis.model.RegisterStreamConsumerRequest;+import software.amazon.awssdk.services.kinesis.model.RegisterStreamConsumerResponse;import software.amazon.awssdk.services.kinesis.model.ShardIteratorType;import software.amazon.awssdk.services.kinesis.model.StartingPosition;import software.amazon.awssdk.services.kinesis.model.SubscribeToShardEvent;@@ -50,7 +53,7 @@ class KinesisEfoTest {assertDoesNotThrow(() -> kinesis.createStream(r -> r.streamName(STREAM_NAME).shardCount(1)));- var desc = kinesis.describeStream(DescribeStreamRequest.builder().streamName(STREAM_NAME).build());+ DescribeStreamResponse desc = kinesis.describeStream(DescribeStreamRequest.builder().streamName(STREAM_NAME).build());streamArn = desc.streamDescription().streamARN();shardId = desc.streamDescription().shards().get(0).shardId();@@ -73,7 +76,7 @@ class KinesisEfoTest {@Test@Order(1)void registerStreamConsumer() {- var response = assertDoesNotThrow(() ->+ RegisterStreamConsumerResponse response = assertDoesNotThrow(() ->kinesis.registerStreamConsumer(RegisterStreamConsumerRequest.builder().streamARN(streamArn).consumerName(CONSUMER_NAME)@@ -90,7 +93,7 @@ class KinesisEfoTest {void describeStreamConsumer() {assertThat(consumerArn).as("consumerArn must be set by registerStreamConsumer").isNotBlank();- var response = assertDoesNotThrow(() ->+ DescribeStreamConsumerResponse response = assertDoesNotThrow(() ->kinesis.describeStreamConsumer(DescribeStreamConsumerRequest.builder().consumerARN(consumerArn).build()));diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KinesisTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KinesisTest.javaindex 7600465763..0a05647a53 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KinesisTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KinesisTest.java@@ -15,6 +15,7 @@ import software.amazon.awssdk.services.kinesis.KinesisClient;import software.amazon.awssdk.services.kinesis.model.CreateStreamRequest;import software.amazon.awssdk.services.kinesis.model.DeleteStreamRequest;import software.amazon.awssdk.services.kinesis.model.DescribeStreamSummaryRequest;+import software.amazon.awssdk.services.kinesis.model.DescribeStreamSummaryResponse;import software.amazon.awssdk.services.kinesis.model.ListShardsRequest;import software.amazon.awssdk.services.kinesis.model.ListShardsResponse;@@ -69,7 +70,7 @@ class KinesisTest {.shardCount(1).build()));- var response = assertDoesNotThrow(() -> kinesis.describeStreamSummary(+ DescribeStreamSummaryResponse response = assertDoesNotThrow(() -> kinesis.describeStreamSummary(DescribeStreamSummaryRequest.builder().streamName(streamName).build()));diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KmsFeaturesTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KmsFeaturesTest.javaindex d62c04cf81..0ede6d66f3 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KmsFeaturesTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KmsFeaturesTest.java@@ -7,9 +7,13 @@ import software.amazon.awssdk.core.SdkBytes;import software.amazon.awssdk.services.kms.KmsClient;import software.amazon.awssdk.services.kms.model.AlgorithmSpec;import software.amazon.awssdk.services.kms.model.CreateKeyResponse;+import software.amazon.awssdk.services.kms.model.DecryptResponse;import software.amazon.awssdk.services.kms.model.DisabledException;+import software.amazon.awssdk.services.kms.model.EncryptResponse;import software.amazon.awssdk.services.kms.model.EncryptionAlgorithmSpec;import software.amazon.awssdk.services.kms.model.GetKeyPolicyResponse;+import software.amazon.awssdk.services.kms.model.GetParametersForImportResponse;+import software.amazon.awssdk.services.kms.model.GetPublicKeyResponse;import software.amazon.awssdk.services.kms.model.IncorrectKeyException;import software.amazon.awssdk.services.kms.model.InvalidKeyUsageException;import software.amazon.awssdk.services.kms.model.KeySpec;@@ -19,7 +23,9 @@ import software.amazon.awssdk.services.kms.model.ExpirationModelType;import software.amazon.awssdk.services.kms.model.KeyState;import software.amazon.awssdk.services.kms.model.ListResourceTagsResponse;import software.amazon.awssdk.services.kms.model.OriginType;+import software.amazon.awssdk.services.kms.model.SignResponse;import software.amazon.awssdk.services.kms.model.SigningAlgorithmSpec;+import software.amazon.awssdk.services.kms.model.VerifyResponse;import software.amazon.awssdk.services.kms.model.WrappingKeySpec;import javax.crypto.Cipher;@@ -241,21 +247,21 @@ class KmsFeaturesTest {.keyMetadata().keyId();try {- var publicKey = kms.getPublicKey(b -> b.keyId(keyId));+ GetPublicKeyResponse publicKey = kms.getPublicKey(b -> b.keyId(keyId));assertThat(publicKey.publicKey()).isNotNull();assertThat(publicKey.keySpec()).isEqualTo(keySpec);assertThat(publicKey.keyUsage()).isEqualTo(KeyUsageType.SIGN_VERIFY);assertThat(publicKey.signingAlgorithms()).containsExactly(SigningAlgorithmSpec.ML_DSA_SHAKE_256);SdkBytes message = SdkBytes.fromUtf8String("ml-dsa SDK compatibility");- var signed = kms.sign(b -> b+ SignResponse signed = kms.sign(b -> b.keyId(keyId).message(message).signingAlgorithm(SigningAlgorithmSpec.ML_DSA_SHAKE_256));assertThat(signed.signature()).isNotNull();assertThat(signed.signingAlgorithm()).isEqualTo(SigningAlgorithmSpec.ML_DSA_SHAKE_256);- var verified = kms.verify(b -> b+ VerifyResponse verified = kms.verify(b -> b.keyId(keyId).message(message).signature(signed.signature())@@ -440,13 +446,13 @@ class KmsFeaturesTest {@Test@Order(70)void rsaOaepEncryptDecryptRoundTrip() {- var keyId = kms.createKey(b -> b+ String keyId = kms.createKey(b -> b.keyUsage(KeyUsageType.ENCRYPT_DECRYPT).keySpec(KeySpec.RSA_2048)).keyMetadata().keyId();try {- var encrypted = kms.encrypt(b -> b+ EncryptResponse encrypted = kms.encrypt(b -> b.keyId(keyId).plaintext(SdkBytes.fromString("secret payload", StandardCharsets.UTF_8)).encryptionAlgorithm(EncryptionAlgorithmSpec.RSAES_OAEP_SHA_256));@@ -454,7 +460,7 @@ class KmsFeaturesTest {assertThat(encrypted.ciphertextBlob().asByteArray()).hasSize(256);assertThat(encrypted.encryptionAlgorithm()).isEqualTo(EncryptionAlgorithmSpec.RSAES_OAEP_SHA_256);- var decrypted = kms.decrypt(b -> b+ DecryptResponse decrypted = kms.decrypt(b -> b.keyId(keyId).ciphertextBlob(encrypted.ciphertextBlob()).encryptionAlgorithm(EncryptionAlgorithmSpec.RSAES_OAEP_SHA_256));@@ -469,22 +475,22 @@ class KmsFeaturesTest {@Test@Order(71)void decryptAcceptsRsaOaepCiphertextMadeWithGetPublicKey() throws Exception {- var keyId = kms.createKey(b -> b+ String keyId = kms.createKey(b -> b.keyUsage(KeyUsageType.ENCRYPT_DECRYPT).keySpec(KeySpec.RSA_2048)).keyMetadata().keyId();try {- var publicKeyDer = kms.getPublicKey(b -> b.keyId(keyId)).publicKey().asByteArray();- var publicKey = java.security.KeyFactory.getInstance("RSA")+ byte[] publicKeyDer = kms.getPublicKey(b -> b.keyId(keyId)).publicKey().asByteArray();+ PublicKey publicKey = KeyFactory.getInstance("RSA").generatePublic(new java.security.spec.X509EncodedKeySpec(publicKeyDer));- var cipher = javax.crypto.Cipher.getInstance("RSA/ECB/OAEPPadding");+ Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPPadding");cipher.init(javax.crypto.Cipher.ENCRYPT_MODE, publicKey, new javax.crypto.spec.OAEPParameterSpec("SHA-256", "MGF1", java.security.spec.MGF1ParameterSpec.SHA256,javax.crypto.spec.PSource.PSpecified.DEFAULT));- var localCiphertext = cipher.doFinal("secret payload".getBytes(StandardCharsets.UTF_8));+ byte[] localCiphertext = cipher.doFinal("secret payload".getBytes(StandardCharsets.UTF_8));- var decrypted = kms.decrypt(b -> b+ DecryptResponse decrypted = kms.decrypt(b -> b.keyId(keyId).ciphertextBlob(SdkBytes.fromByteArray(localCiphertext)).encryptionAlgorithm(EncryptionAlgorithmSpec.RSAES_OAEP_SHA_256));@@ -498,7 +504,7 @@ class KmsFeaturesTest {@Test@Order(72)void rsaEncryptWithDefaultAlgorithmRaisesInvalidKeyUsage() {- var keyId = kms.createKey(b -> b+ String keyId = kms.createKey(b -> b.keyUsage(KeyUsageType.ENCRYPT_DECRYPT).keySpec(KeySpec.RSA_2048)).keyMetadata().keyId();@@ -517,7 +523,7 @@ class KmsFeaturesTest {@Test@Order(80)void importedKeyMaterialMakesAnExternalKeyUsable() throws Exception {- var keyId = kms.createKey(b -> b.origin(OriginType.EXTERNAL)).keyMetadata().keyId();+ String keyId = kms.createKey(b -> b.origin(OriginType.EXTERNAL)).keyMetadata().keyId();try {assertThat(kms.describeKey(b -> b.keyId(keyId)).keyMetadata())@@ -532,7 +538,7 @@ class KmsFeaturesTest {.plaintext(SdkBytes.fromString("secret payload", StandardCharsets.UTF_8)))).isInstanceOf(KmsInvalidStateException.class);- var parameters = kms.getParametersForImport(b -> b+ GetParametersForImportResponse parameters = kms.getParametersForImport(b -> b.keyId(keyId).wrappingAlgorithm(AlgorithmSpec.RSAES_OAEP_SHA_256).wrappingKeySpec(WrappingKeySpec.RSA_2048));@@ -556,7 +562,7 @@ class KmsFeaturesTest {.isEqualTo(ExpirationModelType.KEY_MATERIAL_DOES_NOT_EXPIRE);});- var ciphertext = kms.encrypt(b -> b+ EncryptResponse ciphertext = kms.encrypt(b -> b.keyId(keyId).plaintext(SdkBytes.fromString("secret payload", StandardCharsets.UTF_8)));assertThat(kms.decrypt(b -> b.keyId(keyId).ciphertextBlob(ciphertext.ciphertextBlob()))diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KmsSm2Test.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KmsSm2Test.javaindex 99a781fce0..a58ad70ef2 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KmsSm2Test.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KmsSm2Test.java@@ -6,11 +6,15 @@ import org.junit.jupiter.params.provider.ValueSource;import software.amazon.awssdk.core.SdkBytes;import software.amazon.awssdk.regions.Region;import software.amazon.awssdk.services.kms.KmsClient;+import software.amazon.awssdk.services.kms.model.CreateKeyResponse;+import software.amazon.awssdk.services.kms.model.GetPublicKeyResponse;import software.amazon.awssdk.services.kms.model.KeySpec;import software.amazon.awssdk.services.kms.model.KeyUsageType;import software.amazon.awssdk.services.kms.model.KmsException;import software.amazon.awssdk.services.kms.model.MessageType;+import software.amazon.awssdk.services.kms.model.SignResponse;import software.amazon.awssdk.services.kms.model.SigningAlgorithmSpec;+import software.amazon.awssdk.services.kms.model.VerifyResponse;import static org.assertj.core.api.Assertions.assertThat;import static org.junit.jupiter.api.Assertions.assertThrows;@@ -21,16 +25,16 @@ class KmsSm2Test {@ValueSource(strings = {"cn-north-1", "cn-northwest-1"})void signAndVerifyUseSm2dsaWireAlgorithm(String region) {try (KmsClient kms = TestFixtures.kmsClient(Region.of(region))) {- var key = kms.createKey(b -> b.keySpec(KeySpec.SM2).keyUsage(KeyUsageType.SIGN_VERIFY));+ CreateKeyResponse key = kms.createKey(b -> b.keySpec(KeySpec.SM2).keyUsage(KeyUsageType.SIGN_VERIFY));String keyId = key.keyMetadata().keyId();try {assertThat(key.keyMetadata().signingAlgorithms()).containsExactly(SigningAlgorithmSpec.SM2_DSA);- var publicKey = kms.getPublicKey(b -> b.keyId(keyId));+ GetPublicKeyResponse publicKey = kms.getPublicKey(b -> b.keyId(keyId));assertThat(publicKey.signingAlgorithms()).containsExactly(SigningAlgorithmSpec.SM2_DSA);assertThat(publicKey.publicKey().asByteArray()).isNotEmpty();- var message = SdkBytes.fromUtf8String("SM2 SDK wire compatibility");- var signed = kms.sign(b -> b.keyId(keyId)+ SdkBytes message = SdkBytes.fromUtf8String("SM2 SDK wire compatibility");+ SignResponse signed = kms.sign(b -> b.keyId(keyId).message(message).messageType(MessageType.RAW).signingAlgorithm(SigningAlgorithmSpec.SM2_DSA));@@ -38,7 +42,7 @@ class KmsSm2Test {assertThat(signed.signingAlgorithmAsString()).isEqualTo("SM2DSA");assertThat(signed.signature().asByteArray()).isNotEmpty();- var verified = kms.verify(b -> b.keyId(keyId)+ VerifyResponse verified = kms.verify(b -> b.keyId(keyId).message(message).messageType(MessageType.RAW).signature(signed.signature())@@ -62,23 +66,23 @@ class KmsSm2Test {void signAndVerifyRejectInvalidSm2Parameters(String region, String algorithm,MessageType messageType, String errorCode) {try (KmsClient kms = TestFixtures.kmsClient(Region.of(region))) {- var key = kms.createKey(b -> b.keySpec(KeySpec.SM2).keyUsage(KeyUsageType.SIGN_VERIFY));+ CreateKeyResponse key = kms.createKey(b -> b.keySpec(KeySpec.SM2).keyUsage(KeyUsageType.SIGN_VERIFY));String keyId = key.keyMetadata().keyId();try {- var message = SdkBytes.fromByteArray(new byte[32]);- var signature = kms.sign(b -> b.keyId(keyId)+ SdkBytes message = SdkBytes.fromByteArray(new byte[32]);+ SdkBytes signature = kms.sign(b -> b.keyId(keyId).message(message).messageType(MessageType.RAW).signingAlgorithm(SigningAlgorithmSpec.SM2_DSA)).signature();- var signError = assertThrows(KmsException.class, () -> kms.sign(b -> b.keyId(keyId)+ KmsException signError = assertThrows(KmsException.class, () -> kms.sign(b -> b.keyId(keyId).message(message).messageType(messageType).signingAlgorithm(algorithm)));assertThat(signError.statusCode()).isEqualTo(400);assertThat(signError.awsErrorDetails().errorCode()).isEqualTo(errorCode);- var verifyError = assertThrows(KmsException.class, () -> kms.verify(b -> b.keyId(keyId)+ KmsException verifyError = assertThrows(KmsException.class, () -> kms.verify(b -> b.keyId(keyId).message(message).messageType(messageType).signature(signature)diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KmsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KmsTest.javaindex d324f7c541..d8f002b5ff 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KmsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/KmsTest.java@@ -303,7 +303,7 @@ class KmsTest {@Test@Order(19)void generateRandom() {- var response = kms.generateRandom(b -> b.numberOfBytes(32));+ GenerateRandomResponse response = kms.generateRandom(b -> b.numberOfBytes(32));assertThat(response.plaintext()).isNotNull();assertThat(response.plaintext().asByteArray()).hasSize(32);diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/LightsailTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/LightsailTest.javaindex 99e5d17e93..f1b6d457c9 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/LightsailTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/LightsailTest.java@@ -4,9 +4,14 @@ import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.lightsail.LightsailClient;import software.amazon.awssdk.services.lightsail.model.CreateInstancesRequest;+import software.amazon.awssdk.services.lightsail.model.CreateInstancesResponse;+import software.amazon.awssdk.services.lightsail.model.CreateKeyPairResponse;+import software.amazon.awssdk.services.lightsail.model.Disk;+import software.amazon.awssdk.services.lightsail.model.Instance;import software.amazon.awssdk.services.lightsail.model.InstanceState;import software.amazon.awssdk.services.lightsail.model.NetworkProtocol;import software.amazon.awssdk.services.lightsail.model.PortInfo;+import software.amazon.awssdk.services.lightsail.model.StaticIp;import software.amazon.awssdk.services.lightsail.model.Tag;import static org.assertj.core.api.Assertions.assertThat;@@ -38,7 +43,7 @@ class LightsailTest {assertThat(lightsail.getRegions(r -> r.includeAvailabilityZones(true)).regions().get(0).availabilityZones()).isNotEmpty();- var keyPair = lightsail.createKeyPair(r -> r+ CreateKeyPairResponse keyPair = lightsail.createKeyPair(r -> r.keyPairName(keyPairName).tags(Tag.builder().key("owner").value("sdk").build()));assertThat(keyPair.keyPair().name()).isEqualTo(keyPairName);@@ -46,7 +51,7 @@ class LightsailTest {assertThat(keyPair.privateKeyBase64()).isNotBlank();assertThat(keyPair.operation().operationTypeAsString()).isEqualTo("CreateKeyPair");- var createInstances = lightsail.createInstances(CreateInstancesRequest.builder()+ CreateInstancesResponse createInstances = lightsail.createInstances(CreateInstancesRequest.builder().instanceNames(instanceName).availabilityZone("us-east-1a").blueprintId("ubuntu_22_04")@@ -57,7 +62,7 @@ class LightsailTest {assertThat(createInstances.operations()).hasSize(1);assertThat(createInstances.operations().get(0).operationTypeAsString()).isEqualTo("CreateInstance");- var instance = lightsail.getInstance(r -> r.instanceName(instanceName)).instance();+ Instance instance = lightsail.getInstance(r -> r.instanceName(instanceName)).instance();assertThat(instance.name()).isEqualTo(instanceName);assertThat(instance.arn()).startsWith("arn:aws:lightsail:");assertThat(instance.location().regionNameAsString()).isEqualTo("us-east-1");@@ -90,14 +95,14 @@ class LightsailTest {lightsail.createDisk(r -> r.diskName(diskName).availabilityZone("us-east-1a").sizeInGb(8));lightsail.attachDisk(r -> r.diskName(diskName).instanceName(instanceName).diskPath("/dev/xvdf"));- var disk = lightsail.getDisk(r -> r.diskName(diskName)).disk();+ Disk disk = lightsail.getDisk(r -> r.diskName(diskName)).disk();assertThat(disk.name()).isEqualTo(diskName);assertThat(disk.attachedTo()).isEqualTo(instanceName);assertThat(disk.isAttached()).isTrue();lightsail.allocateStaticIp(r -> r.staticIpName(staticIpName));lightsail.attachStaticIp(r -> r.staticIpName(staticIpName).instanceName(instanceName));- var staticIp = lightsail.getStaticIp(r -> r.staticIpName(staticIpName)).staticIp();+ StaticIp staticIp = lightsail.getStaticIp(r -> r.staticIpName(staticIpName)).staticIp();assertThat(staticIp.name()).isEqualTo(staticIpName);assertThat(staticIp.attachedTo()).isEqualTo(instanceName);assertThat(staticIp.isAttached()).isTrue();diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceAgreementTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceAgreementTest.javaindex 3f3cf8cf51..dd08abb28c 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceAgreementTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceAgreementTest.java@@ -2,6 +2,7 @@ package com.floci.test;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.marketplaceagreement.MarketplaceAgreementClient;+import software.amazon.awssdk.services.marketplaceagreement.model.SearchAgreementsResponse;import static org.junit.jupiter.api.Assertions.assertNotNull;@@ -10,7 +11,7 @@ class MarketplaceAgreementTest {@Testvoid usesAwsSdkWireContract() {try (MarketplaceAgreementClient client = TestFixtures.marketplaceAgreementClient()) {- var response = client.searchAgreements(r -> r.filters(+ SearchAgreementsResponse response = client.searchAgreements(r -> r.filters(f -> f.name("AgreementType").values("PurchaseAgreement")));assertNotNull(response.agreementViewSummaries());}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceCatalogTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceCatalogTest.javaindex 002147a44f..61c38cbbc2 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceCatalogTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceCatalogTest.java@@ -2,6 +2,7 @@ package com.floci.test;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.marketplacecatalog.MarketplaceCatalogClient;+import software.amazon.awssdk.services.marketplacecatalog.model.ListEntitiesResponse;import static org.junit.jupiter.api.Assertions.assertNotNull;@@ -10,7 +11,7 @@ class MarketplaceCatalogTest {@Testvoid usesAwsSdkWireContract() {try (MarketplaceCatalogClient client = TestFixtures.marketplaceCatalogClient()) {- var response = client.listEntities(r -> r.catalog("AWSMarketplace").entityType("SaaSProduct"));+ ListEntitiesResponse response = client.listEntities(r -> r.catalog("AWSMarketplace").entityType("SaaSProduct"));assertNotNull(response.entitySummaryList());}}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceDeploymentTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceDeploymentTest.javaindex 6142f6482a..a2dc8be8ab 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceDeploymentTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceDeploymentTest.java@@ -2,6 +2,7 @@ package com.floci.test;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.marketplacedeployment.MarketplaceDeploymentClient;+import software.amazon.awssdk.services.marketplacedeployment.model.PutDeploymentParameterResponse;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertEquals;@@ -11,7 +12,7 @@ class MarketplaceDeploymentTest {@Testvoid usesAwsSdkWireContract() {try (MarketplaceDeploymentClient client = TestFixtures.marketplaceDeploymentClient()) {- var response = client.putDeploymentParameter(r -> r+ PutDeploymentParameterResponse response = client.putDeploymentParameter(r -> r.catalog("AWSMarketplace").productId("prod-sdk-compat").agreementId("agr-sdk-compat")diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceDiscoveryTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceDiscoveryTest.javaindex 8abd990e5f..01b5887643 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceDiscoveryTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceDiscoveryTest.java@@ -2,6 +2,7 @@ package com.floci.test;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.marketplacediscovery.MarketplaceDiscoveryClient;+import software.amazon.awssdk.services.marketplacediscovery.model.SearchListingsResponse;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertTrue;@@ -11,7 +12,7 @@ class MarketplaceDiscoveryTest {@Testvoid usesAwsSdkWireContract() {try (MarketplaceDiscoveryClient client = TestFixtures.marketplaceDiscoveryClient()) {- var response = client.searchListings(r -> r.searchText("sdk-compat"));+ SearchListingsResponse response = client.searchListings(r -> r.searchText("sdk-compat"));assertTrue(response.totalResults() >= 0);assertNotNull(response.listingSummaries());}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceEntitlementTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceEntitlementTest.javaindex 53f0d0228a..15f2a8778e 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceEntitlementTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceEntitlementTest.java@@ -2,6 +2,7 @@ package com.floci.test;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.marketplaceentitlement.MarketplaceEntitlementClient;+import software.amazon.awssdk.services.marketplaceentitlement.model.GetEntitlementsResponse;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertTrue;@@ -11,7 +12,7 @@ class MarketplaceEntitlementTest {@Testvoid usesAwsSdkWireContract() {try (MarketplaceEntitlementClient client = TestFixtures.marketplaceEntitlementClient()) {- var response = client.getEntitlements(r -> r.productCode("product-local"));+ GetEntitlementsResponse response = client.getEntitlements(r -> r.productCode("product-local"));assertNotNull(response.entitlements());assertTrue(response.entitlements().isEmpty());}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceMeteringTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceMeteringTest.javaindex 63ec3b7af8..b7b203d289 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceMeteringTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceMeteringTest.java@@ -2,6 +2,7 @@ package com.floci.test;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.marketplacemetering.MarketplaceMeteringClient;+import software.amazon.awssdk.services.marketplacemetering.model.ResolveCustomerResponse;import static org.junit.jupiter.api.Assertions.assertNotNull;@@ -10,7 +11,7 @@ class MarketplaceMeteringTest {@Testvoid usesAwsSdkWireContract() {try (MarketplaceMeteringClient client = TestFixtures.marketplaceMeteringClient()) {- var response = client.resolveCustomer(r -> r.registrationToken("local-registration-token"));+ ResolveCustomerResponse response = client.resolveCustomer(r -> r.registrationToken("local-registration-token"));assertNotNull(response.customerAWSAccountId());assertNotNull(response.licenseArn());}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceReportingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceReportingTest.javaindex 4b8555187b..06d6d11bf1 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceReportingTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MarketplaceReportingTest.java@@ -2,6 +2,7 @@ package com.floci.test;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.marketplacereporting.MarketplaceReportingClient;+import software.amazon.awssdk.services.marketplacereporting.model.GetBuyerDashboardResponse;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertEquals;@@ -13,7 +14,7 @@ class MarketplaceReportingTest {void usesAwsSdkWireContract() {try (MarketplaceReportingClient client = TestFixtures.marketplaceReportingClient()) {String arn = "arn:aws:aws-marketplace::000000000000:AWSMarketplace/ReportingData/Agreement_V1/Dashboard/AgreementSummary_V1";- var response = client.getBuyerDashboard(r -> r.dashboardIdentifier(arn).embeddingDomains("https://example.com"));+ GetBuyerDashboardResponse response = client.getBuyerDashboard(r -> r.dashboardIdentifier(arn).embeddingDomains("https://example.com"));assertEquals(arn, response.dashboardIdentifier());assertFalse(response.embedUrl().isBlank());}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/NeptuneTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/NeptuneTest.javaindex 6a070b5ff9..e61128459d 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/NeptuneTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/NeptuneTest.java@@ -11,19 +11,30 @@ import software.amazon.awssdk.services.neptune.NeptuneClient;import software.amazon.awssdk.services.neptune.model.AddRoleToDbClusterRequest;import software.amazon.awssdk.services.neptune.model.AddTagsToResourceRequest;import software.amazon.awssdk.services.neptune.model.CreateDbClusterRequest;+import software.amazon.awssdk.services.neptune.model.CreateDbClusterResponse;import software.amazon.awssdk.services.neptune.model.CreateDbInstanceRequest;+import software.amazon.awssdk.services.neptune.model.CreateDbInstanceResponse;+import software.amazon.awssdk.services.neptune.model.DBCluster;+import software.amazon.awssdk.services.neptune.model.DBInstance;import software.amazon.awssdk.services.neptune.model.DeleteDbClusterRequest;import software.amazon.awssdk.services.neptune.model.DeleteDbInstanceRequest;import software.amazon.awssdk.services.neptune.model.DescribeDbClustersRequest;+import software.amazon.awssdk.services.neptune.model.DescribeDbClustersResponse;import software.amazon.awssdk.services.neptune.model.DescribeDbInstancesRequest;+import software.amazon.awssdk.services.neptune.model.DescribeDbInstancesResponse;import software.amazon.awssdk.services.neptune.model.InvalidDbClusterStateException;import software.amazon.awssdk.services.neptune.model.ListTagsForResourceRequest;+import software.amazon.awssdk.services.neptune.model.ListTagsForResourceResponse;import software.amazon.awssdk.services.neptune.model.ModifyDbClusterRequest;+import software.amazon.awssdk.services.neptune.model.ModifyDbClusterResponse;import software.amazon.awssdk.services.neptune.model.ModifyDbInstanceRequest;+import software.amazon.awssdk.services.neptune.model.ModifyDbInstanceResponse;import software.amazon.awssdk.services.neptune.model.NeptuneException;import software.amazon.awssdk.services.neptune.model.RemoveRoleFromDbClusterRequest;import software.amazon.awssdk.services.neptune.model.RemoveTagsFromResourceRequest;import software.amazon.awssdk.services.neptune.model.Tag;++import java.util.List;import static org.assertj.core.api.Assertions.assertThat;import static org.assertj.core.api.Assertions.assertThatThrownBy;import static org.assertj.core.api.Assertions.tuple;@@ -62,13 +73,13 @@ class NeptuneTest {@Order(1)@DisplayName("CreateDBCluster returns valid cluster descriptor")void createCluster() {- var response = neptune.createDBCluster(CreateDbClusterRequest.builder()+ CreateDbClusterResponse response = neptune.createDBCluster(CreateDbClusterRequest.builder().dbClusterIdentifier(CLUSTER_ID).engine("neptune").tags(Tag.builder().key("Name").value(CLUSTER_ID).build()).build());- var cluster = response.dbCluster();+ DBCluster cluster = response.dbCluster();assertThat(cluster.dbClusterIdentifier()).isEqualTo(CLUSTER_ID);assertThat(cluster.engine()).isEqualTo("neptune");assertThat(cluster.status()).isEqualTo("available");@@ -100,7 +111,7 @@ class NeptuneTest {@Order(3)@DisplayName("DescribeDBClusters returns created cluster")void describeClusters() {- var response = neptune.describeDBClusters(DescribeDbClustersRequest.builder()+ DescribeDbClustersResponse response = neptune.describeDBClusters(DescribeDbClustersRequest.builder().dbClusterIdentifier(CLUSTER_ID).build());@@ -112,7 +123,7 @@ class NeptuneTest {@Order(4)@DisplayName("ModifyDBCluster updates IAM auth flag")void modifyCluster() {- var response = neptune.modifyDBCluster(ModifyDbClusterRequest.builder()+ ModifyDbClusterResponse response = neptune.modifyDBCluster(ModifyDbClusterRequest.builder().dbClusterIdentifier(CLUSTER_ID).enableIAMDatabaseAuthentication(true).build());@@ -127,7 +138,7 @@ class NeptuneTest {String arn = neptune.describeDBClusters(DescribeDbClustersRequest.builder().dbClusterIdentifier(CLUSTER_ID).build()).dbClusters().get(0).dbClusterArn();- var created = neptune.listTagsForResource(ListTagsForResourceRequest.builder().resourceName(arn).build());+ ListTagsForResourceResponse created = neptune.listTagsForResource(ListTagsForResourceRequest.builder().resourceName(arn).build());assertThat(created.tagList()).containsExactly(Tag.builder().key("Name").value(CLUSTER_ID).build());neptune.addTagsToResource(AddTagsToResourceRequest.builder()@@ -139,7 +150,7 @@ class NeptuneTest {.tagKeys("Name").build());- var updated = neptune.listTagsForResource(ListTagsForResourceRequest.builder().resourceName(arn).build());+ ListTagsForResourceResponse updated = neptune.listTagsForResource(ListTagsForResourceRequest.builder().resourceName(arn).build());assertThat(updated.tagList()).containsExactly(Tag.builder().key("team").value("graph").build());}@@ -151,7 +162,7 @@ class NeptuneTest {neptune.addRoleToDBCluster(AddRoleToDbClusterRequest.builder().dbClusterIdentifier(CLUSTER_ID).roleArn(roleArn).build());- var withRole = neptune.describeDBClusters(DescribeDbClustersRequest.builder()+ DBCluster withRole = neptune.describeDBClusters(DescribeDbClustersRequest.builder().dbClusterIdentifier(CLUSTER_ID).build()).dbClusters().get(0);assertThat(withRole.associatedRoles()).hasSize(1);assertThat(withRole.associatedRoles().get(0).roleArn()).isEqualTo(roleArn);@@ -159,7 +170,7 @@ class NeptuneTest {neptune.removeRoleFromDBCluster(RemoveRoleFromDbClusterRequest.builder().dbClusterIdentifier(CLUSTER_ID).roleArn(roleArn).build());- var withoutRole = neptune.describeDBClusters(DescribeDbClustersRequest.builder()+ DBCluster withoutRole = neptune.describeDBClusters(DescribeDbClustersRequest.builder().dbClusterIdentifier(CLUSTER_ID).build()).dbClusters().get(0);assertThat(withoutRole.associatedRoles()).isEmpty();}@@ -168,7 +179,7 @@ class NeptuneTest {@Order(7)@DisplayName("ModifyDBCluster applies backup and protection settings and protection blocks delete")void modifySettingsAndDeletionProtection() {- var modified = neptune.modifyDBCluster(ModifyDbClusterRequest.builder()+ DBCluster modified = neptune.modifyDBCluster(ModifyDbClusterRequest.builder().dbClusterIdentifier(CLUSTER_ID).backupRetentionPeriod(7).deletionProtection(true)@@ -183,7 +194,7 @@ class NeptuneTest {.isInstanceOf(NeptuneException.class).hasMessageContaining("deletion protection");- var unprotected = neptune.modifyDBCluster(ModifyDbClusterRequest.builder()+ DBCluster unprotected = neptune.modifyDBCluster(ModifyDbClusterRequest.builder().dbClusterIdentifier(CLUSTER_ID).deletionProtection(false).build()).dbCluster();@@ -195,7 +206,7 @@ class NeptuneTest {@Order(15)@DisplayName("CreateDBInstance returns the descriptor Terraform's aws_neptune_cluster_instance reads back")void createInstance() {- var response = neptune.createDBInstance(CreateDbInstanceRequest.builder()+ CreateDbInstanceResponse response = neptune.createDBInstance(CreateDbInstanceRequest.builder().dbInstanceIdentifier(INSTANCE_ID).dbClusterIdentifier(CLUSTER_ID).dbInstanceClass("db.r5.large")@@ -206,7 +217,7 @@ class NeptuneTest {.tags(Tag.builder().key("Name").value(INSTANCE_ID).build()).build());- var instance = response.dbInstance();+ DBInstance instance = response.dbInstance();assertThat(instance.dbInstanceIdentifier()).isEqualTo(INSTANCE_ID);assertThat(instance.dbClusterIdentifier()).isEqualTo(CLUSTER_ID);assertThat(instance.dbInstanceStatus()).isEqualTo("available");@@ -230,7 +241,7 @@ class NeptuneTest {@Order(16)@DisplayName("DescribeDBInstances returns created instance")void describeInstances() {- var response = neptune.describeDBInstances(DescribeDbInstancesRequest.builder()+ DescribeDbInstancesResponse response = neptune.describeDBInstances(DescribeDbInstancesRequest.builder().dbInstanceIdentifier(INSTANCE_ID).build());@@ -238,13 +249,13 @@ class NeptuneTest {assertThat(response.dbInstances().get(0).dbInstanceIdentifier()).isEqualTo(INSTANCE_ID);assertThat(response.dbInstances().get(0).promotionTier()).isZero();- var cluster = neptune.describeDBClusters(DescribeDbClustersRequest.builder()+ DBCluster cluster = neptune.describeDBClusters(DescribeDbClustersRequest.builder().dbClusterIdentifier(CLUSTER_ID).build()).dbClusters().get(0);assertThat(cluster.dbClusterMembers()).hasSize(1);assertThat(cluster.dbClusterMembers().get(0).dbInstanceIdentifier()).isEqualTo(INSTANCE_ID);assertThat(cluster.dbClusterMembers().get(0).isClusterWriter()).isTrue();- var tags = neptune.listTagsForResource(ListTagsForResourceRequest.builder()+ List<Tag> tags = neptune.listTagsForResource(ListTagsForResourceRequest.builder().resourceName(response.dbInstances().get(0).dbInstanceArn()).build()).tagList();assertThat(tags).extracting(Tag::key, Tag::value).containsExactly(tuple("Name", INSTANCE_ID));}@@ -253,7 +264,7 @@ class NeptuneTest {@Order(17)@DisplayName("ModifyDBInstance updates the settings Terraform changes in place")void modifyInstance() {- var response = neptune.modifyDBInstance(ModifyDbInstanceRequest.builder()+ ModifyDbInstanceResponse response = neptune.modifyDBInstance(ModifyDbInstanceRequest.builder().dbInstanceIdentifier(INSTANCE_ID).dbInstanceClass("db.r5.xlarge").autoMinorVersionUpgrade(false)@@ -262,14 +273,14 @@ class NeptuneTest {.applyImmediately(true).build());- var instance = response.dbInstance();+ DBInstance instance = response.dbInstance();assertThat(instance.dbInstanceClass()).isEqualTo("db.r5.xlarge");assertThat(instance.autoMinorVersionUpgrade()).isFalse();assertThat(instance.promotionTier()).isEqualTo(3);assertThat(instance.preferredMaintenanceWindow()).isEqualTo("sun:05:00-sun:06:00");assertThat(instance.publiclyAccessible()).isFalse();- var described = neptune.describeDBInstances(DescribeDbInstancesRequest.builder()+ DBInstance described = neptune.describeDBInstances(DescribeDbInstancesRequest.builder().dbInstanceIdentifier(INSTANCE_ID).build()).dbInstances().get(0);assertThat(described.promotionTier()).isEqualTo(3);assertThat(described.autoMinorVersionUpgrade()).isFalse();diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/OamTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/OamTest.javaindex 4b015403c9..7217155807 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/OamTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/OamTest.java@@ -3,8 +3,10 @@ package com.floci.test;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.oam.OamClient;import software.amazon.awssdk.services.oam.model.CreateSinkRequest;+import software.amazon.awssdk.services.oam.model.CreateSinkResponse;import software.amazon.awssdk.services.oam.model.DeleteSinkRequest;import software.amazon.awssdk.services.oam.model.GetSinkRequest;+import software.amazon.awssdk.services.oam.model.GetSinkResponse;import software.amazon.awssdk.services.oam.model.ListSinksRequest;import static org.junit.jupiter.api.Assertions.*;@@ -13,11 +15,11 @@ class OamTest {@Testvoid sinkLifecycle() {try (OamClient client = TestFixtures.oamClient()) {- var created = client.createSink(CreateSinkRequest.builder().name("sdk-oam-sink").build());+ CreateSinkResponse created = client.createSink(CreateSinkRequest.builder().name("sdk-oam-sink").build());assertNotNull(created.arn());assertEquals("sdk-oam-sink", created.name());- var fetched = client.getSink(GetSinkRequest.builder().identifier(created.arn()).build());+ GetSinkResponse fetched = client.getSink(GetSinkRequest.builder().identifier(created.arn()).build());assertEquals(created.arn(), fetched.arn());assertTrue(client.listSinks(ListSinksRequest.builder().build()).items().stream().anyMatch(item -> created.arn().equals(item.arn())));diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RdsControlPlaneTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RdsControlPlaneTest.javaindex c0dcfb8ebb..3bbc75878f 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RdsControlPlaneTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RdsControlPlaneTest.java@@ -11,6 +11,8 @@ import software.amazon.awssdk.services.ec2.Ec2Client;import software.amazon.awssdk.services.ec2.model.DescribeSubnetsResponse;import software.amazon.awssdk.services.rds.RdsClient;import software.amazon.awssdk.services.rds.model.ConnectionPoolConfigurationInfo;+import software.amazon.awssdk.services.rds.model.CreateDbClusterResponse;+import software.amazon.awssdk.services.rds.model.CreateDbInstanceResponse;import software.amazon.awssdk.services.rds.model.CreateDbProxyResponse;import software.amazon.awssdk.services.rds.model.CreateDbSubnetGroupResponse;import software.amazon.awssdk.services.rds.model.CreateOptionGroupResponse;@@ -22,16 +24,24 @@ import software.amazon.awssdk.services.rds.model.DBSnapshot;import software.amazon.awssdk.services.rds.model.DbClusterSnapshotNotFoundException;import software.amazon.awssdk.services.rds.model.DbSnapshotAlreadyExistsException;import software.amazon.awssdk.services.rds.model.DbSnapshotNotFoundException;+import software.amazon.awssdk.services.rds.model.DescribeDbProxiesResponse;+import software.amazon.awssdk.services.rds.model.DescribeDbProxyTargetGroupsResponse;+import software.amazon.awssdk.services.rds.model.DescribeDbProxyTargetsResponse;import software.amazon.awssdk.services.rds.model.InvalidDbInstanceStateException;import software.amazon.awssdk.services.rds.model.DescribeDbSubnetGroupsResponse;import software.amazon.awssdk.services.rds.model.DescribeOptionGroupsResponse;import software.amazon.awssdk.services.rds.model.DescribeOrderableDbInstanceOptionsResponse;import software.amazon.awssdk.services.rds.model.InvalidOptionGroupStateException;+import software.amazon.awssdk.services.rds.model.ListTagsForResourceResponse;+import software.amazon.awssdk.services.rds.model.ModifyDbClusterResponse;+import software.amazon.awssdk.services.rds.model.ModifyDbProxyResponse;+import software.amazon.awssdk.services.rds.model.ModifyDbProxyTargetGroupResponse;import software.amazon.awssdk.services.rds.model.ModifyOptionGroupResponse;import software.amazon.awssdk.services.rds.model.OptionConfiguration;import software.amazon.awssdk.services.rds.model.OptionGroupNotFoundException;import software.amazon.awssdk.services.rds.model.OptionSetting;import software.amazon.awssdk.services.rds.model.RdsException;+import software.amazon.awssdk.services.rds.model.RegisterDbProxyTargetsResponse;import software.amazon.awssdk.services.rds.model.Tag;import java.util.List;@@ -96,7 +106,7 @@ class RdsControlPlaneTest {@Testvoid sdkRoundTripsAuroraServerlessV2ScalingConfiguration() {- var created = rds.createDBCluster(b -> b+ CreateDbClusterResponse created = rds.createDBCluster(b -> b.dbClusterIdentifier(serverlessClusterName).engine("aurora-postgresql").masterUsername("admin")@@ -113,7 +123,7 @@ class RdsControlPlaneTest {assertThat(created.dbCluster().serverlessV2ScalingConfiguration().secondsUntilAutoPause()).isEqualTo(300);- var modified = rds.modifyDBCluster(b -> b+ ModifyDbClusterResponse modified = rds.modifyDBCluster(b -> b.dbClusterIdentifier(serverlessClusterName).serverlessV2ScalingConfiguration(c -> c.secondsUntilAutoPause(600)));@@ -124,7 +134,7 @@ class RdsControlPlaneTest {assertThat(modified.dbCluster().serverlessV2ScalingConfiguration().secondsUntilAutoPause()).isEqualTo(600);- var described = rds.describeDBClusters(b -> b+ DBCluster described = rds.describeDBClusters(b -> b.dbClusterIdentifier(serverlessClusterName)).dbClusters().get(0);assertThat(described.serverlessV2ScalingConfiguration().minCapacity()).isEqualTo(0.0);assertThat(described.serverlessV2ScalingConfiguration().maxCapacity()).isEqualTo(16.0);@@ -167,7 +177,7 @@ class RdsControlPlaneTest {@Testvoid sdkRoundTripsDbProxyAndItsDefaultTargetGroup() {- var created = rds.createDBProxy(b -> b+ CreateDbProxyResponse created = rds.createDBProxy(b -> b.dbProxyName(proxyName).engineFamily("POSTGRESQL").roleArn("arn:aws:iam::000000000000:role/rds-proxy-test")@@ -199,14 +209,14 @@ class RdsControlPlaneTest {assertThat(auth.description()).isEqualTo("compatibility credentials");});- var targetGroups = rds.describeDBProxyTargetGroups(b -> b.dbProxyName(proxyName));+ DescribeDbProxyTargetGroupsResponse targetGroups = rds.describeDBProxyTargetGroups(b -> b.dbProxyName(proxyName));assertThat(targetGroups.targetGroups()).singleElement().satisfies(targetGroup -> {assertThat(targetGroup.targetGroupName()).isEqualTo("default");assertThat(targetGroup.isDefault()).isTrue();assertThat(targetGroup.targetGroupArn()).contains(":target-group:prx-tg-");});- var tags = rds.listTagsForResource(b -> b.resourceName(created.dbProxy().dbProxyArn()));+ ListTagsForResourceResponse tags = rds.listTagsForResource(b -> b.resourceName(created.dbProxy().dbProxyArn()));assertThat(tags.tagList()).singleElement().satisfies(tag -> {assertThat(tag.key()).isEqualTo("owner");assertThat(tag.value()).isEqualTo("compatibility");@@ -217,7 +227,7 @@ class RdsControlPlaneTest {void sdkRoundTripsIamDefaultAuthAndProxyUpdates() {String mutableProxyName = TestFixtures.uniqueName("rds-proxy-mutable");try {- var created = rds.createDBProxy(b -> b+ CreateDbProxyResponse created = rds.createDBProxy(b -> b.dbProxyName(mutableProxyName).engineFamily("MYSQL").roleArn("arn:aws:iam::000000000000:role/rds-proxy-initial")@@ -231,7 +241,7 @@ class RdsControlPlaneTest {assertThat(created.dbProxy().defaultAuthScheme()).isEqualTo("IAM_AUTH");assertThat(created.dbProxy().auth()).isEmpty();- var modified = rds.modifyDBProxy(b -> b+ ModifyDbProxyResponse modified = rds.modifyDBProxy(b -> b.dbProxyName(mutableProxyName).roleArn("arn:aws:iam::000000000000:role/rds-proxy-updated").securityGroups("sg-proxy-updated-a", "sg-proxy-updated-b")@@ -250,7 +260,7 @@ class RdsControlPlaneTest {assertThat(modified.dbProxy().idleClientTimeout()).isEqualTo(600);assertThat(modified.dbProxy().updatedDate()).isAfterOrEqualTo(created.dbProxy().updatedDate());- var described = rds.describeDBProxies(b -> b.dbProxyName(mutableProxyName));+ DescribeDbProxiesResponse described = rds.describeDBProxies(b -> b.dbProxyName(mutableProxyName));assertThat(described.dbProxies()).singleElement().satisfies(proxy -> {assertThat(proxy.defaultAuthScheme()).isEqualTo("IAM_AUTH");assertThat(proxy.auth()).isEmpty();@@ -263,7 +273,7 @@ class RdsControlPlaneTest {assertThat(proxy.idleClientTimeout()).isEqualTo(600);});- var modifiedTargetGroup = rds.modifyDBProxyTargetGroup(b -> b+ ModifyDbProxyTargetGroupResponse modifiedTargetGroup = rds.modifyDBProxyTargetGroup(b -> b.dbProxyName(mutableProxyName).targetGroupName("default").connectionPoolConfig(pool -> pool@@ -275,7 +285,7 @@ class RdsControlPlaneTest {assertPoolConfiguration(modifiedTargetGroup.dbProxyTargetGroup().connectionPoolConfig());- var describedTargetGroups = rds.describeDBProxyTargetGroups(b -> b+ DescribeDbProxyTargetGroupsResponse describedTargetGroups = rds.describeDBProxyTargetGroups(b -> b.dbProxyName(mutableProxyName).targetGroupName("default"));assertThat(describedTargetGroups.targetGroups()).singleElement().satisfies(targetGroup ->@@ -292,8 +302,8 @@ class RdsControlPlaneTest {RdsClient west = rdsClient(Region.US_WEST_2)) {// Subnet ids are region-scoped on real AWS (and on floci, since #21), so each proxy// needs subnets from its own signed region rather than the shared us-east-1 subnetIds.- var eastProxy = createIamProxy(east, regionalProxyName, subnetIdsFor(Region.US_EAST_1));- var westProxy = createIamProxy(west, regionalProxyName, subnetIdsFor(Region.US_WEST_2));+ CreateDbProxyResponse eastProxy = createIamProxy(east, regionalProxyName, subnetIdsFor(Region.US_EAST_1));+ CreateDbProxyResponse westProxy = createIamProxy(west, regionalProxyName, subnetIdsFor(Region.US_WEST_2));assertThat(eastProxy.dbProxy().dbProxyArn()).contains(":rds:us-east-1:");assertThat(westProxy.dbProxy().dbProxyArn()).contains(":rds:us-west-2:");@@ -319,8 +329,8 @@ class RdsControlPlaneTest {String regionalInstanceName = TestFixtures.uniqueName("rds-db-regional");try (RdsClient east = rdsClient(Region.US_EAST_1);RdsClient west = rdsClient(Region.US_WEST_2)) {- var eastInstance = createDbInstance(east, regionalInstanceName, "east-secret");- var westInstance = createDbInstance(west, regionalInstanceName, "west-secret");+ CreateDbInstanceResponse eastInstance = createDbInstance(east, regionalInstanceName, "east-secret");+ CreateDbInstanceResponse westInstance = createDbInstance(west, regionalInstanceName, "west-secret");assertThat(eastInstance.dbInstance().dbInstanceArn()).contains(":rds:us-east-1:");assertThat(westInstance.dbInstance().dbInstanceArn()).contains(":rds:us-west-2:");@@ -365,7 +375,7 @@ class RdsControlPlaneTest {String targetInstanceName = TestFixtures.uniqueName("rds-db-target");boolean registered = false;try {- var instance = createDbInstance(rds, targetInstanceName, "target-secret");+ CreateDbInstanceResponse instance = createDbInstance(rds, targetInstanceName, "target-secret");rds.createDBProxy(b -> b.dbProxyName(targetProxyName).engineFamily("POSTGRESQL")@@ -375,7 +385,7 @@ class RdsControlPlaneTest {.secretArn("arn:aws:secretsmanager:us-east-1:000000000000:secret:rds-proxy-target").iamAuth("DISABLED")));- var registerResponse = rds.registerDBProxyTargets(b -> b+ RegisterDbProxyTargetsResponse registerResponse = rds.registerDBProxyTargets(b -> b.dbProxyName(targetProxyName).dbInstanceIdentifiers(targetInstanceName));registered = true;@@ -383,7 +393,7 @@ class RdsControlPlaneTest {assertInstanceProxyTarget(target, targetInstanceName,instance.dbInstance().dbInstanceArn()));- var described = rds.describeDBProxyTargets(b -> b+ DescribeDbProxyTargetsResponse described = rds.describeDBProxyTargets(b -> b.dbProxyName(targetProxyName));assertThat(described.targets()).singleElement().satisfies(target ->assertInstanceProxyTarget(target, targetInstanceName,@@ -744,7 +754,7 @@ class RdsControlPlaneTest {.majorEngineVersion("16").optionGroupDescription("attached to an instance"));- var instance = rds.createDBInstance(b -> b+ CreateDbInstanceResponse instance = rds.createDBInstance(b -> b.dbInstanceIdentifier(instanceName).engine("postgres").engineVersion("16.3")@@ -778,7 +788,7 @@ class RdsControlPlaneTest {void sdkReportsTheDefaultOptionGroupForAnUnattachedInstance() {String instanceName = TestFixtures.uniqueName("rds-db-default-og");try {- var instance = createDbInstance(rds, instanceName, "default-og-secret");+ CreateDbInstanceResponse instance = createDbInstance(rds, instanceName, "default-og-secret");assertThat(instance.dbInstance().optionGroupMemberships()).singleElement()diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RdsIamTokenCompatTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RdsIamTokenCompatTest.javaindex ce04f5e968..c5797f17e6 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RdsIamTokenCompatTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RdsIamTokenCompatTest.java@@ -13,6 +13,7 @@ import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;import software.amazon.awssdk.regions.Region;import software.amazon.awssdk.services.rds.RdsClient;import software.amazon.awssdk.services.rds.model.CreateDbInstanceRequest;+import software.amazon.awssdk.services.rds.model.CreateDbInstanceResponse;import software.amazon.awssdk.services.rds.model.DeleteDbInstanceRequest;import software.amazon.awssdk.services.rds.model.GenerateAuthenticationTokenRequest;@@ -60,7 +61,7 @@ class RdsIamTokenCompatTest {rds = TestFixtures.rdsClient();instanceId = TestFixtures.uniqueName("rds-iam");try {- var response = rds.createDBInstance(CreateDbInstanceRequest.builder()+ CreateDbInstanceResponse response = rds.createDBInstance(CreateDbInstanceRequest.builder().dbInstanceIdentifier(instanceId).dbInstanceClass("db.t3.micro").engine("postgres")diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftOperationsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftOperationsTest.javaindex 8e07d449eb..4565c09c2b 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftOperationsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftOperationsTest.java@@ -31,16 +31,20 @@ import software.amazon.awssdk.services.redshift.model.DescribeClusterParameterGrimport software.amazon.awssdk.services.redshift.model.DescribeClusterSnapshotsRequest;import software.amazon.awssdk.services.redshift.model.DescribeClusterSnapshotsResponse;import software.amazon.awssdk.services.redshift.model.DescribeClusterSubnetGroupsRequest;+import software.amazon.awssdk.services.redshift.model.DescribeClusterSubnetGroupsResponse;import software.amazon.awssdk.services.redshift.model.DescribeClustersRequest;import software.amazon.awssdk.services.redshift.model.DescribeClustersResponse;import software.amazon.awssdk.services.redshift.model.DescribeSnapshotCopyGrantsRequest;import software.amazon.awssdk.services.redshift.model.DescribeSnapshotCopyGrantsResponse;import software.amazon.awssdk.services.redshift.model.DescribeOrderableClusterOptionsRequest;import software.amazon.awssdk.services.redshift.model.DescribeTagsRequest;+import software.amazon.awssdk.services.redshift.model.DescribeTagsResponse;import software.amazon.awssdk.services.redshift.model.ModifyClusterIamRolesRequest;import software.amazon.awssdk.services.redshift.model.ModifyClusterIamRolesResponse;import software.amazon.awssdk.services.redshift.model.ModifyClusterRequest;+import software.amazon.awssdk.services.redshift.model.ModifyClusterResponse;import software.amazon.awssdk.services.redshift.model.RebootClusterRequest;+import software.amazon.awssdk.services.redshift.model.RebootClusterResponse;import software.amazon.awssdk.services.redshift.model.RestoreFromClusterSnapshotRequest;import software.amazon.awssdk.services.redshift.model.RestoreFromClusterSnapshotResponse;import software.amazon.awssdk.services.redshift.model.Snapshot;@@ -292,7 +296,7 @@ class RedshiftOperationsTest {.build());subnetGroupsToCleanup.add(subnetGroupName);- var describedGroups = client.describeClusterSubnetGroups(+ DescribeClusterSubnetGroupsResponse describedGroups = client.describeClusterSubnetGroups(DescribeClusterSubnetGroupsRequest.builder().clusterSubnetGroupName(subnetGroupName).build());@@ -315,7 +319,7 @@ class RedshiftOperationsTest {.tags(Tag.builder().key("env").value("test").build()).build());- var described = client.describeTags(DescribeTagsRequest.builder()+ DescribeTagsResponse described = client.describeTags(DescribeTagsRequest.builder().resourceName(arn).build());assertThat(described.taggedResources()).anyMatch(t -> "env".equals(t.tag().key()) && "test".equals(t.tag().value()));@@ -325,7 +329,7 @@ class RedshiftOperationsTest {.tagKeys("env").build());- var modified = client.modifyCluster(ModifyClusterRequest.builder()+ ModifyClusterResponse modified = client.modifyCluster(ModifyClusterRequest.builder().clusterIdentifier(clusterId).nodeType("ra3.xlplus").build());@@ -352,7 +356,7 @@ class RedshiftOperationsTest {.isNotEmpty().allMatch(o -> "ra3.xlplus".equals(o.nodeType()));- var rebooted = client.rebootCluster(RebootClusterRequest.builder()+ RebootClusterResponse rebooted = client.rebootCluster(RebootClusterRequest.builder().clusterIdentifier(clusterId).build());assertThat(rebooted.cluster().clusterStatus()).isEqualTo("available");diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ResourceExplorer2Test.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ResourceExplorer2Test.javaindex 8c412abd8d..6c28a561dd 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ResourceExplorer2Test.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ResourceExplorer2Test.java@@ -132,7 +132,7 @@ class ResourceExplorer2Test {ListSupportedResourceTypesRequest.builder().maxResults(50).build());assertThat(response.resourceTypes()).as("ResourceTypes").isNotEmpty();- for (var rt : response.resourceTypes()) {+ for (SupportedResourceType rt : response.resourceTypes()) {assertThat(rt.resourceType()).as("SupportedResourceType.ResourceType").isNotBlank();assertThat(rt.service()).as("SupportedResourceType.Service").isNotBlank();// Verify format: "service:type"@@ -355,7 +355,7 @@ class ResourceExplorer2Test {ListIndexesResponse response = client.listIndexes(ListIndexesRequest.builder().build());assertThat(response.indexes()).as("ListIndexes.Indexes").isNotEmpty();- for (var idx : response.indexes()) {+ for (Index idx : response.indexes()) {assertThat(idx.arn()).as("Index.Arn").isNotBlank();assertThat(idx.region()).as("Index.Region").isNotBlank();assertThat(idx.type()).as("Index.Type").isNotNull();diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3AnnotationsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3AnnotationsTest.javaindex 2e58f0448c..becbe18380 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3AnnotationsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3AnnotationsTest.java@@ -19,6 +19,7 @@ import software.amazon.awssdk.services.s3.model.ListObjectAnnotationsResponse;import software.amazon.awssdk.services.s3.model.NoSuchAnnotationException;import software.amazon.awssdk.services.s3.model.PutBucketVersioningRequest;import software.amazon.awssdk.services.s3.model.PutObjectAnnotationRequest;+import software.amazon.awssdk.services.s3.model.PutObjectAnnotationResponse;import software.amazon.awssdk.services.s3.model.VersioningConfiguration;import static org.assertj.core.api.Assertions.*;@@ -60,7 +61,7 @@ class S3AnnotationsTest {@Test@Order(1)void putObjectAnnotation() {- var response = s3.putObjectAnnotation(PutObjectAnnotationRequest.builder()+ PutObjectAnnotationResponse response = s3.putObjectAnnotation(PutObjectAnnotationRequest.builder().bucket(BUCKET).key(KEY).annotationName("classification")@@ -128,7 +129,7 @@ class S3AnnotationsTest {@Test@Order(5)void putObjectAnnotationWithChecksum() {- var response = s3.putObjectAnnotation(PutObjectAnnotationRequest.builder()+ PutObjectAnnotationResponse response = s3.putObjectAnnotation(PutObjectAnnotationRequest.builder().bucket(BUCKET).key(KEY).annotationName("hashed").checksumAlgorithm(software.amazon.awssdk.services.s3.model.ChecksumAlgorithm.SHA256).build(),@@ -187,7 +188,7 @@ class S3AnnotationsTest {@Order(11)void annotationAttachesToSpecificVersion() {s3.putObject(r -> r.bucket(BUCKET).key(KEY), RequestBody.fromString("version one"));- var v1 = s3.putObjectAnnotation(PutObjectAnnotationRequest.builder()+ PutObjectAnnotationResponse v1 = s3.putObjectAnnotation(PutObjectAnnotationRequest.builder().bucket(BUCKET).key(KEY).annotationName("v1-note").build(),RequestBody.fromString("on version one"));diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3PresignedUrlSigV4VerificationTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3PresignedUrlSigV4VerificationTest.javaindex 57d027c00b..d3920020a1 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3PresignedUrlSigV4VerificationTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3PresignedUrlSigV4VerificationTest.java@@ -94,22 +94,22 @@ class S3PresignedUrlSigV4VerificationTest {void sdkPresignedUrlIsAcceptedButNotValidForAnotherObject() throws Exception {assumeEnforcementEnabled();- var urlA = presignGet(KEY_A);- var urlB = presignGet(KEY_B);+ String urlA = presignGet(KEY_A);+ String urlB = presignGet(KEY_B);- var a = httpGet(urlA);+ HttpResponse<String> a = httpGet(urlA);assertThat(a.statusCode()).isEqualTo(200);assertThat(a.body()).isEqualTo(BODY_A);- var b = httpGet(urlB);+ HttpResponse<String> b = httpGet(urlB);assertThat(b.statusCode()).isEqualTo(200);assertThat(b.body()).isEqualTo(BODY_B);// Transplant: object A's raw path with object B's complete raw query- var transplanted = TestFixtures.endpoint()+ String transplanted = TestFixtures.endpoint()+ URI.create(urlA).getRawPath() + "?" + URI.create(urlB).getRawQuery();- var t = httpGet(transplanted);+ HttpResponse<String> t = httpGet(transplanted);assertThat(t.statusCode()).isEqualTo(403);assertThat(t.body()).contains("SignatureDoesNotMatch");}@@ -119,17 +119,17 @@ class S3PresignedUrlSigV4VerificationTest {void reorderedQueryParametersStillVerify() throws Exception {assumeEnforcementEnabled();- var url = URI.create(presignGet(KEY_A));- var pairs = url.getRawQuery().split("&");- var reordered = new StringBuilder();- for (var i = pairs.length - 1; i >= 0; i--) {+ URI url = URI.create(presignGet(KEY_A));+ String[] pairs = url.getRawQuery().split("&");+ StringBuilder reordered = new StringBuilder();+ for (int i = pairs.length - 1; i >= 0; i--) {reordered.append(pairs[i]);if (i > 0) {reordered.append("&");}}- var r = httpGet(TestFixtures.endpoint() + url.getRawPath() + "?" + reordered);+ HttpResponse<String> r = httpGet(TestFixtures.endpoint() + url.getRawPath() + "?" + reordered);assertThat(r.statusCode()).isEqualTo(200);assertThat(r.body()).isEqualTo(BODY_A);}@@ -140,7 +140,7 @@ class S3PresignedUrlSigV4VerificationTest {assumeEnforcementEnabled();String url;- try (var presigner = presigner()) {+ try (S3Presigner presigner = presigner()) {url = presigner.presignGetObject(GetObjectPresignRequest.builder().signatureDuration(Duration.ofMinutes(5)).getObjectRequest(GetObjectRequest.builder()@@ -150,7 +150,7 @@ class S3PresignedUrlSigV4VerificationTest {.build()).url().toString();}- var r = httpGet(url);+ HttpResponse<String> r = httpGet(url);assertThat(r.statusCode()).isEqualTo(200);assertThat(r.body()).isEqualTo(BODY_A);}@@ -160,11 +160,11 @@ class S3PresignedUrlSigV4VerificationTest {void expiredPresignedUrlIsRejected() throws Exception {assumeEnforcementEnabled();- var url = URI.create(presignGet(KEY_A));- var expiredQuery = url.getRawQuery()+ URI url = URI.create(presignGet(KEY_A));+ String expiredQuery = url.getRawQuery().replaceFirst("X-Amz-Date=[^&]+", "X-Amz-Date=20200101T000000Z");- var r = httpGet(TestFixtures.endpoint() + url.getRawPath() + "?" + expiredQuery);+ HttpResponse<String> r = httpGet(TestFixtures.endpoint() + url.getRawPath() + "?" + expiredQuery);assertThat(r.statusCode()).isEqualTo(403);assertThat(r.body()).contains("AccessDenied");}@@ -174,21 +174,21 @@ class S3PresignedUrlSigV4VerificationTest {void presignedUrlSignedWithIamAccessKeyIsAccepted() throws Exception {assumeEnforcementEnabled();- var userName = TestFixtures.uniqueName("presign-user");+ String userName = TestFixtures.uniqueName("presign-user");iam.createUser(r -> r.userName(userName).path("/"));CreateAccessKeyResponse keyResponse = iam.createAccessKey(r -> r.userName(userName));- var accessKeyId = keyResponse.accessKey().accessKeyId();- var secretKey = keyResponse.accessKey().secretAccessKey();+ String accessKeyId = keyResponse.accessKey().accessKeyId();+ String secretKey = keyResponse.accessKey().secretAccessKey();String url;- try (var presigner = presigner(accessKeyId, secretKey)) {+ try (S3Presigner presigner = presigner(accessKeyId, secretKey)) {url = presigner.presignGetObject(GetObjectPresignRequest.builder().signatureDuration(Duration.ofMinutes(5)).getObjectRequest(GetObjectRequest.builder().bucket(BUCKET).key(KEY_A).build()).build()).url().toString();}- var r = httpGet(url);+ HttpResponse<String> r = httpGet(url);assertThat(r.statusCode()).isEqualTo(200);assertThat(r.body()).isEqualTo(BODY_A);}@@ -198,10 +198,10 @@ class S3PresignedUrlSigV4VerificationTest {void presignedUrlWithMalformedCredentialIsRejected() throws Exception {assumeEnforcementEnabled();- var url = URI.create(presignGet(KEY_A));- var query = url.getRawQuery().replaceFirst("X-Amz-Credential=[^&]+", "X-Amz-Credential=test");+ URI url = URI.create(presignGet(KEY_A));+ String query = url.getRawQuery().replaceFirst("X-Amz-Credential=[^&]+", "X-Amz-Credential=test");- var r = httpGet(TestFixtures.endpoint() + url.getRawPath() + "?" + query);+ HttpResponse<String> r = httpGet(TestFixtures.endpoint() + url.getRawPath() + "?" + query);assertThat(r.statusCode()).isEqualTo(403);assertThat(r.body()).contains("InvalidAccessKeyId");}@@ -287,7 +287,7 @@ class S3PresignedUrlSigV4VerificationTest {}private static boolean probeEnforcementEnabled() {- var unknownS3 = S3Client.builder()+ S3Client unknownS3 = S3Client.builder().endpointOverride(TestFixtures.endpoint()).region(Region.US_EAST_1).credentialsProvider(StaticCredentialsProvider.create(@@ -328,7 +328,7 @@ class S3PresignedUrlSigV4VerificationTest {}private static String presignGet(String key) {- try (var presigner = presigner()) {+ try (S3Presigner presigner = presigner()) {return presigner.presignGetObject(GetObjectPresignRequest.builder().signatureDuration(Duration.ofMinutes(5)).getObjectRequest(GetObjectRequest.builder().bucket(BUCKET).key(key).build())diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3Test.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3Test.javaindex ef8d60e19f..d445dd0c40 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3Test.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3Test.java@@ -1,6 +1,8 @@package com.floci.test;import org.junit.jupiter.api.*;+import software.amazon.awssdk.core.ResponseBytes;+import software.amazon.awssdk.core.ResponseInputStream;import software.amazon.awssdk.core.sync.RequestBody;import software.amazon.awssdk.services.s3.S3Client;import software.amazon.awssdk.services.s3.model.BucketLocationConstraint;@@ -20,6 +22,7 @@ import software.amazon.awssdk.services.s3.model.GetBucketLocationResponse;import software.amazon.awssdk.services.s3.model.GetBucketTaggingRequest;import software.amazon.awssdk.services.s3.model.GetBucketTaggingResponse;import software.amazon.awssdk.services.s3.model.GetObjectRequest;+import software.amazon.awssdk.services.s3.model.GetObjectResponse;import software.amazon.awssdk.services.s3.model.GetObjectTaggingRequest;import software.amazon.awssdk.services.s3.model.GetObjectTaggingResponse;import software.amazon.awssdk.services.s3.model.HeadBucketRequest;@@ -33,6 +36,7 @@ import software.amazon.awssdk.services.s3.model.NoSuchBucketException;import software.amazon.awssdk.services.s3.model.ObjectIdentifier;import software.amazon.awssdk.services.s3.model.PutBucketTaggingRequest;import software.amazon.awssdk.services.s3.model.PutObjectRequest;+import software.amazon.awssdk.services.s3.model.PutObjectResponse;import software.amazon.awssdk.services.s3.model.PutObjectTaggingRequest;import software.amazon.awssdk.services.s3.model.S3Exception;import software.amazon.awssdk.services.s3.model.Tagging;@@ -131,7 +135,7 @@ class S3Test {@Test@Order(7)void getObject() throws Exception {- var response = s3.getObject(GetObjectRequest.builder()+ ResponseInputStream<GetObjectResponse> response = s3.getObject(GetObjectRequest.builder().bucket(BUCKET).key(KEY).build());byte[] data = response.readAllBytes();String downloaded = new String(data, StandardCharsets.UTF_8);@@ -280,7 +284,7 @@ class S3Test {assertThat(response.copyObjectResult().eTag()).isNotNull();// Verify copied content- var getResponse = s3.getObject(GetObjectRequest.builder()+ ResponseInputStream<GetObjectResponse> getResponse = s3.getObject(GetObjectRequest.builder().bucket(destBucket).key(destKey).build());String downloaded = new String(getResponse.readAllBytes(), StandardCharsets.UTF_8);assertThat(downloaded).isEqualTo(CONTENT);@@ -317,7 +321,7 @@ class S3Test {assertThat(response.copyObjectResult().eTag()).isNotNull();// Verify copied content- var getResponse = s3.getObject(GetObjectRequest.builder()+ ResponseInputStream<GetObjectResponse> getResponse = s3.getObject(GetObjectRequest.builder().bucket(dstBucket).key(dstKey).build());String downloaded = new String(getResponse.readAllBytes(), StandardCharsets.UTF_8);assertThat(downloaded).isEqualTo("non-ascii content");@@ -405,7 +409,7 @@ class S3Test {}s3.createBucket(CreateBucketRequest.builder().bucket(bucket).build());try {- var putResponse = s3.putObject(PutObjectRequest.builder()+ PutObjectResponse putResponse = s3.putObject(PutObjectRequest.builder().bucket(bucket).key(key).contentEncoding("gzip").contentType("application/json")@@ -512,7 +516,7 @@ class S3Test {.bucket(bucket).key(key).build(),RequestBody.fromString(CONTENT));- var response = s3.getObjectAsBytes(GetObjectRequest.builder()+ ResponseBytes<GetObjectResponse> response = s3.getObjectAsBytes(GetObjectRequest.builder().bucket(bucket).key(key).range("bytes=6-13")diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3VirtualHostStyleTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3VirtualHostStyleTest.javaindex d37d5e3aa0..d8d42fd534 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3VirtualHostStyleTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3VirtualHostStyleTest.java@@ -1,6 +1,7 @@package com.floci.test;import org.junit.jupiter.api.*;+import software.amazon.awssdk.core.ResponseInputStream;import software.amazon.awssdk.core.sync.RequestBody;import software.amazon.awssdk.services.s3.S3Client;import software.amazon.awssdk.services.s3.model.*;@@ -102,7 +103,7 @@ class S3VirtualHostStyleTest {@Test@Order(6)void getObject() throws Exception {- var response = s3.getObject(GetObjectRequest.builder()+ ResponseInputStream<GetObjectResponse> response = s3.getObject(GetObjectRequest.builder().bucket(BUCKET).key(KEY).build());String downloaded = new String(response.readAllBytes(), StandardCharsets.UTF_8);@@ -129,7 +130,7 @@ class S3VirtualHostStyleTest {assertThat(response.copyObjectResult().eTag()).isNotNull();- var getResponse = s3.getObject(GetObjectRequest.builder()+ ResponseInputStream<GetObjectResponse> getResponse = s3.getObject(GetObjectRequest.builder().bucket(BUCKET).key(COPIED_KEY).build());String downloaded = new String(getResponse.readAllBytes(), StandardCharsets.UTF_8);assertThat(downloaded).isEqualTo(CONTENT);diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SecurityHubOrganizationConfigurationTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SecurityHubOrganizationConfigurationTest.javaindex d091131d64..4b10cb9778 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SecurityHubOrganizationConfigurationTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SecurityHubOrganizationConfigurationTest.java@@ -5,8 +5,17 @@ import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.organizations.OrganizationsClient;import software.amazon.awssdk.services.organizations.model.AlreadyInOrganizationException;+import software.amazon.awssdk.services.organizations.model.CreateAccountResponse;import software.amazon.awssdk.services.securityhub.SecurityHubClient;+import software.amazon.awssdk.services.securityhub.model.CreateConfigurationPolicyResponse;+import software.amazon.awssdk.services.securityhub.model.CreateFindingAggregatorResponse;+import software.amazon.awssdk.services.securityhub.model.DescribeHubResponse;+import software.amazon.awssdk.services.securityhub.model.DescribeOrganizationConfigurationResponse;+import software.amazon.awssdk.services.securityhub.model.EnableOrganizationAdminAccountResponse;+import software.amazon.awssdk.services.securityhub.model.GetConfigurationPolicyAssociationResponse;+import software.amazon.awssdk.services.securityhub.model.ListOrganizationAdminAccountsResponse;import software.amazon.awssdk.services.securityhub.model.Policy;+import software.amazon.awssdk.services.securityhub.model.StartConfigurationPolicyAssociationResponse;import java.util.Map;@@ -31,12 +40,12 @@ class SecurityHubOrganizationConfigurationTest {SecurityHubClient administrator = TestFixtures.securityHubClient(adminAccount)) {assertThat(management.listOrganizationAdminAccounts(request -> {}).adminAccounts()).isEmpty();- var enabledAdmin = management.enableOrganizationAdminAccount(request -> request+ EnableOrganizationAdminAccountResponse enabledAdmin = management.enableOrganizationAdminAccount(request -> request.adminAccountId(adminAccount));assertThat(enabledAdmin.adminAccountId()).isEqualTo(adminAccount);assertThat(enabledAdmin.featureAsString()).isEqualTo("SecurityHub");- var administrators = management.listOrganizationAdminAccounts(request -> {});+ ListOrganizationAdminAccountsResponse administrators = management.listOrganizationAdminAccounts(request -> {});assertThat(administrators.featureAsString()).isEqualTo("SecurityHub");assertThat(administrators.adminAccounts()).singleElement()@@ -49,7 +58,7 @@ class SecurityHubOrganizationConfigurationTest {administrator.updateSecurityHubConfiguration(request -> request.autoEnableControls(false).controlFindingGenerator("STANDARD_CONTROL"));- var hub = administrator.describeHub(request -> {});+ DescribeHubResponse hub = administrator.describeHub(request -> {});assertThat(hub.autoEnableControls()).isFalse();assertThat(hub.controlFindingGeneratorAsString()).isEqualTo("STANDARD_CONTROL");@@ -58,15 +67,15 @@ class SecurityHubOrganizationConfigurationTest {.autoEnableStandards("NONE").organizationConfiguration(configuration -> configuration.configurationType("CENTRAL")));- var organization = administrator.describeOrganizationConfiguration(request -> {});+ DescribeOrganizationConfigurationResponse organization = administrator.describeOrganizationConfiguration(request -> {});assertThat(organization.autoEnable()).isFalse();assertThat(organization.autoEnableStandardsAsString()).isEqualTo("NONE");assertThat(organization.organizationConfiguration().configurationTypeAsString()).isEqualTo("CENTRAL");- var aggregator = administrator.createFindingAggregator(request -> request.regionLinkingMode("ALL_REGIONS"));+ CreateFindingAggregatorResponse aggregator = administrator.createFindingAggregator(request -> request.regionLinkingMode("ALL_REGIONS"));assertThat(aggregator.findingAggregatorArn()).isNotBlank();- var policy = administrator.createConfigurationPolicy(request -> request+ CreateConfigurationPolicyResponse policy = administrator.createConfigurationPolicy(request -> request.name(TestFixtures.uniqueName("securityhub-policy")).configurationPolicy(Policy.fromSecurityHub(securityHub -> securityHub.serviceEnabled(true))).tags(Map.of("env", "test")));@@ -79,7 +88,7 @@ class SecurityHubOrganizationConfigurationTest {assertThat(summary.serviceEnabled()).isTrue();});- var association = administrator.startConfigurationPolicyAssociation(request -> request+ StartConfigurationPolicyAssociationResponse association = administrator.startConfigurationPolicyAssociation(request -> request.configurationPolicyIdentifier(policy.id()).target(target -> target.accountId(memberAccount)));assertThat(association.targetId()).isEqualTo(memberAccount);@@ -87,7 +96,7 @@ class SecurityHubOrganizationConfigurationTest {administrator.getConfigurationPolicyAssociation(request -> request.target(target -> target.accountId(memberAccount)));- var converged = administrator.getConfigurationPolicyAssociation(request -> request+ GetConfigurationPolicyAssociationResponse converged = administrator.getConfigurationPolicyAssociation(request -> request.target(target -> target.accountId(memberAccount)));assertThat(converged.associationStatusAsString()).isEqualTo("SUCCESS");@@ -125,7 +134,7 @@ class SecurityHubOrganizationConfigurationTest {private static String createMemberAccount(OrganizationsClient organizations, String prefix) {String suffix = TestFixtures.uniqueName(prefix);- var response = organizations.createAccount(request -> request+ CreateAccountResponse response = organizations.createAccount(request -> request.accountName(suffix).email(suffix + "@example.com"));return response.createAccountStatus().accountId();diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesEventPublishingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesEventPublishingTest.javaindex 78943fa60e..48a25406f1 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesEventPublishingTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesEventPublishingTest.java@@ -673,7 +673,8 @@ class SesEventPublishingTest {if (r.messages().isEmpty()) {continue;}- for (var m : r.messages()) {+ // Message is imported from sesv2.+ for (software.amazon.awssdk.services.sqs.model.Message m : r.messages()) {events.add(MAPPER.readTree(m.body()));}List<DeleteMessageBatchRequestEntry> entries = new ArrayList<>();@@ -765,7 +766,7 @@ class SesEventPublishingTest {if (r.messages().isEmpty()) {continue;}- for (var m : r.messages()) {+ for (software.amazon.awssdk.services.sqs.model.Message m : r.messages()) {JsonNode wrapper = MAPPER.readTree(m.body());JsonNode event = MAPPER.readTree(wrapper.path("Message").asText());events.add(event);diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesReceiptRuleSetTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesReceiptRuleSetTest.javaindex 19255e938c..3974d33119 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesReceiptRuleSetTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesReceiptRuleSetTest.java@@ -25,6 +25,8 @@ import software.amazon.awssdk.services.ses.model.SesException;import software.amazon.awssdk.services.ses.model.TlsPolicy;import software.amazon.awssdk.services.sns.SnsClient;+import java.util.List;+import static org.assertj.core.api.Assertions.assertThat;import static org.assertj.core.api.Assertions.assertThatThrownBy;@@ -316,7 +318,7 @@ class SesReceiptRuleSetTest {ses.createReceiptFilter(b -> b.filter(f -> f.name(allowFilter).ipFilter(ip -> ip.policy(ReceiptFilterPolicy.ALLOW).cidr("192.0.2.10"))));- var filters = ses.listReceiptFilters().filters();+ List<ReceiptFilter> filters = ses.listReceiptFilters().filters();ReceiptFilter block = filters.stream().filter(f -> blockFilter.equals(f.name())).findFirst().orElseThrow();assertThat(block.ipFilter().policy()).isEqualTo(ReceiptFilterPolicy.BLOCK);diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SnsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SnsTest.javaindex f7a6db67ef..5e891b1596 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SnsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SnsTest.java@@ -236,11 +236,11 @@ class SnsTest {assertThat(body).doesNotContain("\"Type\":\"Notification\"");assertThat(body).isEqualTo("raw-delivery-content");- var msgAttrs = rawRecv.messages().get(0).messageAttributes();- assertThat(msgAttrs).containsKey("color");- assertThat(msgAttrs.get("color").stringValue()).isEqualTo("blue");- assertThat(msgAttrs).containsKey("count");- assertThat(msgAttrs.get("count").dataType()).isEqualTo("Number");+ Message rawMessage = rawRecv.messages().get(0);+ assertThat(rawMessage.messageAttributes()).containsKey("color");+ assertThat(rawMessage.messageAttributes().get("color").stringValue()).isEqualTo("blue");+ assertThat(rawMessage.messageAttributes()).containsKey("count");+ assertThat(rawMessage.messageAttributes().get("count").dataType()).isEqualTo("Number");// Cleanupsns.unsubscribe(UnsubscribeRequest.builder().subscriptionArn(rawSubArn).build());@@ -559,20 +559,20 @@ class SnsTest {assertThat(batchRecv.messages()).hasSize(2);- var byBody = batchRecv.messages().stream()+ Map<String, Message> byBody = batchRecv.messages().stream().collect(java.util.stream.Collectors.toMap(software.amazon.awssdk.services.sqs.model.Message::body, m -> m));- var attrsA = byBody.get("batch-msg-a").messageAttributes();- assertThat(attrsA).containsKeys("ce-type", "ce-id");- assertThat(attrsA.get("ce-id").stringValue()).isEqualTo("id-a");- assertThat(attrsA.get("ce-type").stringValue()).isEqualTo("com.example.test");+ Message messageA = byBody.get("batch-msg-a");+ assertThat(messageA.messageAttributes()).containsKeys("ce-type", "ce-id");+ assertThat(messageA.messageAttributes().get("ce-id").stringValue()).isEqualTo("id-a");+ assertThat(messageA.messageAttributes().get("ce-type").stringValue()).isEqualTo("com.example.test");- var attrsB = byBody.get("batch-msg-b").messageAttributes();- assertThat(attrsB).containsKeys("ce-type", "ce-id", "count");- assertThat(attrsB.get("ce-id").stringValue()).isEqualTo("id-b");- assertThat(attrsB.get("count").dataType()).isEqualTo("Number");- assertThat(attrsB.get("count").stringValue()).isEqualTo("42");+ Message messageB = byBody.get("batch-msg-b");+ assertThat(messageB.messageAttributes()).containsKeys("ce-type", "ce-id", "count");+ assertThat(messageB.messageAttributes().get("ce-id").stringValue()).isEqualTo("id-b");+ assertThat(messageB.messageAttributes().get("count").dataType()).isEqualTo("Number");+ assertThat(messageB.messageAttributes().get("count").stringValue()).isEqualTo("42");sns.unsubscribe(UnsubscribeRequest.builder().subscriptionArn(batchSubArn).build());sns.deleteTopic(DeleteTopicRequest.builder().topicArn(batchTopicArn).build());diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoAdminAccountAssignmentTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoAdminAccountAssignmentTest.javaindex e58fe204cc..149c93c41a 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoAdminAccountAssignmentTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoAdminAccountAssignmentTest.java@@ -3,10 +3,78 @@ package com.floci.test;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.ssoadmin.SsoAdminClient;+import software.amazon.awssdk.services.ssoadmin.model.AddRegionResponse;+import software.amazon.awssdk.services.ssoadmin.model.AttachCustomerManagedPolicyReferenceToPermissionSetResponse;+import software.amazon.awssdk.services.ssoadmin.model.CreateAccountAssignmentResponse;+import software.amazon.awssdk.services.ssoadmin.model.CreateApplicationAssignmentResponse;+import software.amazon.awssdk.services.ssoadmin.model.CreateApplicationResponse;+import software.amazon.awssdk.services.ssoadmin.model.CreateInstanceAccessControlAttributeConfigurationResponse;+import software.amazon.awssdk.services.ssoadmin.model.CreateTrustedTokenIssuerResponse;+import software.amazon.awssdk.services.ssoadmin.model.DeleteAccountAssignmentResponse;+import software.amazon.awssdk.services.ssoadmin.model.DeleteApplicationAssignmentResponse;+import software.amazon.awssdk.services.ssoadmin.model.DeleteApplicationResponse;+import software.amazon.awssdk.services.ssoadmin.model.DeleteInstanceAccessControlAttributeConfigurationResponse;+import software.amazon.awssdk.services.ssoadmin.model.DeleteInstanceResponse;+import software.amazon.awssdk.services.ssoadmin.model.DeletePermissionSetResponse;+import software.amazon.awssdk.services.ssoadmin.model.DeletePermissionsBoundaryFromPermissionSetResponse;+import software.amazon.awssdk.services.ssoadmin.model.DeleteTrustedTokenIssuerResponse;+import software.amazon.awssdk.services.ssoadmin.model.DescribeAccountAssignmentCreationStatusResponse;+import software.amazon.awssdk.services.ssoadmin.model.DescribeAccountAssignmentDeletionStatusResponse;+import software.amazon.awssdk.services.ssoadmin.model.DescribeApplicationAssignmentResponse;+import software.amazon.awssdk.services.ssoadmin.model.DescribeApplicationProviderResponse;+import software.amazon.awssdk.services.ssoadmin.model.DescribeApplicationResponse;+import software.amazon.awssdk.services.ssoadmin.model.DescribeInstanceAccessControlAttributeConfigurationResponse;+import software.amazon.awssdk.services.ssoadmin.model.DescribeInstanceResponse;+import software.amazon.awssdk.services.ssoadmin.model.DescribePermissionSetProvisioningStatusResponse;+import software.amazon.awssdk.services.ssoadmin.model.DescribeRegionResponse;+import software.amazon.awssdk.services.ssoadmin.model.DescribeTrustedTokenIssuerResponse;+import software.amazon.awssdk.services.ssoadmin.model.DetachCustomerManagedPolicyReferenceFromPermissionSetResponse;+import software.amazon.awssdk.services.ssoadmin.model.GetApplicationAccessScopeResponse;+import software.amazon.awssdk.services.ssoadmin.model.GetApplicationAssignmentConfigurationResponse;+import software.amazon.awssdk.services.ssoadmin.model.GetApplicationAuthenticationMethodResponse;+import software.amazon.awssdk.services.ssoadmin.model.GetApplicationGrantResponse;+import software.amazon.awssdk.services.ssoadmin.model.GetApplicationSessionConfigurationResponse;+import software.amazon.awssdk.services.ssoadmin.model.GetPermissionsBoundaryForPermissionSetResponse;+import software.amazon.awssdk.services.ssoadmin.model.InstanceMetadata;+import software.amazon.awssdk.services.ssoadmin.model.ListAccountAssignmentCreationStatusResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListAccountAssignmentDeletionStatusResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListAccountAssignmentsForPrincipalResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListAccountAssignmentsResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListAccountsForProvisionedPermissionSetResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListApplicationAccessScopesResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListApplicationAssignmentsForPrincipalResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListApplicationAssignmentsResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListApplicationAuthenticationMethodsResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListApplicationGrantsResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListApplicationProvidersResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListApplicationsResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListCustomerManagedPolicyReferencesInPermissionSetResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListManagedPoliciesInPermissionSetResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListPermissionSetProvisioningStatusResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListPermissionSetsProvisionedToAccountResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListRegionsResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListTagsForResourceResponse;+import software.amazon.awssdk.services.ssoadmin.model.ListTrustedTokenIssuersResponse;import software.amazon.awssdk.services.ssoadmin.model.PrincipalType;+import software.amazon.awssdk.services.ssoadmin.model.ProvisionPermissionSetResponse;+import software.amazon.awssdk.services.ssoadmin.model.PutApplicationAccessScopeResponse;+import software.amazon.awssdk.services.ssoadmin.model.PutApplicationAssignmentConfigurationResponse;+import software.amazon.awssdk.services.ssoadmin.model.PutApplicationAuthenticationMethodResponse;+import software.amazon.awssdk.services.ssoadmin.model.PutApplicationGrantResponse;+import software.amazon.awssdk.services.ssoadmin.model.PutApplicationSessionConfigurationResponse;+import software.amazon.awssdk.services.ssoadmin.model.PutPermissionsBoundaryToPermissionSetResponse;+import software.amazon.awssdk.services.ssoadmin.model.RemoveRegionResponse;+import software.amazon.awssdk.services.ssoadmin.model.TagResourceResponse;import software.amazon.awssdk.services.ssoadmin.model.TargetType;+import software.amazon.awssdk.services.ssoadmin.model.UntagResourceResponse;+import software.amazon.awssdk.services.ssoadmin.model.UpdateApplicationResponse;+import software.amazon.awssdk.services.ssoadmin.model.UpdateInstanceAccessControlAttributeConfigurationResponse;+import software.amazon.awssdk.services.ssoadmin.model.UpdateInstanceResponse;+import software.amazon.awssdk.services.ssoadmin.model.UpdateTrustedTokenIssuerResponse;import software.amazon.awssdk.services.ssoadmin.model.ValidationException;+import java.util.List;+import static org.assertj.core.api.Assertions.assertThat;import static org.assertj.core.api.Assertions.assertThatThrownBy;import static org.junit.jupiter.api.Assumptions.assumeFalse;@@ -21,13 +89,13 @@ class SsoAdminAccountAssignmentTest {try (SsoAdminClient sso = TestFixtures.ssoAdminClient()) {String instanceArn = sso.listInstances(request -> {}).instances().get(0).instanceArn();- var added = sso.addRegion(request -> request+ AddRegionResponse added = sso.addRegion(request -> request.instanceArn(instanceArn).regionName("ap-southeast-3"));assertThat(added.statusAsString()).isEqualTo("ADDING");- var described = sso.describeRegion(request -> request+ DescribeRegionResponse described = sso.describeRegion(request -> request.instanceArn(instanceArn).regionName("ap-southeast-3"));assertThat(described.regionName()).isEqualTo("ap-southeast-3");@@ -35,13 +103,13 @@ class SsoAdminAccountAssignmentTest {assertThat(described.isPrimaryRegion()).isFalse();assertThat(described.addedDate()).isNotNull();- var regions = sso.listRegions(request -> request.instanceArn(instanceArn));+ ListRegionsResponse regions = sso.listRegions(request -> request.instanceArn(instanceArn));assertThat(regions.regions()).anySatisfy(region -> {assertThat(region.regionName()).isEqualTo("ap-southeast-3");assertThat(region.statusAsString()).isEqualTo("ACTIVE");});- var removed = sso.removeRegion(request -> request+ RemoveRegionResponse removed = sso.removeRegion(request -> request.instanceArn(instanceArn).regionName("ap-southeast-3"));assertThat(removed.statusAsString()).isEqualTo("REMOVING");@@ -71,7 +139,7 @@ class SsoAdminAccountAssignmentTest {.permissionSet().permissionSetArn();- var response = sso.attachCustomerManagedPolicyReferenceToPermissionSet(request -> request+ AttachCustomerManagedPolicyReferenceToPermissionSetResponse response = sso.attachCustomerManagedPolicyReferenceToPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn).customerManagedPolicyReference(reference -> reference@@ -79,7 +147,7 @@ class SsoAdminAccountAssignmentTest {.path("/platform/")));assertThat(response.sdkHttpResponse().isSuccessful()).isTrue();- var references = sso.listCustomerManagedPolicyReferencesInPermissionSet(request -> request+ ListCustomerManagedPolicyReferencesInPermissionSetResponse references = sso.listCustomerManagedPolicyReferencesInPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn));assertThat(references.customerManagedPolicyReferences())@@ -95,7 +163,7 @@ class SsoAdminAccountAssignmentTest {.path("/platform/")))).isInstanceOf(software.amazon.awssdk.services.ssoadmin.model.ConflictException.class);- var detached = sso.detachCustomerManagedPolicyReferenceFromPermissionSet(request -> request+ DetachCustomerManagedPolicyReferenceFromPermissionSetResponse detached = sso.detachCustomerManagedPolicyReferenceFromPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn).customerManagedPolicyReference(reference -> reference@@ -119,7 +187,7 @@ class SsoAdminAccountAssignmentTest {try (SsoAdminClient sso = TestFixtures.ssoAdminClient()) {String instanceArn = sso.listInstances(request -> {}).instances().get(0).instanceArn();- var created = sso.createApplication(request -> request+ CreateApplicationResponse created = sso.createApplication(request -> request.instanceArn(instanceArn).applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom").name("Floci OAuth SDK")@@ -136,7 +204,7 @@ class SsoAdminAccountAssignmentTest {"arn:aws:sso::000000000000:application/ssoins-7223b02a5d9f7c8e/apl-[0-9a-f]{16}");assertThat(created.identityStoreArn()).isEqualTo("arn:aws:identitystore::000000000000:identitystore/d-9067f2a3c1");- var replay = sso.createApplication(request -> request+ CreateApplicationResponse replay = sso.createApplication(request -> request.instanceArn(instanceArn).applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom").name("Floci OAuth SDK")@@ -150,14 +218,14 @@ class SsoAdminAccountAssignmentTest {.tags(tag -> tag.key("Environment").value("test")));assertThat(replay.applicationArn()).isEqualTo(created.applicationArn());- var tags = sso.listTagsForResource(request -> request+ ListTagsForResourceResponse tags = sso.listTagsForResource(request -> request.instanceArn(instanceArn).resourceArn(created.applicationArn()));assertThat(tags.tags()).singleElement().satisfies(tag -> {assertThat(tag.key()).isEqualTo("Environment");assertThat(tag.value()).isEqualTo("test");});- var tagged = sso.tagResource(request -> request+ TagResourceResponse tagged = sso.tagResource(request -> request.instanceArn(instanceArn).resourceArn(created.applicationArn()).tags(tag -> tag.key("Environment").value("prod"),@@ -166,14 +234,14 @@ class SsoAdminAccountAssignmentTest {assertThat(sso.listTagsForResource(request -> request.resourceArn(created.applicationArn())).tags()).extracting(tag -> tag.key() + "=" + tag.value()).containsExactly("Environment=prod", "Owner=platform");- var untagged = sso.untagResource(request -> request+ UntagResourceResponse untagged = sso.untagResource(request -> request.resourceArn(created.applicationArn()).tagKeys("Owner"));assertThat(untagged.sdkHttpResponse().isSuccessful()).isTrue();assertThat(sso.listTagsForResource(request -> request.resourceArn(created.applicationArn())).tags()).extracting(tag -> tag.key() + "=" + tag.value()).containsExactly("Environment=prod");- var replayAfterTagging = sso.createApplication(request -> request+ CreateApplicationResponse replayAfterTagging = sso.createApplication(request -> request.instanceArn(instanceArn).applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom").name("Floci OAuth SDK")@@ -187,7 +255,7 @@ class SsoAdminAccountAssignmentTest {.tags(tag -> tag.key("Environment").value("test")));assertThat(replayAfterTagging.applicationArn()).isEqualTo(created.applicationArn());- var updatedApplication = sso.updateApplication(request -> request+ UpdateApplicationResponse updatedApplication = sso.updateApplication(request -> request.applicationArn(created.applicationArn()).name("Floci OAuth SDK Updated").description("Updated through SDK")@@ -196,7 +264,7 @@ class SsoAdminAccountAssignmentTest {.origin("IDENTITY_CENTER"))));assertThat(updatedApplication.sdkHttpResponse().isSuccessful()).isTrue();- var described = sso.describeApplication(request -> request.applicationArn(created.applicationArn()));+ DescribeApplicationResponse described = sso.describeApplication(request -> request.applicationArn(created.applicationArn()));assertThat(described.applicationArn()).isEqualTo(created.applicationArn());assertThat(described.name()).isEqualTo("Floci OAuth SDK Updated");assertThat(described.description()).isEqualTo("Updated through SDK");@@ -206,19 +274,19 @@ class SsoAdminAccountAssignmentTest {assertThat(described.applicationProviderArn()).isEqualTo("arn:aws:sso::aws:applicationProvider/custom");assertThat(described.portalOptions().signInOptions().originAsString()).isEqualTo("IDENTITY_CENTER");- var provider = sso.describeApplicationProvider(request -> request+ DescribeApplicationProviderResponse provider = sso.describeApplicationProvider(request -> request.applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom"));assertThat(provider.applicationProviderArn()).isEqualTo("arn:aws:sso::aws:applicationProvider/custom");assertThat(provider.federationProtocolAsString()).isEqualTo("OAUTH");- var providers = sso.listApplicationProviders(request -> {});+ ListApplicationProvidersResponse providers = sso.listApplicationProviders(request -> {});assertThat(providers.applicationProviders()).singleElement().satisfies(applicationProvider -> {assertThat(applicationProvider.applicationProviderArn()).isEqualTo("arn:aws:sso::aws:applicationProvider/custom");assertThat(applicationProvider.federationProtocolAsString()).isEqualTo("OAUTH");});- var applications = sso.listApplications(request -> request+ ListApplicationsResponse applications = sso.listApplications(request -> request.instanceArn(instanceArn).filter(filter -> filter.applicationAccount("000000000000")@@ -226,22 +294,22 @@ class SsoAdminAccountAssignmentTest {assertThat(applications.applications()).anySatisfy(application ->assertThat(application.applicationArn()).isEqualTo(created.applicationArn()));- var assignmentConfiguration = sso.getApplicationAssignmentConfiguration(request -> request+ GetApplicationAssignmentConfigurationResponse assignmentConfiguration = sso.getApplicationAssignmentConfiguration(request -> request.applicationArn(created.applicationArn()));assertThat(assignmentConfiguration.assignmentRequired()).isTrue();- var putAssignmentConfiguration = sso.putApplicationAssignmentConfiguration(request -> request+ PutApplicationAssignmentConfigurationResponse putAssignmentConfiguration = sso.putApplicationAssignmentConfiguration(request -> request.applicationArn(created.applicationArn()).assignmentRequired(false));assertThat(putAssignmentConfiguration.sdkHttpResponse().isSuccessful()).isTrue();assertThat(sso.getApplicationAssignmentConfiguration(request -> request.applicationArn(created.applicationArn())).assignmentRequired()).isFalse();- var putScope = sso.putApplicationAccessScope(request -> request+ PutApplicationAccessScopeResponse putScope = sso.putApplicationAccessScope(request -> request.applicationArn(created.applicationArn()).scope("api:read").authorizedTargets(instanceArn));assertThat(putScope.sdkHttpResponse().isSuccessful()).isTrue();- var accessScope = sso.getApplicationAccessScope(request -> request+ GetApplicationAccessScopeResponse accessScope = sso.getApplicationAccessScope(request -> request.applicationArn(created.applicationArn()).scope("api:read"));assertThat(accessScope.scope()).isEqualTo("api:read");@@ -251,7 +319,7 @@ class SsoAdminAccountAssignmentTest {.applicationArn(created.applicationArn()).scope("api:write").authorizedTargets(instanceArn));- var firstScopePage = sso.listApplicationAccessScopes(request -> request+ ListApplicationAccessScopesResponse firstScopePage = sso.listApplicationAccessScopes(request -> request.applicationArn(created.applicationArn()).maxResults(1));assertThat(firstScopePage.scopes()).singleElement().satisfies(scope -> {@@ -260,7 +328,7 @@ class SsoAdminAccountAssignmentTest {});assertThat(firstScopePage.nextToken()).isNotBlank();- var secondScopePage = sso.listApplicationAccessScopes(request -> request+ ListApplicationAccessScopesResponse secondScopePage = sso.listApplicationAccessScopes(request -> request.applicationArn(created.applicationArn()).maxResults(1).nextToken(firstScopePage.nextToken()));@@ -287,13 +355,13 @@ class SsoAdminAccountAssignmentTest {.name("SDK Assignment App").clientToken("sdk-assignment-app-token")).applicationArn();- var response = sso.createApplicationAssignment(request -> request+ CreateApplicationAssignmentResponse response = sso.createApplicationAssignment(request -> request.applicationArn(applicationArn).principalId("11111111-2222-3333-4444-555555555555").principalType("USER"));assertThat(response.sdkHttpResponse().isSuccessful()).isTrue();- var described = sso.describeApplicationAssignment(request -> request+ DescribeApplicationAssignmentResponse described = sso.describeApplicationAssignment(request -> request.applicationArn(applicationArn).principalId("11111111-2222-3333-4444-555555555555").principalType("USER"));@@ -301,7 +369,7 @@ class SsoAdminAccountAssignmentTest {assertThat(described.principalId()).isEqualTo("11111111-2222-3333-4444-555555555555");assertThat(described.principalTypeAsString()).isEqualTo("USER");- var listed = sso.listApplicationAssignments(request -> request.applicationArn(applicationArn).maxResults(1));+ ListApplicationAssignmentsResponse listed = sso.listApplicationAssignments(request -> request.applicationArn(applicationArn).maxResults(1));assertThat(listed.applicationAssignments()).singleElement().satisfies(assignment -> {assertThat(assignment.applicationArn()).isEqualTo(applicationArn);assertThat(assignment.principalId()).isEqualTo("11111111-2222-3333-4444-555555555555");@@ -319,7 +387,7 @@ class SsoAdminAccountAssignmentTest {.applicationArn(applicationArn).principalId(groupId).principalType("GROUP"));- var principalAssignments = sso.listApplicationAssignmentsForPrincipal(request -> request+ ListApplicationAssignmentsForPrincipalResponse principalAssignments = sso.listApplicationAssignmentsForPrincipal(request -> request.instanceArn(instanceArn).principalId(groupId).principalType("GROUP"));@@ -349,7 +417,7 @@ class SsoAdminAccountAssignmentTest {.principalId(principalId).principalType("GROUP"));- var deleted = sso.deleteApplicationAssignment(request -> request+ DeleteApplicationAssignmentResponse deleted = sso.deleteApplicationAssignment(request -> request.applicationArn(applicationArn).principalId(principalId).principalType("GROUP"));@@ -375,7 +443,7 @@ class SsoAdminAccountAssignmentTest {.name("SDK Delete Authentication Method")).applicationArn();- var putMethod = sso.putApplicationAuthenticationMethod(request -> request+ PutApplicationAuthenticationMethodResponse putMethod = sso.putApplicationAuthenticationMethod(request -> request.applicationArn(applicationArn).authenticationMethodType("IAM").authenticationMethod(method -> method.iam(iam -> iam.actorPolicy(@@ -385,12 +453,12 @@ class SsoAdminAccountAssignmentTest {java.util.List.of())).build()))));assertThat(putMethod.sdkHttpResponse().isSuccessful()).isTrue();- var fetchedMethod = sso.getApplicationAuthenticationMethod(request -> request+ GetApplicationAuthenticationMethodResponse fetchedMethod = sso.getApplicationAuthenticationMethod(request -> request.applicationArn(applicationArn).authenticationMethodType("IAM"));assertThat(fetchedMethod.authenticationMethod().iam().actorPolicy().asMap().get("Version").asString()).isEqualTo("2012-10-17");- var listedMethods = sso.listApplicationAuthenticationMethods(request -> request+ ListApplicationAuthenticationMethodsResponse listedMethods = sso.listApplicationAuthenticationMethods(request -> request.applicationArn(applicationArn));assertThat(listedMethods.authenticationMethods()).singleElement().satisfies(method -> {assertThat(method.authenticationMethodTypeAsString()).isEqualTo("IAM");@@ -434,28 +502,28 @@ class SsoAdminAccountAssignmentTest {.name("SDK Delete Grant")).applicationArn();- var sessionConfiguration = sso.getApplicationSessionConfiguration(request -> request+ GetApplicationSessionConfigurationResponse sessionConfiguration = sso.getApplicationSessionConfiguration(request -> request.applicationArn(applicationArn));assertThat(sessionConfiguration.userBackgroundSessionApplicationStatusAsString()).isEqualTo("DISABLED");- var putSessionConfiguration = sso.putApplicationSessionConfiguration(request -> request+ PutApplicationSessionConfigurationResponse putSessionConfiguration = sso.putApplicationSessionConfiguration(request -> request.applicationArn(applicationArn).userBackgroundSessionApplicationStatus("ENABLED"));assertThat(putSessionConfiguration.sdkHttpResponse().isSuccessful()).isTrue();assertThat(sso.getApplicationSessionConfiguration(request -> request.applicationArn(applicationArn)).userBackgroundSessionApplicationStatusAsString()).isEqualTo("ENABLED");- var putGrant = sso.putApplicationGrant(request -> request+ PutApplicationGrantResponse putGrant = sso.putApplicationGrant(request -> request.applicationArn(applicationArn).grantType("authorization_code").grant(grant -> grant.authorizationCode(code -> code.redirectUris("https://example.com/callback"))));assertThat(putGrant.sdkHttpResponse().isSuccessful()).isTrue();- var fetchedGrant = sso.getApplicationGrant(request -> request+ GetApplicationGrantResponse fetchedGrant = sso.getApplicationGrant(request -> request.applicationArn(applicationArn).grantType("authorization_code"));assertThat(fetchedGrant.grant().authorizationCode().redirectUris()).containsExactly("https://example.com/callback");- var listedGrants = sso.listApplicationGrants(request -> request.applicationArn(applicationArn));+ ListApplicationGrantsResponse listedGrants = sso.listApplicationGrants(request -> request.applicationArn(applicationArn));assertThat(listedGrants.grants()).singleElement().satisfies(grant -> {assertThat(grant.grantTypeAsString()).isEqualTo("authorization_code");assertThat(grant.grant().authorizationCode().redirectUris())@@ -491,7 +559,7 @@ class SsoAdminAccountAssignmentTest {try (SsoAdminClient sso = TestFixtures.ssoAdminClient()) {String instanceArn = sso.listInstances(request -> {}).instances().get(0).instanceArn();- var created = sso.createTrustedTokenIssuer(request -> request+ CreateTrustedTokenIssuerResponse created = sso.createTrustedTokenIssuer(request -> request.instanceArn(instanceArn).name("SdkIssuer").clientToken("sdk-tti-token")@@ -505,7 +573,7 @@ class SsoAdminAccountAssignmentTest {assertThat(created.trustedTokenIssuerArn()).matches("arn:aws:sso::000000000000:trustedTokenIssuer/ssoins-[0-9a-f]{16}/tti-[0-9a-f-]{36}");- var replay = sso.createTrustedTokenIssuer(request -> request+ CreateTrustedTokenIssuerResponse replay = sso.createTrustedTokenIssuer(request -> request.instanceArn(instanceArn).name("SdkIssuer").clientToken("sdk-tti-token")@@ -518,7 +586,7 @@ class SsoAdminAccountAssignmentTest {.jwksRetrievalOption("OPEN_ID_DISCOVERY"))));assertThat(replay.trustedTokenIssuerArn()).isEqualTo(created.trustedTokenIssuerArn());- var updateResponse = sso.updateTrustedTokenIssuer(request -> request+ UpdateTrustedTokenIssuerResponse updateResponse = sso.updateTrustedTokenIssuer(request -> request.trustedTokenIssuerArn(created.trustedTokenIssuerArn()).name("SdkIssuerUpdated").trustedTokenIssuerConfiguration(configuration -> configuration@@ -526,21 +594,21 @@ class SsoAdminAccountAssignmentTest {.identityStoreAttributePath("emails.value").jwksRetrievalOption("OPEN_ID_DISCOVERY"))));assertThat(updateResponse.sdkHttpResponse().isSuccessful()).isTrue();- var described = sso.describeTrustedTokenIssuer(request -> request+ DescribeTrustedTokenIssuerResponse described = sso.describeTrustedTokenIssuer(request -> request.trustedTokenIssuerArn(created.trustedTokenIssuerArn()));assertThat(described.name()).isEqualTo("SdkIssuerUpdated");assertThat(described.trustedTokenIssuerTypeAsString()).isEqualTo("OIDC_JWT");assertThat(described.trustedTokenIssuerConfiguration().oidcJwtConfiguration().issuerUrl()).isEqualTo("https://issuer.example.com");- var issuers = sso.listTrustedTokenIssuers(request -> request.instanceArn(instanceArn));+ ListTrustedTokenIssuersResponse issuers = sso.listTrustedTokenIssuers(request -> request.instanceArn(instanceArn));assertThat(issuers.trustedTokenIssuers()).anySatisfy(issuer -> {assertThat(issuer.trustedTokenIssuerArn()).isEqualTo(created.trustedTokenIssuerArn());assertThat(issuer.name()).isEqualTo("SdkIssuerUpdated");assertThat(issuer.trustedTokenIssuerTypeAsString()).isEqualTo("OIDC_JWT");});- var deleteResponse = sso.deleteTrustedTokenIssuer(request -> request+ DeleteTrustedTokenIssuerResponse deleteResponse = sso.deleteTrustedTokenIssuer(request -> request.trustedTokenIssuerArn(created.trustedTokenIssuerArn()));assertThat(deleteResponse.sdkHttpResponse().isSuccessful()).isTrue();assertThatThrownBy(() -> sso.deleteTrustedTokenIssuer(request -> request@@ -556,7 +624,7 @@ class SsoAdminAccountAssignmentTest {try (SsoAdminClient sso = TestFixtures.ssoAdminClient()) {String instanceArn = sso.listInstances(request -> {}).instances().get(0).instanceArn();- var response = sso.createInstanceAccessControlAttributeConfiguration(request -> request+ CreateInstanceAccessControlAttributeConfigurationResponse response = sso.createInstanceAccessControlAttributeConfiguration(request -> request.instanceArn(instanceArn).instanceAccessControlAttributeConfiguration(configuration -> configuration.accessControlAttributes(attribute -> attribute@@ -565,7 +633,7 @@ class SsoAdminAccountAssignmentTest {assertThat(response.sdkHttpResponse().isSuccessful()).isTrue();- var described = sso.describeInstanceAccessControlAttributeConfiguration(request -> request.instanceArn(instanceArn));+ DescribeInstanceAccessControlAttributeConfigurationResponse described = sso.describeInstanceAccessControlAttributeConfiguration(request -> request.instanceArn(instanceArn));assertThat(described.statusAsString()).isEqualTo("ENABLED");assertThat(described.instanceAccessControlAttributeConfiguration().accessControlAttributes()).singleElement().satisfies(attribute -> {@@ -581,7 +649,7 @@ class SsoAdminAccountAssignmentTest {.value(value -> value.source("${path:enterprise.department}")))))).isInstanceOf(software.amazon.awssdk.services.ssoadmin.model.ConflictException.class);- var updateResponse = sso.updateInstanceAccessControlAttributeConfiguration(request -> request+ UpdateInstanceAccessControlAttributeConfigurationResponse updateResponse = sso.updateInstanceAccessControlAttributeConfiguration(request -> request.instanceArn(instanceArn).instanceAccessControlAttributeConfiguration(configuration -> configuration.accessControlAttributes(attribute -> attribute@@ -592,11 +660,11 @@ class SsoAdminAccountAssignmentTest {.instanceAccessControlAttributeConfiguration().accessControlAttributes()).singleElement().satisfies(attribute -> assertThat(attribute.key()).isEqualTo("CostCenter"));- var deleteResponse = sso.deleteInstanceAccessControlAttributeConfiguration(request -> request+ DeleteInstanceAccessControlAttributeConfigurationResponse deleteResponse = sso.deleteInstanceAccessControlAttributeConfiguration(request -> request.instanceArn(instanceArn));assertThat(deleteResponse.sdkHttpResponse().isSuccessful()).isTrue();- var recreateResponse = sso.createInstanceAccessControlAttributeConfiguration(request -> request+ CreateInstanceAccessControlAttributeConfigurationResponse recreateResponse = sso.createInstanceAccessControlAttributeConfiguration(request -> request.instanceArn(instanceArn).instanceAccessControlAttributeConfiguration(configuration -> configuration.accessControlAttributes(attribute -> attribute@@ -619,7 +687,7 @@ class SsoAdminAccountAssignmentTest {.tags(tag -> tag.key("Environment").value("test"))).instanceArn();- var described = sso.describeInstance(request -> request.instanceArn(instanceArn));+ DescribeInstanceResponse described = sso.describeInstance(request -> request.instanceArn(instanceArn));assertThat(described.instanceArn()).isEqualTo(instanceArn);assertThat(described.ownerAccountId()).isEqualTo("333344445555");assertThat(described.name()).isEqualTo("SdkAccountInstance");@@ -627,10 +695,10 @@ class SsoAdminAccountAssignmentTest {assertThat(described.permissionSetsEnabled()).isFalse();assertThat(described.encryptionConfigurationDetails().keyTypeAsString()).isEqualTo("AWS_OWNED_KMS_KEY");- var renamed = sso.updateInstance(request -> request.instanceArn(instanceArn).name("SdkAccountRenamed"));+ UpdateInstanceResponse renamed = sso.updateInstance(request -> request.instanceArn(instanceArn).name("SdkAccountRenamed"));assertThat(renamed.sdkHttpResponse().isSuccessful()).isTrue();sso.updateInstance(request -> request.instanceArn(instanceArn).permissionSetsEnabled(true));- var updated = sso.describeInstance(request -> request.instanceArn(instanceArn));+ DescribeInstanceResponse updated = sso.describeInstance(request -> request.instanceArn(instanceArn));assertThat(updated.name()).isEqualTo("SdkAccountRenamed");assertThat(updated.permissionSetsEnabled()).isTrue();assertThat(sso.createInstance(request -> request@@ -638,7 +706,7 @@ class SsoAdminAccountAssignmentTest {.clientToken("sdk-create-instance").tags(tag -> tag.key("Environment").value("test"))).instanceArn()).isEqualTo(instanceArn);- var listed = sso.listInstances(request -> {}).instances();+ List<InstanceMetadata> listed = sso.listInstances(request -> {}).instances();assertThat(listed).hasSize(1);assertThat(listed.get(0).instanceArn()).isEqualTo(instanceArn);assertThat(listed.get(0).ownerAccountId()).isEqualTo("333344445555");@@ -675,7 +743,7 @@ class SsoAdminAccountAssignmentTest {.applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom").name("SdkDisposableApplication"));- var deleted = sso.deleteInstance(request -> request.instanceArn(instanceArn));+ DeleteInstanceResponse deleted = sso.deleteInstance(request -> request.instanceArn(instanceArn));assertThat(deleted.sdkHttpResponse().isSuccessful()).isTrue();assertThat(sso.listInstances(request -> {}).instances()).isEmpty();}@@ -718,7 +786,7 @@ class SsoAdminAccountAssignmentTest {.name("SdkDeleteApplication")).applicationArn();- var response = sso.deleteApplication(request -> request.applicationArn(applicationArn));+ DeleteApplicationResponse response = sso.deleteApplication(request -> request.applicationArn(applicationArn));assertThat(response.sdkHttpResponse().isSuccessful()).isTrue();assertThatThrownBy(() -> sso.deleteApplication(request -> request.applicationArn(applicationArn))).isInstanceOf(software.amazon.awssdk.services.ssoadmin.model.ResourceNotFoundException.class);@@ -747,7 +815,7 @@ class SsoAdminAccountAssignmentTest {.principalId(principalId));}- var first = sso.listAccountAssignmentsForPrincipal(request -> request+ ListAccountAssignmentsForPrincipalResponse first = sso.listAccountAssignmentsForPrincipal(request -> request.instanceArn(instanceArn).principalId(principalId).principalType(PrincipalType.GROUP)@@ -755,7 +823,7 @@ class SsoAdminAccountAssignmentTest {assertThat(first.accountAssignments()).hasSize(1);assertThat(first.nextToken()).isNotBlank();- var second = sso.listAccountAssignmentsForPrincipal(request -> request+ ListAccountAssignmentsForPrincipalResponse second = sso.listAccountAssignmentsForPrincipal(request -> request.instanceArn(instanceArn).principalId(principalId).principalType(PrincipalType.GROUP)@@ -764,7 +832,7 @@ class SsoAdminAccountAssignmentTest {assertThat(second.accountAssignments()).hasSize(1);assertThat(second.nextToken()).isNull();- var filtered = sso.listAccountAssignmentsForPrincipal(request -> request+ ListAccountAssignmentsForPrincipalResponse filtered = sso.listAccountAssignmentsForPrincipal(request -> request.instanceArn(instanceArn).principalId(principalId).principalType(PrincipalType.GROUP)@@ -785,7 +853,7 @@ class SsoAdminAccountAssignmentTest {.name("ProvisionSdkAdmins")).permissionSet().permissionSetArn();- var response = sso.provisionPermissionSet(request -> request+ ProvisionPermissionSetResponse response = sso.provisionPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn).targetType("AWS_ACCOUNT")@@ -797,14 +865,14 @@ class SsoAdminAccountAssignmentTest {assertThat(response.permissionSetProvisioningStatus().permissionSetArn()).isEqualTo(permissionSetArn);assertThat(response.permissionSetProvisioningStatus().requestId()).isNotBlank();- var described = sso.describePermissionSetProvisioningStatus(request -> request+ DescribePermissionSetProvisioningStatusResponse described = sso.describePermissionSetProvisioningStatus(request -> request.instanceArn(instanceArn).provisionPermissionSetRequestId(response.permissionSetProvisioningStatus().requestId()));assertThat(described.permissionSetProvisioningStatus().requestId()).isEqualTo(response.permissionSetProvisioningStatus().requestId());assertThat(described.permissionSetProvisioningStatus().statusAsString()).isEqualTo("SUCCEEDED");- var listed = sso.listPermissionSetProvisioningStatus(request -> request+ ListPermissionSetProvisioningStatusResponse listed = sso.listPermissionSetProvisioningStatus(request -> request.instanceArn(instanceArn).filter(filter -> filter.status("SUCCEEDED")));assertThat(listed.permissionSetsProvisioningStatus())@@ -829,7 +897,7 @@ class SsoAdminAccountAssignmentTest {.targetType("AWS_ACCOUNT").targetId("210987654321"));- var response = sso.listPermissionSetsProvisionedToAccount(request -> request+ ListPermissionSetsProvisionedToAccountResponse response = sso.listPermissionSetsProvisionedToAccount(request -> request.instanceArn(instanceArn).accountId("210987654321").provisioningStatus("LATEST_PERMISSION_SET_PROVISIONED"));@@ -854,7 +922,7 @@ class SsoAdminAccountAssignmentTest {.targetType("AWS_ACCOUNT").targetId("321098765432"));- var response = sso.listAccountsForProvisionedPermissionSet(request -> request+ ListAccountsForProvisionedPermissionSetResponse response = sso.listAccountsForProvisionedPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn).provisioningStatus("LATEST_PERMISSION_SET_PROVISIONED"));@@ -890,18 +958,18 @@ class SsoAdminAccountAssignmentTest {String permissionSetArn = sso.createPermissionSet(request -> request.instanceArn(instanceArn).name("PutBoundarySdkAdmins")).permissionSet().permissionSetArn();- var response = sso.putPermissionsBoundaryToPermissionSet(request -> request+ PutPermissionsBoundaryToPermissionSetResponse response = sso.putPermissionsBoundaryToPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn).permissionsBoundary(boundary -> boundary.managedPolicyArn("arn:aws:iam::aws:policy/PowerUserAccess")));assertThat(response.sdkHttpResponse().isSuccessful()).isTrue();- var boundary = sso.getPermissionsBoundaryForPermissionSet(request -> request+ GetPermissionsBoundaryForPermissionSetResponse boundary = sso.getPermissionsBoundaryForPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn));assertThat(boundary.permissionsBoundary().managedPolicyArn()).isEqualTo("arn:aws:iam::aws:policy/PowerUserAccess");- var deleted = sso.deletePermissionsBoundaryFromPermissionSet(request -> request+ DeletePermissionsBoundaryFromPermissionSetResponse deleted = sso.deletePermissionsBoundaryFromPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn));assertThat(deleted.sdkHttpResponse().isSuccessful()).isTrue();@@ -923,7 +991,7 @@ class SsoAdminAccountAssignmentTest {.instanceArn(instanceArn).name("DeletePermissionSetSdkAdmins")).permissionSet().permissionSetArn();- var response = sso.deletePermissionSet(request -> request+ DeletePermissionSetResponse response = sso.deletePermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn));assertThat(response.sdkHttpResponse().isSuccessful()).isTrue();@@ -953,7 +1021,7 @@ class SsoAdminAccountAssignmentTest {.principalType(PrincipalType.GROUP).principalId("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"));- var deleted = sso.deleteAccountAssignment(request -> request+ DeleteAccountAssignmentResponse deleted = sso.deleteAccountAssignment(request -> request.instanceArn(instanceArn).targetId("123456789012").targetType(TargetType.AWS_ACCOUNT)@@ -964,14 +1032,14 @@ class SsoAdminAccountAssignmentTest {assertThat(deleted.accountAssignmentDeletionStatus()).isNotNull();assertThat(deleted.accountAssignmentDeletionStatus().statusAsString()).isEqualTo("SUCCEEDED");assertThat(deleted.accountAssignmentDeletionStatus().requestId()).isNotBlank();- var describedDeletion = sso.describeAccountAssignmentDeletionStatus(request -> request+ DescribeAccountAssignmentDeletionStatusResponse describedDeletion = sso.describeAccountAssignmentDeletionStatus(request -> request.instanceArn(instanceArn).accountAssignmentDeletionRequestId(deleted.accountAssignmentDeletionStatus().requestId()));assertThat(describedDeletion.accountAssignmentDeletionStatus().requestId()).isEqualTo(deleted.accountAssignmentDeletionStatus().requestId());assertThat(describedDeletion.accountAssignmentDeletionStatus().statusAsString()).isEqualTo("SUCCEEDED");- var deletionStatuses = sso.listAccountAssignmentDeletionStatus(request -> request+ ListAccountAssignmentDeletionStatusResponse deletionStatuses = sso.listAccountAssignmentDeletionStatus(request -> request.instanceArn(instanceArn).filter(filter -> filter.status("SUCCEEDED")));assertThat(deletionStatuses.accountAssignmentsDeletionStatus())@@ -997,7 +1065,7 @@ class SsoAdminAccountAssignmentTest {.permissionSet().permissionSetArn();- var created = sso.createAccountAssignment(request -> request+ CreateAccountAssignmentResponse created = sso.createAccountAssignment(request -> request.instanceArn(instanceArn).targetId("123456789012").targetType(TargetType.AWS_ACCOUNT)@@ -1008,19 +1076,19 @@ class SsoAdminAccountAssignmentTest {assertThat(created.accountAssignmentCreationStatus()).isNotNull();assertThat(created.accountAssignmentCreationStatus().requestId()).isNotBlank();- var status = sso.describeAccountAssignmentCreationStatus(request -> request+ DescribeAccountAssignmentCreationStatusResponse status = sso.describeAccountAssignmentCreationStatus(request -> request.instanceArn(instanceArn).accountAssignmentCreationRequestId(created.accountAssignmentCreationStatus().requestId()));assertThat(status.accountAssignmentCreationStatus().statusAsString()).isEqualTo("SUCCEEDED");assertThat(status.accountAssignmentCreationStatus().createdDate()).isNotNull();- var creationStatuses = sso.listAccountAssignmentCreationStatus(request -> request+ ListAccountAssignmentCreationStatusResponse creationStatuses = sso.listAccountAssignmentCreationStatus(request -> request.instanceArn(instanceArn).filter(filter -> filter.status("SUCCEEDED")));assertThat(creationStatuses.accountAssignmentsCreationStatus()).anyMatch(operation -> created.accountAssignmentCreationStatus().requestId().equals(operation.requestId()));- var assignments = sso.listAccountAssignments(request -> request+ ListAccountAssignmentsResponse assignments = sso.listAccountAssignments(request -> request.instanceArn(instanceArn).accountId("123456789012").permissionSetArn(permissionSetArn));@@ -1036,13 +1104,13 @@ class SsoAdminAccountAssignmentTest {.permissionSetArn(permissionSetArn).managedPolicyArn("arn:aws:iam::aws:policy/" + policy));}- var firstPolicies = sso.listManagedPoliciesInPermissionSet(request -> request+ ListManagedPoliciesInPermissionSetResponse firstPolicies = sso.listManagedPoliciesInPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn).maxResults(1));assertThat(firstPolicies.attachedManagedPolicies()).hasSize(1);assertThat(firstPolicies.nextToken()).isNotBlank();- var secondPolicies = sso.listManagedPoliciesInPermissionSet(request -> request+ ListManagedPoliciesInPermissionSetResponse secondPolicies = sso.listManagedPoliciesInPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn).maxResults(1)diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoOidcTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoOidcTest.javaindex cb333a35a0..7c67b1ef70 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoOidcTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoOidcTest.java@@ -5,6 +5,15 @@ import org.junit.jupiter.api.Test;import software.amazon.awssdk.core.document.Document;import software.amazon.awssdk.services.ssoadmin.SsoAdminClient;import software.amazon.awssdk.services.ssooidc.SsoOidcClient;+import software.amazon.awssdk.services.ssooidc.model.CreateTokenResponse;+import software.amazon.awssdk.services.ssooidc.model.CreateTokenWithIamResponse;+import software.amazon.awssdk.services.ssooidc.model.RegisterClientResponse;+import software.amazon.awssdk.services.ssooidc.model.StartDeviceAuthorizationResponse;++import java.net.URI;+import java.net.http.HttpClient;+import java.net.http.HttpRequest;+import java.net.http.HttpResponse;import static org.assertj.core.api.Assertions.assertThat;import static org.junit.jupiter.api.Assumptions.assumeFalse;@@ -18,7 +27,7 @@ class SsoOidcTest {assumeFalse(TestFixtures.isRealAws(), "Uses emulator-only client registration");try (SsoOidcClient oidc = TestFixtures.ssoOidcClient()) {- var response = oidc.registerClient(request -> request+ RegisterClientResponse response = oidc.registerClient(request -> request.clientName("Floci SDK CLI").clientType("public").grantTypes("authorization_code", "refresh_token")@@ -40,11 +49,11 @@ class SsoOidcTest {assumeFalse(TestFixtures.isRealAws(), "Uses emulator-only device authorization");try (SsoOidcClient oidc = TestFixtures.ssoOidcClient()) {- var client = oidc.registerClient(request -> request+ RegisterClientResponse client = oidc.registerClient(request -> request.clientName("Floci Device SDK").clientType("public").grantTypes("urn:ietf:params:oauth:grant-type:device_code", "refresh_token"));- var response = oidc.startDeviceAuthorization(request -> request+ StartDeviceAuthorizationResponse response = oidc.startDeviceAuthorization(request -> request.clientId(client.clientId()).clientSecret(client.clientSecret()).startUrl("https://example.awsapps.com/start"));@@ -57,11 +66,11 @@ class SsoOidcTest {assertThat(response.interval()).isEqualTo(5);try {- var advertisedUri = java.net.URI.create(response.verificationUriComplete());- var uri = TestFixtures.endpoint().resolve(+ URI advertisedUri = URI.create(response.verificationUriComplete());+ URI uri = TestFixtures.endpoint().resolve(advertisedUri.getRawPath() + "?" + advertisedUri.getRawQuery());- var request = java.net.http.HttpRequest.newBuilder(uri).GET().build();- var browserResponse = TestFixtures.emulatorHttpClient().send(+ HttpRequest request = HttpRequest.newBuilder(uri).GET().build();+ HttpResponse<String> browserResponse = TestFixtures.emulatorHttpClient().send(request, java.net.http.HttpResponse.BodyHandlers.ofString());assertThat(browserResponse.statusCode()).isEqualTo(200);} catch (java.io.IOException e) {@@ -71,7 +80,7 @@ class SsoOidcTest {throw new RuntimeException(e);}- var token = oidc.createToken(request -> request+ CreateTokenResponse token = oidc.createToken(request -> request.clientId(client.clientId()).clientSecret(client.clientSecret()).grantType("urn:ietf:params:oauth:grant-type:device_code")@@ -80,7 +89,7 @@ class SsoOidcTest {assertThat(token.accessToken()).isNotBlank();assertThat(token.refreshToken()).isNotBlank();- var refreshed = oidc.createToken(request -> request+ CreateTokenResponse refreshed = oidc.createToken(request -> request.clientId(client.clientId()).clientSecret(client.clientSecret()).grantType("refresh_token")@@ -137,13 +146,13 @@ class SsoOidcTest {+ "&code_challenge_method=S256";String code;try {- var browserResponse = java.net.http.HttpClient.newBuilder()+ HttpResponse<String> browserResponse = HttpClient.newBuilder().followRedirects(java.net.http.HttpClient.Redirect.NEVER).build().send(java.net.http.HttpRequest.newBuilder(java.net.URI.create(authorizeUrl)).GET().build(),java.net.http.HttpResponse.BodyHandlers.ofString());assertThat(browserResponse.statusCode()).isEqualTo(303);- var params = java.net.URI.create(browserResponse.headers().firstValue("location").orElseThrow())+ String[] params = URI.create(browserResponse.headers().firstValue("location").orElseThrow()).getRawQuery().split("&");code = java.util.Arrays.stream(params).filter(value -> value.startsWith("code="))@@ -156,7 +165,7 @@ class SsoOidcTest {throw new RuntimeException(e);}- var response = oidc.createTokenWithIAM(request -> request+ CreateTokenWithIamResponse response = oidc.createTokenWithIAM(request -> request.clientId(applicationArn).grantType("authorization_code").code(code)diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoPortalTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoPortalTest.javaindex 265dc7930e..e5870d4fb1 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoPortalTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoPortalTest.java@@ -6,10 +6,16 @@ import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;import software.amazon.awssdk.regions.Region;import software.amazon.awssdk.services.sso.SsoClient;+import software.amazon.awssdk.services.sso.model.ListAccountRolesResponse;+import software.amazon.awssdk.services.sso.model.ListAccountsResponse;+import software.amazon.awssdk.services.sso.model.RoleCredentials;import software.amazon.awssdk.services.ssoadmin.SsoAdminClient;+import software.amazon.awssdk.services.ssoadmin.model.InstanceMetadata;import software.amazon.awssdk.services.ssoadmin.model.PrincipalType;import software.amazon.awssdk.services.ssoadmin.model.TargetType;import software.amazon.awssdk.services.ssooidc.SsoOidcClient;+import software.amazon.awssdk.services.ssooidc.model.RegisterClientResponse;+import software.amazon.awssdk.services.ssooidc.model.StartDeviceAuthorizationResponse;import software.amazon.awssdk.services.sts.StsClient;import java.net.URI;@@ -34,7 +40,7 @@ class SsoPortalTest {try (SsoAdminClient admin = TestFixtures.ssoAdminClient();SsoOidcClient oidc = TestFixtures.ssoOidcClient();SsoClient portal = TestFixtures.ssoPortalClient()) {- var instance = admin.listInstances(request -> {}).instances().get(0);+ InstanceMetadata instance = admin.listInstances(request -> {}).instances().get(0);String suffix = UUID.randomUUID().toString().substring(0, 8);String userId = "11111111-2222-3333-4444-555555555555";String permissionSetArn = admin.createPermissionSet(request -> request@@ -50,12 +56,12 @@ class SsoPortalTest {.principalType(PrincipalType.USER).principalId(userId));- var client = oidc.registerClient(request -> request+ RegisterClientResponse client = oidc.registerClient(request -> request.clientName("Portal SDK " + suffix).clientType("public").grantTypes("urn:ietf:params:oauth:grant-type:device_code").scopes("sso:account:access"));- var authorization = oidc.startDeviceAuthorization(request -> request+ StartDeviceAuthorizationResponse authorization = oidc.startDeviceAuthorization(request -> request.clientId(client.clientId()).clientSecret(client.clientSecret()).startUrl("https://example.awsapps.com/start"));@@ -67,14 +73,14 @@ class SsoPortalTest {.deviceCode(authorization.deviceCode())).accessToken();- var response = portal.listAccounts(request -> request+ ListAccountsResponse response = portal.listAccounts(request -> request.accessToken(accessToken).maxResults(100));assertThat(response.accountList()).extracting(software.amazon.awssdk.services.sso.model.AccountInfo::accountId).contains(accountId);- var roles = portal.listAccountRoles(request -> request+ ListAccountRolesResponse roles = portal.listAccountRoles(request -> request.accessToken(accessToken).accountId(accountId).maxResults(100));@@ -82,7 +88,7 @@ class SsoPortalTest {.extracting(software.amazon.awssdk.services.sso.model.RoleInfo::roleName).contains("PortalSdk" + suffix);- var credentials = portal.getRoleCredentials(request -> request+ RoleCredentials credentials = portal.getRoleCredentials(request -> request.accessToken(accessToken).accountId(accountId).roleName("PortalSdk" + suffix))diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StepFunctionsExecutionHistoryTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StepFunctionsExecutionHistoryTest.javaindex b90565cbcc..c6b2435c39 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StepFunctionsExecutionHistoryTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StepFunctionsExecutionHistoryTest.java@@ -1,5 +1,6 @@package com.floci.test;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import org.junit.jupiter.api.*;import software.amazon.awssdk.services.sfn.SfnClient;@@ -49,10 +50,10 @@ class StepFunctionsExecutionHistoryTest {@Testvoid taskEventsAreEmittedInOrderWithChainedPreviousEventId() throws Exception {- var queueUrl = sqs.createQueue(b -> b.queueName(TestFixtures.uniqueName("sfn-history-queue")))+ String queueUrl = sqs.createQueue(b -> b.queueName(TestFixtures.uniqueName("sfn-history-queue"))).queueUrl();- var smDef = """+ String smDef = """{"StartAt": "Send","States": {@@ -69,25 +70,25 @@ class StepFunctionsExecutionHistoryTest {}""".formatted(queueUrl);- var smArn = sfn.createStateMachine(b -> b+ String smArn = sfn.createStateMachine(b -> b.name(TestFixtures.uniqueName("sfn-history-sm")).definition(smDef).roleArn(ROLE_ARN)).stateMachineArn();try {- var execArn = sfn.startExecution(b -> b+ String execArn = sfn.startExecution(b -> b.stateMachineArn(smArn).input("{}")).executionArn();- var execution = pollUntilDone(execArn);+ DescribeExecutionResponse execution = pollUntilDone(execArn);assertThat(execution.status()).isEqualTo(ExecutionStatus.SUCCEEDED);- var history = sfn.getExecutionHistory(b -> b+ GetExecutionHistoryResponse history = sfn.getExecutionHistory(b -> b.executionArn(execArn).includeExecutionData(true));- var events = history.events();+ List<HistoryEvent> events = history.events();- var types = events.stream().map(HistoryEvent::type).toList();+ List<HistoryEventType> types = events.stream().map(HistoryEvent::type).toList();assertThat(types).containsExactly(HistoryEventType.EXECUTION_STARTED,HistoryEventType.TASK_STATE_ENTERED,@@ -97,26 +98,26 @@ class StepFunctionsExecutionHistoryTest {HistoryEventType.TASK_STATE_EXITED,HistoryEventType.EXECUTION_SUCCEEDED);- var expectedPreviousEventIds = List.of(0L, 0L, 2L, 3L, 4L, 5L, 6L);- for (var i = 0; i < events.size(); i++) {- var event = events.get(i);+ List<Long> expectedPreviousEventIds = List.of(0L, 0L, 2L, 3L, 4L, 5L, 6L);+ for (int i = 0; i < events.size(); i++) {+ HistoryEvent event = events.get(i);assertThat(event.id()).isEqualTo(i + 1L);assertThat(event.previousEventId()).isEqualTo(expectedPreviousEventIds.get(i));}- var scheduled = events.get(2).taskScheduledEventDetails();+ TaskScheduledEventDetails scheduled = events.get(2).taskScheduledEventDetails();assertThat(scheduled.resourceType()).isEqualTo("sqs");assertThat(scheduled.resource()).isEqualTo("sendMessage");assertThat(scheduled.region()).isNotBlank();- var parameters = MAPPER.readTree(scheduled.parameters());+ JsonNode parameters = MAPPER.readTree(scheduled.parameters());assertThat(parameters.path("QueueUrl").asText()).isEqualTo(queueUrl);assertThat(parameters.path("MessageBody").asText()).isEqualTo("hello");- var started = events.get(3).taskStartedEventDetails();+ TaskStartedEventDetails started = events.get(3).taskStartedEventDetails();assertThat(started.resourceType()).isEqualTo("sqs");assertThat(started.resource()).isEqualTo("sendMessage");- var succeeded = events.get(4).taskSucceededEventDetails();+ TaskSucceededEventDetails succeeded = events.get(4).taskSucceededEventDetails();assertThat(succeeded.resourceType()).isEqualTo("sqs");assertThat(succeeded.resource()).isEqualTo("sendMessage");assertThat(succeeded.output()).contains("MessageId");@@ -134,7 +135,7 @@ class StepFunctionsExecutionHistoryTest {*/@Testvoid parallelBranchesAndMapIterationsPublishTheirEvents() throws Exception {- var smDef = """+ String smDef = """{"StartAt": "P","States": {@@ -160,24 +161,24 @@ class StepFunctionsExecutionHistoryTest {}""";- var smArn = sfn.createStateMachine(b -> b+ String smArn = sfn.createStateMachine(b -> b.name(TestFixtures.uniqueName("sfn-history-branches-sm")).definition(smDef).roleArn(ROLE_ARN)).stateMachineArn();try {- var execArn = sfn.startExecution(b -> b+ String execArn = sfn.startExecution(b -> b.stateMachineArn(smArn).input("{\"items\": [1, 2]}")).executionArn();- var execution = pollUntilDone(execArn);+ DescribeExecutionResponse execution = pollUntilDone(execArn);assertThat(execution.status()).isEqualTo(ExecutionStatus.SUCCEEDED);- var events = sfn.getExecutionHistory(b -> b+ List<HistoryEvent> events = sfn.getExecutionHistory(b -> b.executionArn(execArn).includeExecutionData(true)).events();- var types = events.stream().map(HistoryEvent::type).toList();+ List<HistoryEventType> types = events.stream().map(HistoryEvent::type).toList();assertThat(types).containsExactly(HistoryEventType.EXECUTION_STARTED,HistoryEventType.PARALLEL_STATE_ENTERED,@@ -200,10 +201,10 @@ class StepFunctionsExecutionHistoryTest {HistoryEventType.MAP_STATE_EXITED,HistoryEventType.EXECUTION_SUCCEEDED);- var expectedPreviousEventIds = List.of(0L, 0L, 2L, 3L, 4L, 5L, 5L, 7L, 8L, 9L, 10L, 11L, 12L,+ List<Long> expectedPreviousEventIds = List.of(0L, 0L, 2L, 3L, 4L, 5L, 5L, 7L, 8L, 9L, 10L, 11L, 12L,9L, 14L, 15L, 16L, 17L, 17L, 19L);- for (var i = 0; i < events.size(); i++) {- var event = events.get(i);+ for (int i = 0; i < events.size(); i++) {+ HistoryEvent event = events.get(i);assertThat(event.id()).isEqualTo(i + 1L);assertThat(event.previousEventId()).as("previousEventId of event %d", i + 1).isEqualTo(expectedPreviousEventIds.get(i));@@ -223,7 +224,7 @@ class StepFunctionsExecutionHistoryTest {/** Issue #2868: the cause of a failure inside a branch names the branch state, as on AWS. */@Testvoid failureInsideABranchNamesTheBranchStateInItsCause() throws Exception {- var smDef = """+ String smDef = """{"StartAt": "P","States": {@@ -238,24 +239,24 @@ class StepFunctionsExecutionHistoryTest {}""";- var smArn = sfn.createStateMachine(b -> b+ String smArn = sfn.createStateMachine(b -> b.name(TestFixtures.uniqueName("sfn-history-branch-failure-sm")).definition(smDef).roleArn(ROLE_ARN)).stateMachineArn();try {- var execArn = sfn.startExecution(b -> b+ String execArn = sfn.startExecution(b -> b.stateMachineArn(smArn).input("{\"x\":\"a\"}")).executionArn();- var execution = pollUntilDone(execArn);+ DescribeExecutionResponse execution = pollUntilDone(execArn);assertThat(execution.status()).isEqualTo(ExecutionStatus.FAILED);assertThat(execution.error()).isEqualTo("States.Runtime");assertThat(execution.cause()).isEqualTo("An error occurred while executing the state 'Fast' (entered at the event id #4). "+ "The JSONPath '$.nope' specified for the field 'm.$' could not be found in the input '{\"x\":\"a\"}'");- var events = sfn.getExecutionHistory(b -> b.executionArn(execArn)).events();+ List<HistoryEvent> events = sfn.getExecutionHistory(b -> b.executionArn(execArn)).events();assertThat(events.stream().map(HistoryEvent::type).toList()).containsExactly(HistoryEventType.EXECUTION_STARTED,HistoryEventType.PARALLEL_STATE_ENTERED,@@ -270,8 +271,8 @@ class StepFunctionsExecutionHistoryTest {}private DescribeExecutionResponse pollUntilDone(String execArn) throws InterruptedException {- for (var i = 0; i < 120; i++) {- var resp = sfn.describeExecution(b -> b.executionArn(execArn));+ for (int i = 0; i < 120; i++) {+ DescribeExecutionResponse resp = sfn.describeExecution(b -> b.executionArn(execArn));if (resp.status() != ExecutionStatus.RUNNING) {return resp;}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SwfRegionPaginationTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SwfRegionPaginationTest.javaindex d5b4d9d5c6..d610f14a08 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SwfRegionPaginationTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SwfRegionPaginationTest.java@@ -6,8 +6,10 @@ import org.junit.jupiter.api.Test;import software.amazon.awssdk.regions.Region;import software.amazon.awssdk.services.swf.SwfClient;import software.amazon.awssdk.services.swf.model.ActivityType;+import software.amazon.awssdk.services.swf.model.ActivityTypeInfo;import software.amazon.awssdk.services.swf.model.ChildPolicy;import software.amazon.awssdk.services.swf.model.DescribeDomainRequest;+import software.amazon.awssdk.services.swf.model.DescribeDomainResponse;import software.amazon.awssdk.services.swf.model.DescribeWorkflowExecutionRequest;import software.amazon.awssdk.services.swf.model.DescribeWorkflowTypeRequest;import software.amazon.awssdk.services.swf.model.DomainAlreadyExistsException;@@ -93,8 +95,8 @@ class SwfRegionPaginationTest {west.registerDomain(RegisterDomainRequest.builder().name(DOMAIN).description("west").workflowExecutionRetentionPeriodInDays("2").build());- var eastDomain = east.describeDomain(DescribeDomainRequest.builder().name(DOMAIN).build());- var westDomain = west.describeDomain(DescribeDomainRequest.builder().name(DOMAIN).build());+ DescribeDomainResponse eastDomain = east.describeDomain(DescribeDomainRequest.builder().name(DOMAIN).build());+ DescribeDomainResponse westDomain = west.describeDomain(DescribeDomainRequest.builder().name(DOMAIN).build());assertEquals("east", eastDomain.domainInfo().description());assertEquals("west", westDomain.domainInfo().description());@@ -229,7 +231,7 @@ class SwfRegionPaginationTest {.maximumPageSize(3).nextPageToken(firstActivities.nextPageToken()).build());List<String> firstNames = firstActivities.typeInfos().stream().map(i -> i.activityType().name()).toList();- for (var info : secondActivities.typeInfos()) {+ for (ActivityTypeInfo info : secondActivities.typeInfos()) {assertFalse(firstNames.contains(info.activityType().name()),"page 2 repeated " + info.activityType().name());}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/VerifiedPermissionsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/VerifiedPermissionsTest.javaindex f830bbe59d..1000db75f2 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/VerifiedPermissionsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/VerifiedPermissionsTest.java@@ -7,6 +7,8 @@ import software.amazon.awssdk.services.verifiedpermissions.model.ActionIdentifieimport software.amazon.awssdk.services.verifiedpermissions.model.Decision;import software.amazon.awssdk.services.verifiedpermissions.model.EntitiesDefinition;import software.amazon.awssdk.services.verifiedpermissions.model.EntityIdentifier;+import software.amazon.awssdk.services.verifiedpermissions.model.GetPolicyStoreResponse;+import software.amazon.awssdk.services.verifiedpermissions.model.IsAuthorizedResponse;import software.amazon.awssdk.services.verifiedpermissions.model.PolicyDefinition;import software.amazon.awssdk.services.verifiedpermissions.model.PolicyEffect;import software.amazon.awssdk.services.verifiedpermissions.model.PolicyType;@@ -36,7 +38,7 @@ class VerifiedPermissionsTest {.tags(Map.of("project", "floci"))).policyStoreId();- var store = avp.getPolicyStore(request -> request.policyStoreId(policyStoreId).tags(true));+ GetPolicyStoreResponse store = avp.getPolicyStore(request -> request.policyStoreId(policyStoreId).tags(true));assertThat(store.policyStoreId()).isEqualTo(policyStoreId);assertThat(store.tags()).containsEntry("project", "floci");@@ -73,7 +75,7 @@ class VerifiedPermissionsTest {{"uid":{"type":"Demo::Document","id":"doc1"},"attrs":{"tenant":"t1"},"parents":[]}]""";- var decision = avp.isAuthorized(request -> request+ IsAuthorizedResponse decision = avp.isAuthorized(request -> request.policyStoreId(policyStoreId).principal(EntityIdentifier.builder().entityType("Demo::User").entityId("alice").build()).action(ActionIdentifier.builder().actionType("Demo::Action").actionId("read").build())diff --git a/src/main/java/io/github/hectorvent/floci/config/ContainerCaBundle.java b/src/main/java/io/github/hectorvent/floci/config/ContainerCaBundle.javaindex cdbec36f56..952dd3783e 100644--- a/src/main/java/io/github/hectorvent/floci/config/ContainerCaBundle.java+++ b/src/main/java/io/github/hectorvent/floci/config/ContainerCaBundle.java@@ -5,6 +5,7 @@ import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;import org.bouncycastle.openssl.PEMParser;import org.jboss.logging.Logger;+import javax.net.ssl.TrustManager;import javax.net.ssl.TrustManagerFactory;import javax.net.ssl.X509TrustManager;import java.io.IOException;@@ -157,7 +158,7 @@ public final class ContainerCaBundle {TrustManagerFactory factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());factory.init((KeyStore) null);List<X509Certificate> roots = new ArrayList<>();- for (var manager : factory.getTrustManagers()) {+ for (TrustManager manager : factory.getTrustManagers()) {if (manager instanceof X509TrustManager x509) {roots.addAll(List.of(x509.getAcceptedIssuers()));}diff --git a/src/main/java/io/github/hectorvent/floci/config/TlsProxyServer.java b/src/main/java/io/github/hectorvent/floci/config/TlsProxyServer.javaindex 87ea73d8d4..78e9243785 100644--- a/src/main/java/io/github/hectorvent/floci/config/TlsProxyServer.java+++ b/src/main/java/io/github/hectorvent/floci/config/TlsProxyServer.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.config;import io.quarkus.runtime.Startup;+import io.vertx.core.Future;import io.vertx.core.Handler;import io.vertx.core.Vertx;import io.vertx.core.net.NetClient;@@ -119,7 +120,7 @@ public class TlsProxyServer {NetServer server = vertx.createNetServer(options);server.connectHandler(connectHandler);proxyServers.add(server);- var bind = server.listen();+ Future<NetServer> bind = server.listen();bind.onComplete(ar -> {if (ar.succeeded()) {failedPorts.remove(port);diff --git a/src/main/java/io/github/hectorvent/floci/core/common/AiMockConfigLoader.java b/src/main/java/io/github/hectorvent/floci/core/common/AiMockConfigLoader.javaindex a125178f34..bcd6b3b90a 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/AiMockConfigLoader.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/AiMockConfigLoader.java@@ -90,7 +90,7 @@ public class AiMockConfigLoader {}}private JsonNode loadOrThrow(String path) {- var file = Path.of(path);+ Path file = Path.of(path);long lastModified;try {lastModified = Files.getLastModifiedTime(file).toMillis();@@ -101,7 +101,7 @@ public class AiMockConfigLoader {}return null;}- var cached = cache;+ CachedMockFile cached = cache;if (cached != null && cached.path().equals(path) && cached.lastModified() == lastModified) {return cached.root();}diff --git a/src/main/java/io/github/hectorvent/floci/core/common/AwsRequestIdFilter.java b/src/main/java/io/github/hectorvent/floci/core/common/AwsRequestIdFilter.javaindex bce8ad6ca4..e9af68183d 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/AwsRequestIdFilter.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/AwsRequestIdFilter.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.core.common;import jakarta.ws.rs.container.ContainerRequestContext;import jakarta.ws.rs.container.ContainerResponseContext;import jakarta.ws.rs.container.ContainerResponseFilter;+import jakarta.ws.rs.core.MultivaluedMap;import jakarta.ws.rs.ext.Provider;import java.util.UUID;@@ -31,7 +32,7 @@ public class AwsRequestIdFilter implements ContainerResponseFilter {@Overridepublic void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) {- var headers = responseContext.getHeaders();+ MultivaluedMap<String, Object> headers = responseContext.getHeaders();// Reuse the same ID across all header variants for this responseString requestId = UUID.randomUUID().toString();diff --git a/src/main/java/io/github/hectorvent/floci/core/common/ServiceEnabledFilter.java b/src/main/java/io/github/hectorvent/floci/core/common/ServiceEnabledFilter.javaindex b5ad940c1a..4a0ec9c3c3 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/ServiceEnabledFilter.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/ServiceEnabledFilter.java@@ -11,6 +11,8 @@ import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.Response;import jakarta.ws.rs.ext.Provider;+import java.util.Optional;+@Providerpublic class ServiceEnabledFilter implements ContainerRequestFilter {@@ -52,7 +54,7 @@ public class ServiceEnabledFilter implements ContainerRequestFilter {return null;}- var resourceMatch = catalog.byResourceClass(resourceClass());+ Optional<ServiceDescriptor> resourceMatch = catalog.byResourceClass(resourceClass());if (resourceMatch.isPresent()) {ServiceDescriptor descriptor = resourceMatch.get();return new ResolvedRequest(descriptor.externalKey(), descriptor.defaultProtocol());diff --git a/src/main/java/io/github/hectorvent/floci/core/common/docker/LaunchedContainerAwsEnv.java b/src/main/java/io/github/hectorvent/floci/core/common/docker/LaunchedContainerAwsEnv.javaindex cdc2a6bdea..bee9c494f7 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/docker/LaunchedContainerAwsEnv.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/docker/LaunchedContainerAwsEnv.java@@ -120,17 +120,17 @@ public class LaunchedContainerAwsEnv {public List<String> sdkBaselineEnv(String region, Optional<String> awsConfigMountDir,String flociEndpoint, Optional<SessionCreds> injectedCredentials,String ownerAccountId) {- var env = new ArrayList<String>();+ ArrayList<String> env = new ArrayList<>();env.add("AWS_DEFAULT_REGION=" + region);env.add("AWS_REGION=" + region);if (awsConfigMountDir.isPresent() && !awsConfigMountDir.get().isBlank()) {// ~/.aws is mounted, so don't inject credentials. Let the SDK discover them.// Set explicit file paths so discovery works regardless of container HOME.- var dir = awsConfigMountDir.get();+ String dir = awsConfigMountDir.get();env.add("AWS_SHARED_CREDENTIALS_FILE=" + dir + "/credentials");env.add("AWS_CONFIG_FILE=" + dir + "/config");} else if (injectedCredentials.isPresent()) {- var credentials = injectedCredentials.get();+ SessionCreds credentials = injectedCredentials.get();env.add("AWS_ACCESS_KEY_ID=" + credentials.accessKeyId());env.add("AWS_SECRET_ACCESS_KEY=" + credentials.secretAccessKey());env.add("AWS_SESSION_TOKEN=" + credentials.sessionToken());@@ -138,9 +138,9 @@ public class LaunchedContainerAwsEnv {// The launched container is a distinct principal from the Floci server process, so// its identity comes from the workload's owning account when we know it; Floci's own// env vars are the fallback for launch paths that don't (ownerAccountId == null).- var ak = hostEnv.apply("AWS_ACCESS_KEY_ID");- var sk = hostEnv.apply("AWS_SECRET_ACCESS_KEY");- var st = hostEnv.apply("AWS_SESSION_TOKEN");+ String ak = hostEnv.apply("AWS_ACCESS_KEY_ID");+ String sk = hostEnv.apply("AWS_SECRET_ACCESS_KEY");+ String st = hostEnv.apply("AWS_SESSION_TOKEN");boolean hasOwnerAccountId = ownerAccountId != null && ACCOUNT_ID_PATTERN.matcher(ownerAccountId).matches();if (!hasOwnerAccountId && (ak != null || sk != null || st != null)&& hostCredentialsWarned.compareAndSet(false, true)) {diff --git a/src/main/java/io/github/hectorvent/floci/core/storage/StorageFactory.java b/src/main/java/io/github/hectorvent/floci/core/storage/StorageFactory.javaindex 5bbf043764..7a00c04389 100644--- a/src/main/java/io/github/hectorvent/floci/core/storage/StorageFactory.java+++ b/src/main/java/io/github/hectorvent/floci/core/storage/StorageFactory.java@@ -117,7 +117,7 @@ public class StorageFactory {yield wal;}case "hybrid" -> {- var hybrid = new HybridStorage<>(filePath, typeReference, flushInterval);+ HybridStorage<String, V> hybrid = new HybridStorage<>(filePath, typeReference, flushInterval);hybridBackends.add(hybrid);yield hybrid;}@@ -125,7 +125,7 @@ public class StorageFactory {Path snapshotPath = basePath.resolve(fileName.replace(".json", "-snapshot.json"));Path walFilePath = basePath.resolve(fileName.replace(".json", ".wal"));long compactionInterval = config.storage().wal().compactionIntervalMs();- var wal = new WalStorage<>(snapshotPath, walFilePath, typeReference, compactionInterval);+ WalStorage<String, V> wal = new WalStorage<>(snapshotPath, walFilePath, typeReference, compactionInterval);walBackends.add(wal);yield wal;}diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayExecuteController.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayExecuteController.javaindex bc798b67fe..035c5b99b9 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayExecuteController.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayExecuteController.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.apigateway;+import com.networknt.schema.ValidationMessage;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsEndpoints;import io.github.hectorvent.floci.core.common.AwsErrorResponse;@@ -58,6 +59,7 @@ import java.util.Base64;import java.util.Collections;import java.util.HashMap;import java.util.HashSet;+import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Locale;@@ -1099,7 +1101,7 @@ public class ApiGatewayExecuteController {com.networknt.schema.JsonSchemaFactory.getInstance(com.networknt.schema.SpecVersion.VersionFlag.V4);com.networknt.schema.JsonSchema schema = factory.getSchema(schemaNode);- var errors = schema.validate(bodyNode);+ Set<ValidationMessage> errors = schema.validate(bodyNode);if (!errors.isEmpty()) {String errorMsg = errors.iterator().next().getMessage();return gatewayResponse(scope, GatewayResponseType.BAD_REQUEST_BODY, 400,@@ -1527,9 +1529,9 @@ public class ApiGatewayExecuteController {if (headersNode == null || !headersNode.isObject()) {return Optional.empty();}- var it = headersNode.fields();+ Iterator<Map.Entry<String, JsonNode>> it = headersNode.fields();while (it.hasNext()) {- var e = it.next();+ Map.Entry<String, JsonNode> e = it.next();if (e.getKey().equalsIgnoreCase(name)) {JsonNode value = e.getValue().isArray() ? e.getValue().get(0) : e.getValue();return value == null || value.isNull() ? Optional.empty() : Optional.of(value.asText());diff --git a/src/main/java/io/github/hectorvent/floci/services/appsync/AppSyncController.java b/src/main/java/io/github/hectorvent/floci/services/appsync/AppSyncController.javaindex 420238e560..4927622ea7 100644--- a/src/main/java/io/github/hectorvent/floci/services/appsync/AppSyncController.java+++ b/src/main/java/io/github/hectorvent/floci/services/appsync/AppSyncController.java@@ -84,7 +84,7 @@ public class AppSyncController {@Path("/v1/apis")public Response listGraphqlApis(@QueryParam("maxResults") Integer maxResults,@QueryParam("nextToken") String nextToken) {- var page = service.listGraphqlApis(maxResults, nextToken);+ AppSyncService.Page<GraphqlApi> page = service.listGraphqlApis(maxResults, nextToken);ObjectNode root = objectMapper.createObjectNode();ArrayNode items = root.putArray("graphqlApis");page.items().forEach(items::addPOJO);@@ -182,7 +182,7 @@ public class AppSyncController {public Response listDataSources(@PathParam("apiId") String apiId,@QueryParam("maxResults") Integer maxResults,@QueryParam("nextToken") String nextToken) {- var page = service.listDataSources(apiId, maxResults, nextToken);+ AppSyncService.Page<DataSource> page = service.listDataSources(apiId, maxResults, nextToken);ObjectNode root = objectMapper.createObjectNode();ArrayNode items = root.putArray("dataSources");page.items().forEach(items::addPOJO);@@ -218,7 +218,7 @@ public class AppSyncController {@PathParam("typeName") String typeName,@QueryParam("maxResults") Integer maxResults,@QueryParam("nextToken") String nextToken) {- var page = service.listResolversByType(apiId, typeName, maxResults, nextToken);+ AppSyncService.Page<Resolver> page = service.listResolversByType(apiId, typeName, maxResults, nextToken);ObjectNode root = objectMapper.createObjectNode();ArrayNode items = root.putArray("resolvers");page.items().forEach(items::addPOJO);@@ -270,7 +270,7 @@ public class AppSyncController {@PathParam("functionId") String functionId,@QueryParam("maxResults") Integer maxResults,@QueryParam("nextToken") String nextToken) {- var page = service.listResolversByFunction(apiId, functionId, maxResults, nextToken);+ AppSyncService.Page<Resolver> page = service.listResolversByFunction(apiId, functionId, maxResults, nextToken);ObjectNode root = objectMapper.createObjectNode();ArrayNode items = root.putArray("resolvers");page.items().forEach(items::addPOJO);@@ -332,7 +332,7 @@ public class AppSyncController {public Response listFunctions(@PathParam("apiId") String apiId,@QueryParam("maxResults") Integer maxResults,@QueryParam("nextToken") String nextToken) {- var page = service.listFunctions(apiId, maxResults, nextToken);+ AppSyncService.Page<FunctionConfiguration> page = service.listFunctions(apiId, maxResults, nextToken);ObjectNode root = objectMapper.createObjectNode();ArrayNode items = root.putArray("functions");page.items().forEach(items::addPOJO);@@ -392,7 +392,7 @@ public class AppSyncController {public Response listTypes(@PathParam("apiId") String apiId,@QueryParam("maxResults") Integer maxResults,@QueryParam("nextToken") String nextToken) {- var page = service.listTypes(apiId, maxResults, nextToken);+ AppSyncService.Page<AppSyncType> page = service.listTypes(apiId, maxResults, nextToken);ObjectNode root = objectMapper.createObjectNode();ArrayNode items = root.putArray("types");page.items().forEach(items::addPOJO);@@ -422,7 +422,7 @@ public class AppSyncController {public Response listApiKeys(@PathParam("apiId") String apiId,@QueryParam("maxResults") Integer maxResults,@QueryParam("nextToken") String nextToken) {- var page = service.listApiKeys(apiId, maxResults, nextToken);+ AppSyncService.Page<ApiKey> page = service.listApiKeys(apiId, maxResults, nextToken);ObjectNode root = objectMapper.createObjectNode();ArrayNode items = root.putArray("apiKeys");page.items().forEach(items::addPOJO);@@ -513,7 +513,7 @@ public class AppSyncController {@Path("/v1/domainnames")public Response listDomainNames(@QueryParam("maxResults") Integer maxResults,@QueryParam("nextToken") String nextToken) {- var page = service.listDomainNames(maxResults, nextToken);+ AppSyncService.Page<DomainName> page = service.listDomainNames(maxResults, nextToken);ObjectNode root = objectMapper.createObjectNode();ArrayNode items = root.putArray("domainNameConfigs");page.items().forEach(items::addPOJO);@@ -550,7 +550,7 @@ public class AppSyncController {@SuppressWarnings("unchecked")Map<String, Object> request = objectMapper.readValue(body, Map.class);String apiId = (String) request.get("apiId");- var assoc = service.associateApi(domainName, apiId);+ ApiAssociation assoc = service.associateApi(domainName, apiId);ObjectNode root = objectMapper.createObjectNode();root.set("apiAssociation", objectMapper.valueToTree(assoc));return Response.status(200).entity(root).build();@@ -559,7 +559,7 @@ public class AppSyncController {@GET@Path("/v1/domainnames/{domainName}/apiassociation")public Response getApiAssociation(@PathParam("domainName") String domainName) {- var assoc = service.getApiAssociation(domainName);+ ApiAssociation assoc = service.getApiAssociation(domainName);ObjectNode root = objectMapper.createObjectNode();root.set("apiAssociation", objectMapper.valueToTree(assoc));return Response.ok(root).build();@@ -619,7 +619,7 @@ public class AppSyncController {public Response listChannelNamespaces(@PathParam("apiId") String apiId,@QueryParam("maxResults") Integer maxResults,@QueryParam("nextToken") String nextToken) {- var page = service.listChannelNamespaces(apiId, maxResults, nextToken);+ AppSyncService.Page<ChannelNamespace> page = service.listChannelNamespaces(apiId, maxResults, nextToken);ObjectNode root = objectMapper.createObjectNode();ArrayNode items = root.putArray("channelNamespaces");page.items().forEach(items::addPOJO);@@ -641,7 +641,7 @@ public class AppSyncController {String region = regionResolver.resolveRegion(headers);@SuppressWarnings("unchecked")Map<String, Object> request = objectMapper.readValue(body, Map.class);- var assoc = service.createMergedApiAssociation(sourceApiIdentifier, request, region);+ SourceApiAssociation assoc = service.createMergedApiAssociation(sourceApiIdentifier, request, region);ObjectNode root = objectMapper.createObjectNode();root.set("sourceApiAssociation", objectMapper.valueToTree(assoc));return Response.status(200).entity(root).build();@@ -655,7 +655,7 @@ public class AppSyncController {String region = regionResolver.resolveRegion(headers);@SuppressWarnings("unchecked")Map<String, Object> request = objectMapper.readValue(body, Map.class);- var assoc = service.createSourceApiAssociation(mergedApiIdentifier, request, region);+ SourceApiAssociation assoc = service.createSourceApiAssociation(mergedApiIdentifier, request, region);ObjectNode root = objectMapper.createObjectNode();root.set("sourceApiAssociation", objectMapper.valueToTree(assoc));return Response.status(200).entity(root).build();@@ -665,7 +665,7 @@ public class AppSyncController {@Path("/v1/mergedApis/{mergedApiIdentifier}/sourceApiAssociations/{associationId}")public Response getSourceApiAssociation(@PathParam("mergedApiIdentifier") String mergedApiIdentifier,@PathParam("associationId") String associationId) {- var assoc = service.getSourceApiAssociation(mergedApiIdentifier, associationId);+ SourceApiAssociation assoc = service.getSourceApiAssociation(mergedApiIdentifier, associationId);ObjectNode root = objectMapper.createObjectNode();root.set("sourceApiAssociation", objectMapper.valueToTree(assoc));return Response.ok(root).build();@@ -678,7 +678,7 @@ public class AppSyncController {String body) throws IOException {@SuppressWarnings("unchecked")Map<String, Object> request = objectMapper.readValue(body, Map.class);- var assoc = service.updateSourceApiAssociation(mergedApiIdentifier, associationId, request);+ SourceApiAssociation assoc = service.updateSourceApiAssociation(mergedApiIdentifier, associationId, request);ObjectNode root = objectMapper.createObjectNode();root.set("sourceApiAssociation", objectMapper.valueToTree(assoc));return Response.ok(root).build();@@ -689,7 +689,7 @@ public class AppSyncController {public Response listSourceApiAssociations(@PathParam("apiId") String apiId,@QueryParam("maxResults") Integer maxResults,@QueryParam("nextToken") String nextToken) {- var page = service.listSourceApiAssociations(apiId, maxResults, nextToken);+ AppSyncService.Page<SourceApiAssociationSummary> page = service.listSourceApiAssociations(apiId, maxResults, nextToken);ObjectNode root = objectMapper.createObjectNode();ArrayNode items = root.putArray("sourceApiAssociationSummaries");page.items().forEach(items::addPOJO);@@ -715,7 +715,7 @@ public class AppSyncController {@Path("/v1/sourceApis/{sourceApiIdentifier}/mergedApiAssociations/{associationId}")public Response disassociateMergedGraphqlApi(@PathParam("sourceApiIdentifier") String sourceApiIdentifier,@PathParam("associationId") String associationId) {- var assoc = service.deleteMergedApiAssociation(sourceApiIdentifier, associationId);+ SourceApiAssociation assoc = service.deleteMergedApiAssociation(sourceApiIdentifier, associationId);ObjectNode root = objectMapper.createObjectNode();root.put("sourceApiAssociationStatus", assoc.getSourceApiAssociationStatus());return Response.ok(root).build();diff --git a/src/main/java/io/github/hectorvent/floci/services/appsync/AppSyncService.java b/src/main/java/io/github/hectorvent/floci/services/appsync/AppSyncService.javaindex 74834c4908..042e39c068 100644--- a/src/main/java/io/github/hectorvent/floci/services/appsync/AppSyncService.java+++ b/src/main/java/io/github/hectorvent/floci/services/appsync/AppSyncService.java@@ -1265,7 +1265,7 @@ public class AppSyncService {private Map<String, String> castStringMap(Object value) {if (value instanceof Map) {Map<String, String> result = new HashMap<>();- for (var entry : ((Map<Object, Object>) value).entrySet()) {+ for (Map.Entry<Object, Object> entry : ((Map<Object, Object>) value).entrySet()) {result.put(String.valueOf(entry.getKey()), String.valueOf(entry.getValue()));}return result;diff --git a/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/auth/LambdaAuthorizerValidator.java b/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/auth/LambdaAuthorizerValidator.javaindex f0d0229bda..389b526960 100644--- a/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/auth/LambdaAuthorizerValidator.java+++ b/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/auth/LambdaAuthorizerValidator.java@@ -13,6 +13,7 @@ import java.util.ArrayList;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import java.util.Optional;import java.util.concurrent.CompletableFuture;import java.util.concurrent.TimeUnit;import java.util.regex.Pattern;@@ -51,7 +52,7 @@ public class LambdaAuthorizerValidator {throw AppSyncAuth.unauthorized();}- var cached = cache.get(apiId, authorizationToken);+ Optional<LambdaAuthorizerResult> cached = cache.get(apiId, authorizationToken);if (cached.isPresent()) {return requireAuthorized(cached.get());}diff --git a/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/util/TimeUtil.java b/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/util/TimeUtil.javaindex ca998a16a2..6d63a00c7e 100644--- a/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/util/TimeUtil.java+++ b/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/util/TimeUtil.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.appsync.graphql.util;import java.time.Instant;+import java.time.LocalDateTime;import java.time.ZoneOffset;import java.time.ZonedDateTime;import java.time.format.DateTimeFormatter;@@ -41,14 +42,14 @@ public class TimeUtil {public long parseFormattedToEpochMilliSeconds(String timestamp, String format) {DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);- var parsed = java.time.LocalDateTime.parse(timestamp, formatter);+ LocalDateTime parsed = LocalDateTime.parse(timestamp, formatter);return parsed.toInstant(ZoneOffset.UTC).toEpochMilli();}public long parseFormattedToEpochMilliSeconds(String timestamp, String format, String timezone) {DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);ZoneOffset zoneOffset = ZoneOffset.of(timezone);- var parsed = java.time.LocalDateTime.parse(timestamp, formatter);+ LocalDateTime parsed = LocalDateTime.parse(timestamp, formatter);return parsed.toInstant(zoneOffset).toEpochMilli();}diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayRuleController.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayRuleController.javaindex 5523a0f3f9..62166c9350 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayRuleController.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayRuleController.java@@ -2,8 +2,10 @@ package io.github.hectorvent.floci.services.bedrockagentcorecontrol;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.AwsException;+import io.github.hectorvent.floci.core.common.PaginatedResult;import io.github.hectorvent.floci.core.common.Pagination;import io.github.hectorvent.floci.core.common.RegionResolver;import jakarta.inject.Inject;@@ -83,9 +85,9 @@ public class BedrockAgentCoreGatewayRuleController {String region = regionResolver.resolveRegion(headers);try {Integer maxResults = Pagination.parseMaxResults(maxResultsParam, "ValidationException");- var result = service.list(gatewayId, maxResults, nextToken, region);+ PaginatedResult<ObjectNode> result = service.list(gatewayId, maxResults, nextToken, region);ObjectNode response = objectMapper.createObjectNode();- var rules = response.putArray("gatewayRules");+ ArrayNode rules = response.putArray("gatewayRules");for (ObjectNode rule : result.items()) {ObjectNode copy = rule.deepCopy();copy.remove("clientToken");diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayRuleService.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayRuleService.javaindex 33adada4fe..1d74116a3a 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayRuleService.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayRuleService.java@@ -9,6 +9,7 @@ import io.github.hectorvent.floci.core.common.Pagination;import io.github.hectorvent.floci.core.common.PaginatedResult;import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;+import io.github.hectorvent.floci.services.bedrockagentcorecontrol.model.Gateway;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;@@ -37,7 +38,7 @@ public class BedrockAgentCoreGatewayRuleService {}public ObjectNode create(String gatewayId, ObjectNode request, String region) {- var gateway = gatewayService.get(gatewayId, region);+ Gateway gateway = gatewayService.get(gatewayId, region);String clientToken = request.hasNonNull("clientToken") ? request.get("clientToken").asText() : null;if (clientToken != null) {if (clientToken.length() < 33 || clientToken.length() > 256diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreToolsController.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreToolsController.javaindex 38ed88b518..2e903c80f7 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreToolsController.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreToolsController.java@@ -2,8 +2,10 @@ package io.github.hectorvent.floci.services.bedrockagentcorecontrol;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.AwsException;+import io.github.hectorvent.floci.core.common.PaginatedResult;import io.github.hectorvent.floci.core.common.Pagination;import io.github.hectorvent.floci.core.common.RegionResolver;import jakarta.inject.Inject;@@ -102,9 +104,9 @@ public class BedrockAgentCoreToolsController {String region = regionResolver.resolveRegion(headers);try {Integer maxResults = Pagination.parseMaxResults(maxResultsParam, "ValidationException");- var result = service.listCodeInterpreters(maxResults, nextToken, type, region);+ PaginatedResult<ObjectNode> result = service.listCodeInterpreters(maxResults, nextToken, type, region);ObjectNode response = objectMapper.createObjectNode();- var summaries = response.putArray("codeInterpreterSummaries");+ ArrayNode summaries = response.putArray("codeInterpreterSummaries");for (ObjectNode interpreter : result.items()) {ObjectNode summary = summaries.addObject();copyText(interpreter, summary, "codeInterpreterArn");@@ -169,9 +171,9 @@ public class BedrockAgentCoreToolsController {Integer maxResults = Pagination.parseMaxResults(maxResultsParam, "ValidationException");ObjectNode request = object(body);String name = request.hasNonNull("name") ? request.get("name").asText() : null;- var result = service.listBrowserProfiles(maxResults, nextToken, name, region);+ PaginatedResult<ObjectNode> result = service.listBrowserProfiles(maxResults, nextToken, name, region);ObjectNode response = objectMapper.createObjectNode();- var summaries = response.putArray("profileSummaries");+ ArrayNode summaries = response.putArray("profileSummaries");for (ObjectNode profile : result.items()) {ObjectNode summary = summaries.addObject();copyText(profile, summary, "createdAt");@@ -270,9 +272,9 @@ public class BedrockAgentCoreToolsController {String region = regionResolver.resolveRegion(headers);try {Integer maxResults = Pagination.parseMaxResults(maxResultsParam, "ValidationException");- var result = service.listBrowsers(maxResults, nextToken, type, region);+ PaginatedResult<ObjectNode> result = service.listBrowsers(maxResults, nextToken, type, region);ObjectNode response = objectMapper.createObjectNode();- var summaries = response.putArray("browserSummaries");+ ArrayNode summaries = response.putArray("browserSummaries");for (ObjectNode browser : result.items()) {ObjectNode summary = summaries.addObject();copyText(browser, summary, "browserArn");diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationQueryHandler.javaindex a5f4c2202f..6289d321d5 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationQueryHandler.java@@ -450,7 +450,7 @@ public class CloudFormationQueryHandler {String templateStage = params.getFirst("TemplateStage");try {String template = cfnService.getTemplate(stackName, templateStage, region);- var xml = new XmlBuilder()+ XmlBuilder xml = new XmlBuilder().start("GetTemplateResponse", CF_NS).start("GetTemplateResult").elem("TemplateBody", template);@@ -479,7 +479,7 @@ public class CloudFormationQueryHandler {try {TemplateSummary summary = cfnService.getTemplateSummary(stackName, templateBody, templateUrl, region);- var xml = new XmlBuilder()+ XmlBuilder xml = new XmlBuilder().start("GetTemplateSummaryResponse", CF_NS).start("GetTemplateSummaryResult");@@ -574,12 +574,12 @@ public class CloudFormationQueryHandler {// ── ListExports ─────────────────────────────────────────────────────────private Response listExports(MultivaluedMap<String, String> params, String region) {- var exportEntries = cfnService.listExports(region);+ Map<String, CloudFormationService.ExportEntry> exportEntries = cfnService.listExports(region);XmlBuilder xml = new XmlBuilder().start("ListExportsResponse", CF_NS).start("ListExportsResult").start("Exports");- for (var entry : exportEntries.values()) {+ for (CloudFormationService.ExportEntry entry : exportEntries.values()) {xml.start("member").elem("ExportingStackId", entry.exportingStackId()).elem("Name", entry.name())diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationTemplateEngine.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationTemplateEngine.javaindex fc2c11d300..9afc206cf9 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationTemplateEngine.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationTemplateEngine.java@@ -2,6 +2,8 @@ package io.github.hectorvent.floci.services.cloudformation;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 com.fasterxml.jackson.databind.node.TextNode;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsRegions;@@ -206,16 +208,16 @@ public class CloudFormationTemplateEngine {return TextNode.valueOf(resolve(node));}// Plain object — resolve each field- var resolved = objectMapper.createObjectNode();+ ObjectNode resolved = objectMapper.createObjectNode();Iterator<Map.Entry<String, JsonNode>> fields = node.fields();while (fields.hasNext()) {- var entry = fields.next();+ Map.Entry<String, JsonNode> entry = fields.next();resolved.set(entry.getKey(), resolveNode(entry.getValue()));}return resolved;}if (node.isArray()) {- var arr = objectMapper.createArrayNode();+ ArrayNode arr = objectMapper.createArrayNode();for (JsonNode item : node) {arr.add(resolveNode(item));}diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/InlineZipPackager.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/InlineZipPackager.javaindex 4cc12dc0c2..7935db5fd0 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/InlineZipPackager.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/InlineZipPackager.java@@ -104,8 +104,8 @@ public final class InlineZipPackager {String module = handler.contains(".") ? handler.substring(0, handler.lastIndexOf('.')) : "index";String ext = runtime.startsWith("python") ? ".py" : ".js";try {- var baos = new ByteArrayOutputStream();- try (var zos = new ZipOutputStream(baos)) {+ ByteArrayOutputStream baos = new ByteArrayOutputStream();+ try (ZipOutputStream zos = new ZipOutputStream(baos)) {zos.putNextEntry(new ZipEntry(module + ext));zos.write(source.getBytes(StandardCharsets.UTF_8));zos.closeEntry();diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkAclCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkAclCfnProvisioner.javaindex 350e267db0..9ca164313b 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkAclCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkAclCfnProvisioner.java@@ -4,6 +4,8 @@ import com.fasterxml.jackson.databind.JsonNode;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.cloudformation.model.StackResource;import io.github.hectorvent.floci.services.ec2.Ec2Service;+import io.github.hectorvent.floci.services.ec2.model.NetworkAcl;+import io.github.hectorvent.floci.services.ec2.model.NetworkAclAssociation;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;@@ -69,7 +71,7 @@ public class Ec2NetworkAclCfnProvisioner implements CfnResourceProvisioner {// already made; only create when it is absent, meaning a first execution or one removed// out of band.String existingId = r.getPhysicalId();- var existing = existingId == null || existingId.isBlank() ? null+ NetworkAcl existing = existingId == null || existingId.isBlank() ? null: ec2Service.describeNetworkAcls(ctx.region(), List.of(existingId), Map.of()).stream().findFirst().orElse(null);if (existing != null) {@@ -83,7 +85,7 @@ public class Ec2NetworkAclCfnProvisioner implements CfnResourceProvisioner {r.getAttributes().put("Id", existingId);return;}- var acl = ec2Service.createNetworkAcl(ctx.region(), vpcId);+ NetworkAcl acl = ec2Service.createNetworkAcl(ctx.region(), vpcId);r.setPhysicalId(acl.getNetworkAclId());r.getAttributes().put("Id", acl.getNetworkAclId());}@@ -131,7 +133,7 @@ public class Ec2NetworkAclCfnProvisioner implements CfnResourceProvisioner {throw new IllegalStateException("No network ACL association found for subnet " + subnetId);}- var assoc = ec2Service.replaceNetworkAclAssociation(ctx.region(), associationId, aclId);+ NetworkAclAssociation assoc = ec2Service.replaceNetworkAclAssociation(ctx.region(), associationId, aclId);r.setPhysicalId(assoc.getNetworkAclAssociationId());r.getAttributes().put("AssociationId", assoc.getNetworkAclAssociationId());}@@ -152,7 +154,7 @@ public class Ec2NetworkAclCfnProvisioner implements CfnResourceProvisioner {* replace the association with the default ACL of the same VPC.*/private void deleteSubnetNetworkAclAssociation(String physicalId, String region) {- var holder = ec2Service.describeNetworkAcls(region, List.of(),+ NetworkAcl holder = ec2Service.describeNetworkAcls(region, List.of(),Map.of("association.network-acl-association-id", List.of(physicalId))).stream().findFirst().orElse(null);if (holder == null) {@@ -161,7 +163,7 @@ public class Ec2NetworkAclCfnProvisioner implements CfnResourceProvisioner {if (holder.isDefault()) {return; // already on the default ACL, nothing to revert}- var defaultAcl = ec2Service.describeNetworkAcls(region, List.of(),+ NetworkAcl defaultAcl = ec2Service.describeNetworkAcls(region, List.of(),Map.of("vpc-id", List.of(holder.getVpcId()), "default", List.of("true"))).stream().findFirst().orElse(null);if (defaultAcl == null) {diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkCfnProvisioner.javaindex df058bc4d3..c17d53f4ad 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkCfnProvisioner.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.cloudformation.provisioners;import com.fasterxml.jackson.core.JsonProcessingException;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.AwsException;import io.github.hectorvent.floci.core.common.CidrCanonicalizer;@@ -285,7 +286,7 @@ public class Ec2NetworkCfnProvisioner implements CfnResourceProvisioner {ObjectNode prior = inPlacePrior(r, resourceId, ctx);ObjectNode tags = prior.putObject("tags");currentTags.forEach(tags::put);- var applied = prior.putArray("appliedKeys");+ ArrayNode applied = prior.putArray("appliedKeys");desired.keySet().forEach(applied::add);writeInPlacePrior(r, prior);}diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2VpcEndpointCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2VpcEndpointCfnProvisioner.javaindex f96ea84606..fab7d51e67 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2VpcEndpointCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2VpcEndpointCfnProvisioner.java@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.cloudformation.model.StackResource;import io.github.hectorvent.floci.services.ec2.Ec2Service;+import io.github.hectorvent.floci.services.ec2.model.VpcEndpoint;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;@@ -54,7 +55,7 @@ public class Ec2VpcEndpointCfnProvisioner implements CfnResourceProvisioner {? Boolean.parseBoolean(privateDns): null;String previousEndpointId = r.getPhysicalId();- var endpoint = ec2Service.createVpcEndpoint(ctx.region(), vpcId, serviceName,+ VpcEndpoint endpoint = ec2Service.createVpcEndpoint(ctx.region(), vpcId, serviceName,endpointType != null ? endpointType : "Gateway",resolveIdList(props, "RouteTableIds", ctx),resolveIdList(props, "SubnetIds", ctx),diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EventsCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EventsCfnProvisioner.javaindex a6d5c090c9..63f3f76d46 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EventsCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EventsCfnProvisioner.java@@ -13,6 +13,7 @@ import io.github.hectorvent.floci.services.eventbridge.EventBridgeService;import io.github.hectorvent.floci.services.eventbridge.model.BatchParameters;import io.github.hectorvent.floci.services.eventbridge.model.EventBus;import io.github.hectorvent.floci.services.eventbridge.model.InputTransformer;+import io.github.hectorvent.floci.services.eventbridge.model.Rule;import io.github.hectorvent.floci.services.eventbridge.model.RuleState;import io.github.hectorvent.floci.services.eventbridge.model.SqsParameters;import io.github.hectorvent.floci.services.eventbridge.model.Target;@@ -137,7 +138,7 @@ public class EventsCfnProvisioner implements CfnResourceProvisioner {String stateStr = ctx.resolveOptional(props, "State");RuleState state = "DISABLED".equals(stateStr) ? RuleState.DISABLED : RuleState.ENABLED;- var rule = eventBridgeService.putRule(ruleName, busName, eventPattern, scheduleExpression,+ Rule rule = eventBridgeService.putRule(ruleName, busName, eventPattern, scheduleExpression,state, description, roleArn, Map.of(), ctx.region());r.setPhysicalId(ruleName);r.getAttributes().put("Arn", rule.getArn());@@ -580,7 +581,7 @@ public class EventsCfnProvisioner implements CfnResourceProvisioner {private void deleteEventBridgeRuleSafe(String ruleName, String busName, String region) {try {// Remove all targets before deleting the rule (busName scopes the lookup to the rule's bus).- var targets = eventBridgeService.listTargetsByRule(ruleName, busName, region);+ List<Target> targets = eventBridgeService.listTargetsByRule(ruleName, busName, region);if (!targets.isEmpty()) {List<String> targetIds = targets.stream().map(Target::getId).toList();eventBridgeService.removeTargets(ruleName, busName, targetIds, region);diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/FirehoseCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/FirehoseCfnProvisioner.javaindex 11b3990799..1a495f1712 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/FirehoseCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/FirehoseCfnProvisioner.java@@ -50,7 +50,7 @@ public class FirehoseCfnProvisioner implements CfnResourceProvisioner {s3.setPrefix(blankToNull(ctx.engine().resolve(s3Node.path("Prefix"))));if (s3Node.has("BufferingHints")) {JsonNode hints = s3Node.get("BufferingHints");- var bufferingHints = new DeliveryStreamDescription.BufferingHints();+ DeliveryStreamDescription.BufferingHints bufferingHints = new DeliveryStreamDescription.BufferingHints();bufferingHints.setSizeInMBs(parseIntProp(hints, "SizeInMBs", ctx, DEFAULT_BUFFER_SIZE_MB));bufferingHints.setIntervalInSeconds(parseIntProp(hints, "IntervalInSeconds", ctx, DEFAULT_BUFFER_INTERVAL_SECONDS));diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/KmsCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/KmsCfnProvisioner.javaindex e321c4d39f..813b8605d3 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/KmsCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/KmsCfnProvisioner.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.cloudformation.provisioners;import com.fasterxml.jackson.databind.JsonNode;import io.github.hectorvent.floci.services.cloudformation.model.StackResource;import io.github.hectorvent.floci.services.kms.KmsService;+import io.github.hectorvent.floci.services.kms.model.KmsKey;import jakarta.enterprise.context.ApplicationScoped;import java.util.HashMap;@@ -41,7 +42,7 @@ public class KmsCfnProvisioner implements CfnResourceProvisioner {private void provisionKey(StackResource r, JsonNode props, ProvisionContext ctx) {String description = ctx.resolveOptional(props, "Description");Map<String, String> tags = parseCfnTags(props != null ? props.get("Tags") : null, ctx);- var key = kmsService.createKey(description, null, tags, ctx.region());+ KmsKey key = kmsService.createKey(description, null, tags, ctx.region());r.setPhysicalId(key.getKeyId());r.getAttributes().put("Arn", key.getArn());r.getAttributes().put("KeyId", key.getKeyId());diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/RdsCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/RdsCfnProvisioner.javaindex e9a8f38edb..cc7c42b4cb 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/RdsCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/RdsCfnProvisioner.java@@ -11,7 +11,9 @@ import io.github.hectorvent.floci.services.rds.model.DbCluster;import io.github.hectorvent.floci.services.rds.model.DbClusterParameterGroup;import io.github.hectorvent.floci.services.rds.model.DbInstance;import io.github.hectorvent.floci.services.rds.model.DbParameterGroup;+import io.github.hectorvent.floci.services.rds.model.DbProxy;import io.github.hectorvent.floci.services.rds.model.DbProxyAuth;+import io.github.hectorvent.floci.services.rds.model.DbProxyTargetGroup;import io.github.hectorvent.floci.services.rds.model.DbSubnetGroup;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;@@ -613,7 +615,7 @@ public class RdsCfnProvisioner implements CfnResourceProvisioner {"REQUIRED".equalsIgnoreCase(a.getIamAuth())|| "ENABLED".equalsIgnoreCase(a.getIamAuth()));Map<String, String> tags = parseCfnTags(props != null ? props.get("Tags") : null, engine);- var proxy = r.getPhysicalId() == null+ DbProxy proxy = r.getPhysicalId() == null? rdsService.createDbProxy(name, engineFamily, requireTls, iamAuth,defaultAuthScheme, roleArn, subnetIds, sgIds, auth, idleClientTimeout,debugLogging, tags, region, endpointNetworkType, targetConnectionNetworkType)@@ -634,7 +636,7 @@ public class RdsCfnProvisioner implements CfnResourceProvisioner {List<String> subnetIds, List<String> securityGroupIds, List<DbProxyAuth> auth,Map<String, String> tags, String region, String endpointNetworkType,String targetConnectionNetworkType) {- var existing = rdsService.getDbProxy(resource.getPhysicalId(), region);+ DbProxy existing = rdsService.getDbProxy(resource.getPhysicalId(), region);// ModifyDBProxy has no EndpointNetworkType/TargetConnectionNetworkType parameters; AWS// documents both as requiring CloudFormation replacement, same as DBProxyName, EngineFamily,// and VpcSubnetIds.@@ -692,7 +694,7 @@ public class RdsCfnProvisioner implements CfnResourceProvisioner {400);}if (r.getPhysicalId() != null) {- var existing = rdsService.getDbProxyTargetGroupByArn(r.getPhysicalId(), region);+ DbProxyTargetGroup existing = rdsService.getDbProxyTargetGroupByArn(r.getPhysicalId(), region);if (!Objects.equals(existing.getDbProxyName(), dbProxyName)|| !Objects.equals(existing.getTargetGroupName(), targetGroupName)) {throw new AwsException("UnsupportedOperation",@@ -700,12 +702,12 @@ public class RdsCfnProvisioner implements CfnResourceProvisioner {400);}}- var proxy = rdsService.getDbProxy(dbProxyName, region);+ DbProxy proxy = rdsService.getDbProxy(dbProxyName, region);int effectiveMaxConnections = maxConn != null ? maxConn: ("SQLSERVER".equals(proxy.getEngineFamily()) ? 10 : 100);int effectiveMaxIdle = maxIdle != null ? maxIdle : effectiveMaxConnections / 2;int effectiveBorrowTimeout = connectionBorrowTimeout != null ? connectionBorrowTimeout : 120;- var tg = rdsService.reconcileDbProxyTargetGroup(+ DbProxyTargetGroup tg = rdsService.reconcileDbProxyTargetGroup(dbProxyName, targetGroupName, clusterIds, instanceIds,effectiveMaxConnections, effectiveMaxIdle, effectiveBorrowTimeout,initQuery, sessionPinningFilters, region);diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/SnsCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/SnsCfnProvisioner.javaindex c5aaaefff0..c3a6ed0d57 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/SnsCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/SnsCfnProvisioner.java@@ -4,6 +4,8 @@ import com.fasterxml.jackson.databind.JsonNode;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.cloudformation.model.StackResource;import io.github.hectorvent.floci.services.sns.SnsService;+import io.github.hectorvent.floci.services.sns.model.Subscription;+import io.github.hectorvent.floci.services.sns.model.Topic;import jakarta.enterprise.context.ApplicationScoped;import java.util.HashMap;@@ -88,7 +90,7 @@ public class SnsCfnProvisioner implements CfnResourceProvisioner {attributes.put("MaximumMessageSize", maximumMessageSize);}- var topic = snsService.createTopic(topicName, attributes, Map.of(), ctx.region());+ Topic topic = snsService.createTopic(topicName, attributes, Map.of(), ctx.region());// createTopic leaves an existing topic untouched, so an update writes the mutable// attributes itself. A property the template dropped is reset, not left standing.if (ctx.isUpdate()) {@@ -139,7 +141,7 @@ public class SnsCfnProvisioner implements CfnResourceProvisioner {attributes.put("RedrivePolicy", ctx.engine().resolveJsonAttribute(props.path("RedrivePolicy")));}- var sub = snsService.subscribe(topicArn, protocol, endpoint, ctx.region(), attributes);+ Subscription sub = snsService.subscribe(topicArn, protocol, endpoint, ctx.region(), attributes);r.setPhysicalId(sub.getSubscriptionArn());r.getAttributes().put("Arn", sub.getSubscriptionArn());}diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontServingController.java b/src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontServingController.javaindex 454b492f4f..631690112e 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontServingController.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontServingController.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.cloudfront;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RequestHost;+import io.github.hectorvent.floci.services.cloudfront.model.CloudFrontOriginAccessIdentity;import io.github.hectorvent.floci.services.cloudfront.model.Distribution;import io.github.hectorvent.floci.services.cloudfront.model.DistributionConfig;import io.github.hectorvent.floci.services.cloudfront.model.Origin;@@ -125,7 +126,7 @@ public class CloudFrontServingController {@Path("/{proxy:.*}")public Response get(@PathParam("distId") String distId, @PathParam("proxy") String proxy,@Context HttpHeaders headers, @Context UriInfo uriInfo) {- var request = currentVertxRequest.getCurrent().request();+ HttpServerRequest request = currentVertxRequest.getCurrent().request();String rawViewerPath = rawViewerPath(request.uri());return serve(distId, rawViewerPath, decodedViewerPath(rawViewerPath),uriInfo.getRequestUri().getScheme(),@@ -139,7 +140,7 @@ public class CloudFrontServingController {@Path("/{proxy:.*}")public Response head(@PathParam("distId") String distId, @PathParam("proxy") String proxy,@Context HttpHeaders headers, @Context UriInfo uriInfo) {- var request = currentVertxRequest.getCurrent().request();+ HttpServerRequest request = currentVertxRequest.getCurrent().request();String rawViewerPath = rawViewerPath(request.uri());return serve(distId, rawViewerPath, decodedViewerPath(rawViewerPath),uriInfo.getRequestUri().getScheme(),@@ -153,7 +154,7 @@ public class CloudFrontServingController {@Path("/{proxy:.*}")public Response options(@PathParam("distId") String distId, @PathParam("proxy") String proxy,@Context HttpHeaders headers, @Context UriInfo uriInfo) {- var request = currentVertxRequest.getCurrent().request();+ HttpServerRequest request = currentVertxRequest.getCurrent().request();String rawViewerPath = rawViewerPath(request.uri());return serve(distId, rawViewerPath, decodedViewerPath(rawViewerPath),uriInfo.getRequestUri().getScheme(),@@ -576,7 +577,7 @@ public class CloudFrontServingController {String oaiId = originAccessIdentityId(origin);if (oaiId != null) {- var oai = service.getCloudFrontOriginAccessIdentity(oaiId);+ CloudFrontOriginAccessIdentity oai = service.getCloudFrontOriginAccessIdentity(oaiId);s3Service.authorizeCloudFrontOaiGetObject(bucket, key, oaiId, oai.getS3CanonicalUserId());return;diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/CloudHsmV2JsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/CloudHsmV2JsonHandler.javaindex 81fa34ca2a..a1fe8864ec 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/CloudHsmV2JsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/CloudHsmV2JsonHandler.java@@ -18,6 +18,7 @@ import org.jboss.logging.Logger;import java.util.ArrayList;import java.util.Base64;import java.util.Collection;+import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;@@ -568,9 +569,9 @@ public class CloudHsmV2JsonHandler {return null;}Map<String, String> map = new LinkedHashMap<>();- var fields = node.fields();+ Iterator<Map.Entry<String, JsonNode>> fields = node.fields();while (fields.hasNext()) {- var entry = fields.next();+ Map.Entry<String, JsonNode> entry = fields.next();map.put(entry.getKey(), entry.getValue().asText());}return map.isEmpty() ? null : map;diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandler.javaindex 5aa036dcba..747d0226ad 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandler.java@@ -100,7 +100,7 @@ public class CloudWatchMetricsJsonHandler {ObjectNode response = objectMapper.createObjectNode();ArrayNode metricsArray = response.putArray("Metrics");- for (var m : metrics) {+ for (CloudWatchMetricsService.MetricIdentity m : metrics) {ObjectNode mNode = metricsArray.addObject();mNode.put("Namespace", m.namespace());mNode.put("MetricName", m.metricName());@@ -137,7 +137,7 @@ public class CloudWatchMetricsJsonHandler {ObjectNode response = objectMapper.createObjectNode();response.put("Label", metricName);ArrayNode dps = response.putArray("Datapoints");- for (var dp : datapoints) {+ for (CloudWatchMetricsService.Datapoint dp : datapoints) {ObjectNode dpNode = dps.addObject();dpNode.put("Timestamp", dp.timestamp().getEpochSecond());if (statistics.contains("Average")) dpNode.put("Average", dp.average());@@ -374,7 +374,7 @@ public class CloudWatchMetricsJsonHandler {ObjectNode response = objectMapper.createObjectNode();ArrayNode resultsArray = response.putArray("MetricDataResults");- for (var r : results) {+ for (CloudWatchMetricsService.MetricDataResult r : results) {ObjectNode rNode = resultsArray.addObject();rNode.put("Id", r.id());rNode.put("Label", r.label());@@ -563,7 +563,7 @@ public class CloudWatchMetricsJsonHandler {for (MetricStreamStatisticsConfiguration configuration : configurations) {ObjectNode node = array.addObject();ArrayNode includeMetrics = node.putArray("IncludeMetrics");- for (var metric : configuration.getIncludeMetrics()) {+ for (MetricStreamStatisticsConfiguration.IncludeMetric metric : configuration.getIncludeMetrics()) {includeMetrics.addObject().put("Namespace", metric.namespace()).put("MetricName", metric.metricName());diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandler.javaindex 6d67684885..80a1775a6f 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandler.java@@ -89,9 +89,9 @@ public class CloudWatchMetricsQueryHandler {List<CloudWatchMetricsService.MetricIdentity> metrics =metricsService.listMetrics(namespace, metricName, dimensions, region);- var xml = new XmlBuilder().start("Metrics");- for (var m : metrics) {- var member = xml.start("member")+ XmlBuilder xml = new XmlBuilder().start("Metrics");+ for (CloudWatchMetricsService.MetricIdentity m : metrics) {+ XmlBuilder member = xml.start("member").elem("Namespace", m.namespace()).elem("MetricName", m.metricName()).start("Dimensions");@@ -131,10 +131,10 @@ public class CloudWatchMetricsQueryHandler {startTime, endTime, period, statistics, unit, region);DateTimeFormatter fmt = DateTimeFormatter.ISO_INSTANT;- var xml = new XmlBuilder()+ XmlBuilder xml = new XmlBuilder().elem("Label", metricName).start("Datapoints");- for (var dp : datapoints) {+ for (CloudWatchMetricsService.Datapoint dp : datapoints) {xml.start("member").elem("Timestamp", fmt.format(dp.timestamp()));if (statistics.contains("Average")) {xml.elem("Average", String.valueOf(dp.average()));@@ -167,8 +167,8 @@ public class CloudWatchMetricsQueryHandler {metricsService.getMetricData(queries, startTime, endTime, region);DateTimeFormatter fmt = DateTimeFormatter.ISO_INSTANT;- var xml = new XmlBuilder().start("MetricDataResults");- for (var r : results) {+ XmlBuilder xml = new XmlBuilder().start("MetricDataResults");+ for (CloudWatchMetricsService.MetricDataResult r : results) {xml.start("member").elem("Id", r.id()).elem("Label", r.label())@@ -249,7 +249,7 @@ public class CloudWatchMetricsQueryHandler {List<MetricAlarm> alarms = metricsService.describeAlarms(alarmNames, prefix, region);- var xml = new XmlBuilder().start("MetricAlarms");+ XmlBuilder xml = new XmlBuilder().start("MetricAlarms");for (MetricAlarm a : alarms) {toAlarmXml(xml, a);}@@ -369,7 +369,7 @@ public class CloudWatchMetricsQueryHandler {dashboardsService.listDashboards(params.getFirst("DashboardNamePrefix"), region);DateTimeFormatter fmt = DateTimeFormatter.ISO_INSTANT;- var xml = new XmlBuilder().start("DashboardEntries");+ XmlBuilder xml = new XmlBuilder().start("DashboardEntries");for (Dashboard d : dashboards) {xml.start("member").elem("DashboardName", d.getDashboardName())@@ -518,7 +518,7 @@ public class CloudWatchMetricsQueryHandler {xml.start("StatisticsConfigurations");for (MetricStreamStatisticsConfiguration configuration : configurations) {xml.start("member").start("IncludeMetrics");- for (var metric : configuration.getIncludeMetrics()) {+ for (MetricStreamStatisticsConfiguration.IncludeMetric metric : configuration.getIncludeMetrics()) {xml.start("member").elem("Namespace", metric.namespace()).elem("MetricName", metric.metricName())diff --git a/src/main/java/io/github/hectorvent/floci/services/codebuild/CodeBuildRunner.java b/src/main/java/io/github/hectorvent/floci/services/codebuild/CodeBuildRunner.javaindex d4e53c44d2..6b4bd55ba1 100644--- a/src/main/java/io/github/hectorvent/floci/services/codebuild/CodeBuildRunner.java+++ b/src/main/java/io/github/hectorvent/floci/services/codebuild/CodeBuildRunner.java@@ -41,6 +41,7 @@ import java.io.InputStream;import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;+import java.nio.file.PathMatcher;import java.util.ArrayList;import java.util.Comparator;import java.util.LinkedHashMap;@@ -51,6 +52,7 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.CountDownLatch;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicBoolean;+import java.util.stream.Stream;import java.util.zip.ZipEntry;import java.util.zip.ZipInputStream;import java.util.zip.ZipOutputStream;@@ -498,7 +500,7 @@ public class CodeBuildRunner implements ContainerTeardown {try {if (!Files.exists(sourceDir)) return;boolean hasFiles;- try (var ls = Files.list(sourceDir)) {+ try (Stream<Path> ls = Files.list(sourceDir)) {hasFiles = ls.findAny().isPresent();}if (!hasFiles) return;@@ -560,7 +562,7 @@ public class CodeBuildRunner implements ContainerTeardown {private void createTarFromDir(Path dir, ByteArrayOutputStream out) throws IOException {try (TarArchiveOutputStream tar = newTarStream(out);- var stream = Files.walk(dir)) {+ Stream<Path> stream = Files.walk(dir)) {for (Path path : (Iterable<Path>) stream::iterator) {if (path.equals(dir)) continue;String entryName = dir.relativize(path).toString();@@ -573,7 +575,7 @@ public class CodeBuildRunner implements ContainerTeardown {entry.setSize(Files.size(path));entry.setMode(0644);tar.putArchiveEntry(entry);- try (var fis = Files.newInputStream(path)) {+ try (InputStream fis = Files.newInputStream(path)) {fis.transferTo(tar);}tar.closeArchiveEntry();@@ -730,7 +732,7 @@ public class CodeBuildRunner implements ContainerTeardown {}for (String pattern : patterns) {if ("**/*".equals(pattern) || "**".equals(pattern)) {- try (var stream = Files.walk(baseDir)) {+ try (Stream<Path> stream = Files.walk(baseDir)) {stream.filter(Files::isRegularFile).forEach(result::add);}} else if (!pattern.contains("*") && !pattern.contains("?")@@ -743,8 +745,8 @@ public class CodeBuildRunner implements ContainerTeardown {LOG.warnv("Artifact file not found: {0}", direct);}} else {- var matcher = baseDir.getFileSystem().getPathMatcher("glob:" + pattern);- try (var stream = Files.walk(baseDir)) {+ PathMatcher matcher = baseDir.getFileSystem().getPathMatcher("glob:" + pattern);+ try (Stream<Path> stream = Files.walk(baseDir)) {stream.filter(Files::isRegularFile).filter(p -> matcher.matches(baseDir.relativize(p))).forEach(result::add);diff --git a/src/main/java/io/github/hectorvent/floci/services/configservice/ConfigServiceJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/configservice/ConfigServiceJsonHandler.javaindex f77514c570..eb69732e69 100644--- a/src/main/java/io/github/hectorvent/floci/services/configservice/ConfigServiceJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/configservice/ConfigServiceJsonHandler.java@@ -4,12 +4,17 @@ import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.services.configservice.model.AggregationAuthorization;+import io.github.hectorvent.floci.services.configservice.model.ComplianceByConfigRule;+import io.github.hectorvent.floci.services.configservice.model.ComplianceByResource;import io.github.hectorvent.floci.services.configservice.model.ConfigEvaluation;import io.github.hectorvent.floci.services.configservice.model.ConfigRule;+import io.github.hectorvent.floci.services.configservice.model.ConfigRuleEvaluationStatus;import io.github.hectorvent.floci.services.configservice.model.ConfigurationRecorder;import io.github.hectorvent.floci.services.configservice.model.ConfigurationRecorderStatus;import io.github.hectorvent.floci.services.configservice.model.ConformancePack;+import io.github.hectorvent.floci.services.configservice.model.ConformancePackStatusDetail;import io.github.hectorvent.floci.services.configservice.model.DeliveryChannel;+import io.github.hectorvent.floci.services.configservice.model.EvaluationResult;import io.github.hectorvent.floci.services.configservice.model.RetentionConfiguration;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;@@ -97,7 +102,7 @@ public class ConfigServiceJsonHandler {}private Response describeComplianceByConfigRule(JsonNode req, String region) {- var page = service.describeComplianceByConfigRule(region,+ AwsConfigService.Paged<ComplianceByConfigRule> page = service.describeComplianceByConfigRule(region,extractStringList(req, "ConfigRuleNames"),extractStringList(req, "ComplianceTypes"),extractNextToken(req));@@ -105,7 +110,7 @@ public class ConfigServiceJsonHandler {}private Response describeComplianceByResource(JsonNode req, String region) {- var page = service.describeComplianceByResource(region,+ AwsConfigService.Paged<ComplianceByResource> page = service.describeComplianceByResource(region,req.path("ResourceType").asText(null),req.path("ResourceId").asText(null),extractStringList(req, "ComplianceTypes"),@@ -114,7 +119,7 @@ public class ConfigServiceJsonHandler {}private Response describeConfigRuleEvaluationStatus(JsonNode req, String region) {- var page = service.describeConfigRuleEvaluationStatus(region,+ AwsConfigService.Paged<ConfigRuleEvaluationStatus> page = service.describeConfigRuleEvaluationStatus(region,extractStringList(req, "ConfigRuleNames"),extractLimit(req, "Limit"), extractNextToken(req));return Response.ok(pagedResponse("ConfigRulesEvaluationStatus", page)).build();@@ -157,7 +162,7 @@ public class ConfigServiceJsonHandler {}private Response getComplianceDetailsByConfigRule(JsonNode req, String region) {- var page = service.getComplianceDetailsByConfigRule(region,+ AwsConfigService.Paged<EvaluationResult> page = service.getComplianceDetailsByConfigRule(region,req.path("ConfigRuleName").asText(null),extractStringList(req, "ComplianceTypes"),extractLimit(req, "Limit"), extractNextToken(req));@@ -165,7 +170,7 @@ public class ConfigServiceJsonHandler {}private Response getComplianceDetailsByResource(JsonNode req, String region) {- var page = service.getComplianceDetailsByResource(region,+ AwsConfigService.Paged<EvaluationResult> page = service.getComplianceDetailsByResource(region,req.path("ResourceType").asText(null),req.path("ResourceId").asText(null),extractStringList(req, "ComplianceTypes"),@@ -290,14 +295,14 @@ public class ConfigServiceJsonHandler {}private Response describeConformancePacks(JsonNode req, String region) {- var page = service.describeConformancePacksPaged(region,+ AwsConfigService.Paged<ConformancePack> page = service.describeConformancePacksPaged(region,extractStringList(req, "ConformancePackNames"),extractLimit(req, "Limit"), extractNextToken(req));return Response.ok(pagedResponse("ConformancePackDetails", page)).build();}private Response describeConformancePackStatus(JsonNode req, String region) {- var page = service.describeConformancePackStatus(region,+ AwsConfigService.Paged<ConformancePackStatusDetail> page = service.describeConformancePackStatus(region,extractStringList(req, "ConformancePackNames"),extractLimit(req, "Limit"), extractNextToken(req));return Response.ok(pagedResponse("ConformancePackStatusDetails", page)).build();diff --git a/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerControlController.java b/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerControlController.javaindex f17e50ef5d..8c220df401 100644--- a/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerControlController.java+++ b/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerControlController.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.controltower;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.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -39,16 +40,16 @@ public class ControlTowerControlController {@POST @Path("/enable-control")public Response enable(@Context HttpHeaders headers, String body) {- var result = service.enable(account(), region(headers), parse(body));+ ControlTowerControlService.EnableResult result = service.enable(account(), region(headers), parse(body));return Response.ok(objectMapper.createObjectNode().put("arn", result.arn()).put("operationIdentifier", result.operationIdentifier())).build();}@POST @Path("/list-enabled-controls")public Response list(@Context HttpHeaders headers, String body) {- var result = service.list(region(headers), parse(body));+ ControlTowerControlService.ListResult result = service.list(region(headers), parse(body));ObjectNode response = objectMapper.createObjectNode();- var array = response.putArray("enabledControls");+ ArrayNode array = response.putArray("enabledControls");result.controls().forEach(control -> array.add(summary(control)));if (result.nextToken() != null) response.put("nextToken", result.nextToken());return Response.ok(response).build();@@ -81,7 +82,7 @@ public class ControlTowerControlController {@POST @Path("/get-control-operation")public Response operation(@Context HttpHeaders headers, String body) {JsonNode request = parse(body);- var operation = service.operation(account(), region(headers), requireText(request, "operationIdentifier"));+ ControlTowerControlService.ControlOperation operation = service.operation(account(), region(headers), requireText(request, "operationIdentifier"));ObjectNode node = objectMapper.createObjectNode();node.put("operationIdentifier", operation.operationIdentifier());node.put("operationType", operation.operationType());diff --git a/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerControlService.java b/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerControlService.javaindex 863f385068..d40e379f68 100644--- a/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerControlService.java+++ b/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerControlService.java@@ -12,6 +12,7 @@ import jakarta.inject.Inject;import java.util.ArrayList;import java.util.Comparator;+import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;@@ -142,7 +143,7 @@ public class ControlTowerControlService {operationId, type, SUCCEEDED, control.getControlIdentifier(), control.getArn(), control.getTargetIdentifier()));long inScope = operations.keySet().stream().filter(key -> key.startsWith(scopePrefix)).count();if (inScope > MAX_OPERATIONS_PER_SCOPE) {- var iterator = operations.keySet().iterator();+ Iterator<String> iterator = operations.keySet().iterator();while (iterator.hasNext()) {if (iterator.next().startsWith(scopePrefix)) {iterator.remove();diff --git a/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerController.java b/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerController.javaindex 5f734da44e..e79710a066 100644--- a/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerController.java+++ b/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerController.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.controltower;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.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -84,7 +85,7 @@ public class ControlTowerController {List<LandingZone> landingZones = service.listLandingZones(requestContext.getAccountId(), regionResolver.resolveRegion(headers));ObjectNode response = objectMapper.createObjectNode();- var array = response.putArray("landingZones");+ ArrayNode array = response.putArray("landingZones");for (LandingZone lz : landingZones) {ObjectNode node = objectMapper.createObjectNode();node.put("arn", lz.getArn());@@ -163,7 +164,7 @@ public class ControlTowerController {ControlTowerService.ListLandingZoneOperationsResult result = service.listLandingZoneOperations(requestContext.getAccountId(), regionResolver.resolveRegion(headers), parse(body));ObjectNode response = objectMapper.createObjectNode();- var array = response.putArray("landingZoneOperations");+ ArrayNode array = response.putArray("landingZoneOperations");for (ControlTowerService.LandingZoneOperationSummary operation : result.landingZoneOperations()) {ObjectNode node = objectMapper.createObjectNode();node.put("operationIdentifier", operation.operationIdentifier());@@ -183,7 +184,7 @@ public class ControlTowerController {public Response listBaselines(@Context HttpHeaders headers) {List<ObjectNode> baselines = service.listBaselines(regionResolver.resolveRegion(headers));ObjectNode response = objectMapper.createObjectNode();- var array = response.putArray("baselines");+ ArrayNode array = response.putArray("baselines");array.addAll(baselines);return Response.ok(response).build();}@@ -195,7 +196,7 @@ public class ControlTowerController {ControlTowerService.ListEnabledBaselinesResult result = service.listEnabledBaselines(requestContext.getAccountId(), regionResolver.resolveRegion(headers), parse(body));ObjectNode response = objectMapper.createObjectNode();- var array = response.putArray("enabledBaselines");+ ArrayNode array = response.putArray("enabledBaselines");for (EnabledBaseline entry : result.enabledBaselines()) {array.add(enabledBaselineNode(entry));}@@ -274,7 +275,7 @@ public class ControlTowerController {node.set("driftStatus", driftStatus);node.set("manifest", lz.getManifest());if (lz.getRemediationTypes() != null) {- var remediationTypes = node.putArray("remediationTypes");+ ArrayNode remediationTypes = node.putArray("remediationTypes");lz.getRemediationTypes().forEach(remediationTypes::add);}return node;diff --git a/src/main/java/io/github/hectorvent/floci/services/datasync/DataSyncJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/datasync/DataSyncJsonHandler.javaindex 5f7f7f623e..58da917615 100644--- a/src/main/java/io/github/hectorvent/floci/services/datasync/DataSyncJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/datasync/DataSyncJsonHandler.java@@ -63,7 +63,7 @@ public class DataSyncJsonHandler {yield ok(mapper.createObjectNode());}case "ListAgents" -> {- var page = dataSyncService.listAgents(text(request, "NextToken"),+ DataSyncService.Page<DataSyncAgent> page = dataSyncService.listAgents(text(request, "NextToken"),request.path("MaxResults").asInt(0));ObjectNode response = mapper.createObjectNode();ArrayNode entries = response.putArray("Agents");@@ -99,7 +99,7 @@ public class DataSyncJsonHandler {yield ok(mapper.createObjectNode());}case "ListLocations" -> {- var page = dataSyncService.listLocations(request.get("Filters"),+ DataSyncService.Page<DataSyncLocation> page = dataSyncService.listLocations(request.get("Filters"),text(request, "NextToken"), request.path("MaxResults").asInt(0));ObjectNode response = mapper.createObjectNode();ArrayNode entries = response.putArray("Locations");@@ -130,7 +130,7 @@ public class DataSyncJsonHandler {yield ok(mapper.createObjectNode());}case "ListTasks" -> {- var page = dataSyncService.listTasks(request.get("Filters"),+ DataSyncService.Page<DataSyncTask> page = dataSyncService.listTasks(request.get("Filters"),text(request, "NextToken"), request.path("MaxResults").asInt(0));ObjectNode response = mapper.createObjectNode();ArrayNode entries = response.putArray("Tasks");diff --git a/src/main/java/io/github/hectorvent/floci/services/detective/DetectiveController.java b/src/main/java/io/github/hectorvent/floci/services/detective/DetectiveController.javaindex 31cd815103..ecc3953169 100644--- a/src/main/java/io/github/hectorvent/floci/services/detective/DetectiveController.java+++ b/src/main/java/io/github/hectorvent/floci/services/detective/DetectiveController.java@@ -2,6 +2,8 @@ package io.github.hectorvent.floci.services.detective;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.AwsException;import io.github.hectorvent.floci.core.common.JsonErrorResponseUtils;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -41,8 +43,8 @@ public class DetectiveController {JsonNode request = parse(body);validatePageRequest(request);DetectiveState state = service.state(region(headers));- var response = objectMapper.createObjectNode();- var administrators = response.putArray("Administrators");+ ObjectNode response = objectMapper.createObjectNode();+ ArrayNode administrators = response.putArray("Administrators");if (state.getAdminAccountId() != null) {administrators.addObject().put("AccountId", state.getAdminAccountId());}@@ -63,8 +65,8 @@ public class DetectiveController {String region = region(headers);validatePageRequest(parse(body));DetectiveState state = service.state(region);- var response = objectMapper.createObjectNode();- var graphs = response.putArray("GraphList");+ ObjectNode response = objectMapper.createObjectNode();+ ArrayNode graphs = response.putArray("GraphList");if (state.isGraph()) {graphs.addObject().put("Arn", service.graphArn(region));}@@ -78,7 +80,7 @@ public class DetectiveController {JsonNode request = parse(body);service.requireGraphArn(region, request.path("GraphArn").asText(null));DetectiveState state = service.requireGraph(region);- var response = objectMapper.createObjectNode();+ ObjectNode response = objectMapper.createObjectNode();response.put("AutoEnable", state.isAutoEnable());return Response.ok(response).build();}@@ -111,8 +113,8 @@ public class DetectiveController {}int offset = offset(request.path("NextToken").asText(null), all.size());int end = Math.min(all.size(), offset + limit);- var response = objectMapper.createObjectNode();- var members = response.putArray("MemberDetails");+ ObjectNode response = objectMapper.createObjectNode();+ ArrayNode members = response.putArray("MemberDetails");for (DetectiveMember member : all.subList(offset, end)) {members.add(memberNode(region, member));}@@ -138,9 +140,9 @@ public class DetectiveController {}service.validateCreateMembers(region, graphArn, accountIds);- var response = objectMapper.createObjectNode();- var members = response.putArray("Members");- var unprocessed = response.putArray("UnprocessedAccounts");+ ObjectNode response = objectMapper.createObjectNode();+ ArrayNode members = response.putArray("Members");+ ArrayNode unprocessed = response.putArray("UnprocessedAccounts");for (JsonNode account : accounts) {String accountId = account.path("AccountId").asText(null);try {@@ -169,7 +171,7 @@ public class DetectiveController {}private com.fasterxml.jackson.databind.node.ObjectNode memberNode(String region, DetectiveMember member) {- var node = objectMapper.createObjectNode();+ ObjectNode node = objectMapper.createObjectNode();node.put("AccountId", member.getAccountId());node.put("EmailAddress", member.getEmailAddress());node.put("Status", member.getStatus());diff --git a/src/main/java/io/github/hectorvent/floci/services/detective/DetectiveService.java b/src/main/java/io/github/hectorvent/floci/services/detective/DetectiveService.javaindex ad05c866c4..c861878fa9 100644--- a/src/main/java/io/github/hectorvent/floci/services/detective/DetectiveService.java+++ b/src/main/java/io/github/hectorvent/floci/services/detective/DetectiveService.java@@ -10,6 +10,7 @@ import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.detective.model.DetectiveMember;import io.github.hectorvent.floci.services.detective.model.DetectiveState;import io.github.hectorvent.floci.services.organizations.OrganizationsService;+import io.github.hectorvent.floci.services.organizations.model.Organization;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;@@ -50,7 +51,7 @@ public class DetectiveService implements Resettable {public synchronized void enableAdmin(String region, String callerAccountId, String accountId) {requireAccountId(accountId);- var organization = organizationsService.describeOrganization(callerAccountId);+ Organization organization = organizationsService.describeOrganization(callerAccountId);if (!callerAccountId.equals(organization.getMasterAccountId())) {throw new AwsException("AccessDeniedException","Only the organization management account can designate the Detective administrator account.", 403);diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPath.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPath.javaindex c032884cc6..5100a02a62 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPath.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPath.java@@ -86,7 +86,7 @@ record DynamoDbAccessPath(String indexName, Kind kind, List<KeySchemaElement> ke}Set<String> projectedAttributeNames(TableDefinition table) {- var projected = table.getKeySchema().stream()+ Set<String> projected = table.getKeySchema().stream().map(KeySchemaElement::getAttributeName).collect(Collectors.toSet());projected.addAll(keyAttributeNames());diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPathValidator.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPathValidator.javaindex e512097e8c..a4099e9155 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPathValidator.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPathValidator.java@@ -109,7 +109,7 @@ final class DynamoDbAccessPathValidator {boolean conditionOnNonKeyAttribute = false;- for (var rawCondition : conditions) {+ for (Expr rawCondition : conditions) {Expr condition = normalizeOperandOrder(rawCondition);if (conditionOperand(condition) instanceof PathOperand(List<String> segments) && segments.size() > 1) {throw new AwsException("ValidationException",diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAttributeValueValidator.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAttributeValueValidator.javaindex 81dfce134b..143c6ef78f 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAttributeValueValidator.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAttributeValueValidator.java@@ -28,7 +28,7 @@ final class DynamoDbAttributeValueValidator {if (!value.isObject()) {throw serializationEx("Unexpected value type in payload");}- var types = TYPES.stream().filter(value::has).toList();+ List<String> types = TYPES.stream().filter(value::has).toList();if (types.isEmpty()) {throw validationEx("Supplied AttributeValue is empty, must contain exactly one of the supported datatypes");}@@ -69,7 +69,7 @@ final class DynamoDbAttributeValueValidator {if (attributes == null || !attributes.isObject()) {return true;}- for (var value : attributes) {+ for (JsonNode value : attributes) {if (!valueNestingWithinLimit(value)) {return false;}@@ -81,12 +81,12 @@ final class DynamoDbAttributeValueValidator {if (!value.isObject()) {return 1;}- var children = value.has("M") ? value.get("M") : value.get("L");+ JsonNode children = value.has("M") ? value.get("M") : value.get("L");if (children == null) {return 1;}- var deepest = 0;- for (var child : children) {+ int deepest = 0;+ for (JsonNode child : children) {deepest = Math.max(deepest, depthOf(child));}return 1 + deepest;@@ -123,7 +123,7 @@ final class DynamoDbAttributeValueValidator {if (!encoded.isTextual()) {throw serializationEx("only base-64-encoded strings are convertible to bytes");}- var text = encoded.asText();+ String text = encoded.asText();if (text.length() % 4 != 0) {throw serializationEx("Base64 encoded length is expected a multiple of 4 bytes but found: " + text.length());}diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbItemSize.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbItemSize.javaindex 75ad3e221c..f83f2afa31 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbItemSize.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbItemSize.java@@ -107,9 +107,9 @@ final class DynamoDbItemSize {static int calculateItemSize(JsonNode item) {if (item == null || !item.isObject()) return 0;int total = 0;- var fields = item.fields();+ Iterator<Map.Entry<String, JsonNode>> fields = item.fields();while (fields.hasNext()) {- var entry = fields.next();+ Map.Entry<String, JsonNode> entry = fields.next();total += utf8Length(entry.getKey());total += attributeValueSize(entry.getValue());}@@ -149,9 +149,9 @@ final class DynamoDbItemSize {}if (attr.has("M")) {int size = 0;- var fields = attr.get("M").fields();+ Iterator<Map.Entry<String, JsonNode>> fields = attr.get("M").fields();while (fields.hasNext()) {- var entry = fields.next();+ Map.Entry<String, JsonNode> entry = fields.next();size += utf8Length(entry.getKey()) + 1 + attributeValueSize(entry.getValue()) + 3;}return size;diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbNumberUtils.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbNumberUtils.javaindex 5f6381f79e..e0a95f2a65 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbNumberUtils.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbNumberUtils.java@@ -70,7 +70,7 @@ final class DynamoDbNumberUtils {if (attributes == null || !attributes.isObject()) {return;}- for (var value : attributes) {+ for (JsonNode value : attributes) {requireStorableValue(value, inValidationEnvelope ? "1 validation error detected: " : "");}}@@ -82,13 +82,13 @@ final class DynamoDbNumberUtils {if (value.has("N")) {requireStorableNumber(value.get("N").asText(), prefix);}- for (var n : value.path("NS")) {+ for (JsonNode n : value.path("NS")) {requireStorableNumber(n.asText(), prefix);}- for (var element : value.path("L")) {+ for (JsonNode element : value.path("L")) {requireStorableValue(element, prefix);}- for (var entry : value.path("M")) {+ for (JsonNode entry : value.path("M")) {requireStorableValue(entry, prefix);}}@@ -101,12 +101,12 @@ final class DynamoDbNumberUtils {throw new AwsException("ValidationException","The parameter cannot be converted to a numeric value: " + numStr, 400);}- var stripped = bd.stripTrailingZeros();+ BigDecimal stripped = bd.stripTrailingZeros();if (stripped.precision() > 38) {throw new AwsException("ValidationException",prefix + "Attempting to store more than 38 significant digits in a Number", 400);}- var abs = stripped.abs();+ BigDecimal abs = stripped.abs();if (abs.compareTo(MAX_ABS) >= 0) {throw new AwsException("ValidationException",prefix + "Number overflow. Attempting to store a number with magnitude larger than supported range", 400);@@ -120,8 +120,8 @@ final class DynamoDbNumberUtils {// AWS answers with the overflow wording for any arithmetic result it cannot store,// a magnitude too small or too many significant digits included.static void checkArithmeticResult(BigDecimal result) {- var stripped = result.stripTrailingZeros();- var abs = stripped.abs();+ BigDecimal stripped = result.stripTrailingZeros();+ BigDecimal abs = stripped.abs();if (stripped.precision() > 38 || abs.compareTo(MAX_ABS) >= 0|| (abs.signum() > 0 && abs.compareTo(MIN_ABS_NONZERO) < 0)) {throw new AwsException("ValidationException",diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParser.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParser.javaindex 6c8feeff5b..e9da8976d5 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParser.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParser.java@@ -1046,7 +1046,7 @@ public class DynamoDbPartiQLParser {throw validationEx("Not enough parameters supplied for ? placeholders");}JsonNode p = parameters.get(paramIdx++);- var type = DynamoDbAttributeValueValidator.typeOf(p);+ String type = DynamoDbAttributeValueValidator.typeOf(p);return switch (type) {case "S" -> new PVal.Str(p.get("S").asText());case "N" -> new PVal.Num(p.get("N").asText());diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbUpdatedAttributes.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbUpdatedAttributes.javaindex 616c787b7a..bb26b7a599 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbUpdatedAttributes.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbUpdatedAttributes.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.dynamodb;import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.node.ArrayNode;import com.fasterxml.jackson.databind.node.JsonNodeFactory;import com.fasterxml.jackson.databind.node.ObjectNode;@@ -17,14 +18,14 @@ final class DynamoDbUpdatedAttributes {private DynamoDbUpdatedAttributes() {}static ObjectNode collect(List<DynamoDbService.TouchedPath> touched, boolean newValues) {- var root = new Node();- for (var path : touched) {- var value = newValues ? path.newValue() : path.oldValue();+ Node root = new Node();+ for (DynamoDbService.TouchedPath path : touched) {+ JsonNode value = newValues ? path.newValue() : path.oldValue();if (value != null) {root.insert(path.tokens(), 0, value);}}- var out = JsonNodeFactory.instance.objectNode();+ ObjectNode out = JsonNodeFactory.instance.objectNode();root.mapChildren.forEach((name, child) -> out.set(name, child.render()));return out;}@@ -44,7 +45,7 @@ final class DynamoDbUpdatedAttributes {listChildren.clear();return;}- var child = tokens.get(i) instanceof Long index+ Node child = tokens.get(i) instanceof Long index? listChildren.computeIfAbsent(index, ignored -> new Node()): mapChildren.computeIfAbsent((String) tokens.get(i), ignored -> new Node());child.insert(tokens, i + 1, value);@@ -54,12 +55,12 @@ final class DynamoDbUpdatedAttributes {if (whole != null) {return whole;}- var out = JsonNodeFactory.instance.objectNode();+ ObjectNode out = JsonNodeFactory.instance.objectNode();if (!listChildren.isEmpty()) {- var list = out.putArray("L");+ ArrayNode list = out.putArray("L");listChildren.values().forEach(child -> list.add(child.render()));} else {- var map = out.putObject("M");+ ObjectNode map = out.putObject("M");mapChildren.forEach((name, child) -> map.set(name, child.render()));}return out;diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbWriteCapacity.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbWriteCapacity.javaindex c86e8d5ee4..9fd5504f81 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbWriteCapacity.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbWriteCapacity.java@@ -3,7 +3,9 @@ package io.github.hectorvent.floci.services.dynamodb;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.node.JsonNodeFactory;import com.fasterxml.jackson.databind.node.ObjectNode;+import io.github.hectorvent.floci.services.dynamodb.model.GlobalSecondaryIndex;import io.github.hectorvent.floci.services.dynamodb.model.KeySchemaElement;+import io.github.hectorvent.floci.services.dynamodb.model.LocalSecondaryIndex;import io.github.hectorvent.floci.services.dynamodb.model.TableDefinition;import io.github.hectorvent.floci.services.dynamodb.model.VectorIndex;@@ -46,9 +48,9 @@ final class DynamoDbWriteCapacity {}double total() {- var sum = table;- for (var units : gsi.values()) sum += units;- for (var units : lsi.values()) sum += units;+ double sum = table;+ for (Double units : gsi.values()) sum += units;+ for (Double units : lsi.values()) sum += units;return sum;}@@ -58,9 +60,9 @@ final class DynamoDbWriteCapacity {}Cost plus(Cost other) {- var mergedGsi = new LinkedHashMap<>(gsi);+ LinkedHashMap<String, Double> mergedGsi = new LinkedHashMap<>(gsi);other.gsi().forEach((name, units) -> mergedGsi.merge(name, units, Double::sum));- var mergedLsi = new LinkedHashMap<>(lsi);+ LinkedHashMap<String, Double> mergedLsi = new LinkedHashMap<>(lsi);other.lsi().forEach((name, units) -> mergedLsi.merge(name, units, Double::sum));LinkedHashMap<String, Double> mergedVector = new LinkedHashMap<>(vectorBytes);other.vectorBytes().forEach((name, bytes) -> mergedVector.merge(name, bytes, Double::sum));@@ -70,23 +72,23 @@ final class DynamoDbWriteCapacity {/** oldItem and newItem are the stored images before and after the write; either may be null. */static Cost forWrite(TableDefinition table, JsonNode oldItem, JsonNode newItem) {- var tableUnits = (double) Math.max(1, Math.max(sizeUnits(oldItem), sizeUnits(newItem)));- var gsiUnits = new LinkedHashMap<String, Double>();- var gsis = table.getGlobalSecondaryIndexes();+ double tableUnits = (double) Math.max(1, Math.max(sizeUnits(oldItem), sizeUnits(newItem)));+ LinkedHashMap<String, Double> gsiUnits = new LinkedHashMap<>();+ List<GlobalSecondaryIndex> gsis = table.getGlobalSecondaryIndexes();if (gsis != null) {- for (var gsi : gsis) {- var units = indexUnits(table, gsi.getKeySchema(), gsi.getProjectionType(),+ for (GlobalSecondaryIndex gsi : gsis) {+ double units = indexUnits(table, gsi.getKeySchema(), gsi.getProjectionType(),gsi.getNonKeyAttributes(), oldItem, newItem);if (units > 0) {gsiUnits.put(gsi.getIndexName(), units);}}}- var lsiUnits = new LinkedHashMap<String, Double>();- var lsis = table.getLocalSecondaryIndexes();+ LinkedHashMap<String, Double> lsiUnits = new LinkedHashMap<>();+ List<LocalSecondaryIndex> lsis = table.getLocalSecondaryIndexes();if (lsis != null) {- for (var lsi : lsis) {- var units = indexUnits(table, lsi.getKeySchema(), lsi.getProjectionType(),+ for (LocalSecondaryIndex lsi : lsis) {+ double units = indexUnits(table, lsi.getKeySchema(), lsi.getProjectionType(),lsi.getNonKeyAttributes(), oldItem, newItem);if (units > 0) {lsiUnits.put(lsi.getIndexName(), units);@@ -178,8 +180,8 @@ final class DynamoDbWriteCapacity {if (keySchema == null) {return 0;}- var oldView = indexView(table, keySchema, projectionType, nonKeyAttributes, oldItem);- var newView = indexView(table, keySchema, projectionType, nonKeyAttributes, newItem);+ JsonNode oldView = indexView(table, keySchema, projectionType, nonKeyAttributes, oldItem);+ JsonNode newView = indexView(table, keySchema, projectionType, nonKeyAttributes, newItem);if (oldView == null) {if (newView == null) {return 0;@@ -208,7 +210,7 @@ final class DynamoDbWriteCapacity {if (item == null) {return null;}- for (var element : keySchema) {+ for (KeySchemaElement element : keySchema) {if (!item.has(element.getAttributeName())) {return null;}@@ -216,19 +218,19 @@ final class DynamoDbWriteCapacity {if (projectionType == null || "ALL".equals(projectionType)) {return item;}- var keep = new LinkedHashSet<String>();+ LinkedHashSet<String> keep = new LinkedHashSet<>();keep.add(table.getPartitionKeyName());if (table.getSortKeyName() != null) {keep.add(table.getSortKeyName());}- for (var element : keySchema) {+ for (KeySchemaElement element : keySchema) {keep.add(element.getAttributeName());}if ("INCLUDE".equals(projectionType) && nonKeyAttributes != null) {keep.addAll(nonKeyAttributes);}- var view = JsonNodeFactory.instance.objectNode();- for (var name : keep) {+ ObjectNode view = JsonNodeFactory.instance.objectNode();+ for (String name : keep) {if (item.has(name)) {view.set(name, item.get(name));}@@ -238,8 +240,8 @@ final class DynamoDbWriteCapacity {private static boolean indexKeyChanged(List<KeySchemaElement> keySchema,JsonNode oldItem, JsonNode newItem) {- for (var element : keySchema) {- var name = element.getAttributeName();+ for (KeySchemaElement element : keySchema) {+ String name = element.getAttributeName();if (!oldItem.get(name).equals(newItem.get(name))) {return true;}diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/ExpressionEvaluator.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/ExpressionEvaluator.javaindex 6d5f82a7a9..20e54d4678 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/ExpressionEvaluator.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/ExpressionEvaluator.java@@ -10,7 +10,11 @@ import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Arrays;import java.util.Base64;+import java.util.HashSet;+import java.util.Iterator;import java.util.List;+import java.util.Map;+import java.util.TreeSet;/*** Proper tokenizer/parser/evaluator for DynamoDB filter expressions and key condition expressions.@@ -51,7 +55,7 @@ final class ExpressionEvaluator {// ── Tokenizer ──static List<Token> tokenize(String expression) {- var tokens = new ArrayList<Token>();+ ArrayList<Token> tokens = new ArrayList<>();int i = 0;int len = expression.length();@@ -218,7 +222,7 @@ final class ExpressionEvaluator {}private Expr parseOrExpr() {- var operands = new ArrayList<Expr>();+ ArrayList<Expr> operands = new ArrayList<>();operands.add(parseAndExpr());while (peek().type() == TokenType.OR) {advance(); // consume OR@@ -228,7 +232,7 @@ final class ExpressionEvaluator {}private Expr parseAndExpr() {- var operands = new ArrayList<Expr>();+ ArrayList<Expr> operands = new ArrayList<>();operands.add(parseNotExpr());while (peek().type() == TokenType.AND) {advance(); // consume AND@@ -260,7 +264,7 @@ final class ExpressionEvaluator {if (current.type() == TokenType.FUNCTION) {String funcName = advance().value();expect(TokenType.LPAREN);- var args = parseOperandList();+ List<Operand> args = parseOperandList();expect(TokenType.RPAREN);// If followed by a comparator, this is "size(path) = :val" — treat as comparison@@ -280,7 +284,7 @@ final class ExpressionEvaluator {if (next.type() == TokenType.IN) {advance(); // consume INexpect(TokenType.LPAREN);- var candidates = parseOperandList();+ List<Operand> candidates = parseOperandList();expect(TokenType.RPAREN);return new InExpr(left, candidates);}@@ -309,7 +313,7 @@ final class ExpressionEvaluator {if (current.type() == TokenType.FUNCTION) {String funcName = advance().value();expect(TokenType.LPAREN);- var args = parseOperandList();+ List<Operand> args = parseOperandList();expect(TokenType.RPAREN);return new FunctionOperand(funcName, args);}@@ -321,7 +325,7 @@ final class ExpressionEvaluator {// Path: identifier or #name, possibly dotted with nested [n] list indicesif (current.type() == TokenType.IDENTIFIER || current.type() == TokenType.NAME_REF) {- var segments = new ArrayList<String>();+ ArrayList<String> segments = new ArrayList<>();segments.add(advance().value());// Consume any immediately-following list indices (no dot needed before [n])while (peek().type() == TokenType.LIST_INDEX) {@@ -350,7 +354,7 @@ final class ExpressionEvaluator {}private List<Operand> parseOperandList() {- var list = new ArrayList<Operand>();+ ArrayList<Operand> list = new ArrayList<>();list.add(parseOperand());while (peek().type() == TokenType.COMMA) {advance(); // consume comma@@ -370,8 +374,8 @@ final class ExpressionEvaluator {static Expr parse(String expression) {if (expression == null || expression.isBlank()) return null;- var tokens = tokenize(expression.trim());- var parser = new Parser(tokens);+ List<Token> tokens = tokenize(expression.trim());+ Parser parser = new Parser(tokens);Expr expr = parser.parseExpression();if (parser.peek().type() != TokenType.EOF) {throw new IllegalArgumentException(@@ -477,12 +481,12 @@ final class ExpressionEvaluator {// AWS rejects a BETWEEN whose bounds are the wrong way round when it parses the// expression, rather than letting the condition fail at evaluation time.private static void validateBetween(BetweenExpr between, String exprType, JsonNode values) {- var low = placeholderValue(between.low(), values);- var high = placeholderValue(between.high(), values);+ JsonNode low = placeholderValue(between.low(), values);+ JsonNode high = placeholderValue(between.high(), values);if (low == null || high == null) {return;}- var lowType = low.fieldNames().next();+ String lowType = low.fieldNames().next();if (!lowType.equals(high.fieldNames().next()) || compareBoundValues(low, high) <= 0) {return;}@@ -522,7 +526,7 @@ final class ExpressionEvaluator {private static JsonNode placeholderValue(Operand operand, JsonNode values) {if (operand instanceof PlaceholderOperand(String name) && values != null) {- var value = values.get(name);+ JsonNode value = values.get(name);if (value != null && value.isObject() && value.fieldNames().hasNext()) {return value;}@@ -531,7 +535,7 @@ final class ExpressionEvaluator {}private static String displayAttributeValue(JsonNode value) {- var type = value.fieldNames().next();+ String type = value.fieldNames().next();return "AttributeValue: {" + type + ":" + value.get(type).asText() + "}";}@@ -580,7 +584,7 @@ final class ExpressionEvaluator {// Renders a path operand the way DynamoDB does in operand errors, e.g. "[data]" or "[a, b]".private static String displayOperand(Operand operand, JsonNode names) {if (operand instanceof PathOperand path) {- var parts = new ArrayList<String>();+ ArrayList<String> parts = new ArrayList<>();for (String seg : path.segments()) {if (seg.startsWith("[")) {if (!parts.isEmpty()) parts.set(parts.size() - 1, parts.getLast() + seg);@@ -623,7 +627,7 @@ final class ExpressionEvaluator {}}- var tokens = tokenize(expression.trim());+ List<Token> tokens = tokenize(expression.trim());// Find the top-level AND that separates PK from SK.// We need to skip AND tokens that are part of BETWEEN...AND.// Strategy: walk through tokens tracking parenthesis depth and BETWEEN state.@@ -937,7 +941,7 @@ final class ExpressionEvaluator {}private static String resolvePathString(PathOperand path, JsonNode exprAttrNames) {- var sb = new StringBuilder();+ StringBuilder sb = new StringBuilder();for (int i = 0; i < path.segments().size(); i++) {String segment = path.segments().get(i);if (segment.startsWith("[")) {@@ -979,7 +983,7 @@ final class ExpressionEvaluator {// Tokenizes a resolved path string (e.g. "a.b[0].c") into segments.// Each segment is either a plain attribute name or a "[n]" list index string.private static List<String> parsePathSegments(String path) {- var segs = new ArrayList<String>();+ ArrayList<String> segs = new ArrayList<>();for (String dotPart : path.split("\\.")) {dotPart = dotPart.replace(DOT_ESCAPE, ".");int brk = dotPart.indexOf('[');@@ -1046,9 +1050,9 @@ final class ExpressionEvaluator {JsonNode aMap = a.get("M");JsonNode bMap = b.get("M");if (aMap.size() != bMap.size()) return false;- var fields = aMap.fields();+ Iterator<Map.Entry<String, JsonNode>> fields = aMap.fields();while (fields.hasNext()) {- var entry = fields.next();+ Map.Entry<String, JsonNode> entry = fields.next();if (!bMap.has(entry.getKey())) return false;if (!attributeValuesEqual(entry.getValue(), bMap.get(entry.getKey()))) return false;}@@ -1067,7 +1071,7 @@ final class ExpressionEvaluator {if (a.has("SS") && b.has("SS")) {JsonNode aArr = a.get("SS"), bArr = b.get("SS");if (aArr.size() != bArr.size()) return false;- var aSet = new java.util.HashSet<String>();+ HashSet<String> aSet = new HashSet<>();aArr.forEach(e -> aSet.add(e.asText()));for (JsonNode e : bArr) { if (!aSet.contains(e.asText())) return false; }return true;@@ -1076,7 +1080,7 @@ final class ExpressionEvaluator {if (a.has("BS") && b.has("BS")) {JsonNode aArr = a.get("BS"), bArr = b.get("BS");if (aArr.size() != bArr.size()) return false;- var aSet = new java.util.HashSet<String>();+ HashSet<String> aSet = new HashSet<>();aArr.forEach(e -> aSet.add(e.asText()));for (JsonNode e : bArr) { if (!aSet.contains(e.asText())) return false; }return true;@@ -1087,7 +1091,7 @@ final class ExpressionEvaluator {if (aArr.size() != bArr.size()) return false;// TreeSet membership goes through compareTo, so 1 and 1.0 are the same member.// BigDecimal.equals() is scale-sensitive and would treat them as different.- var aSet = new java.util.TreeSet<BigDecimal>();+ TreeSet<BigDecimal> aSet = new TreeSet<>();try {aArr.forEach(e -> aSet.add(new BigDecimal(e.asText())));for (JsonNode e : bArr) { if (!aSet.contains(new BigDecimal(e.asText()))) return false; }@@ -1116,8 +1120,8 @@ final class ExpressionEvaluator {}}if (a.has("B") && b.has("B")) {- var aBytes = decodeBinaryBound(a);- var bBytes = decodeBinaryBound(b);+ byte[] aBytes = decodeBinaryBound(a);+ byte[] bBytes = decodeBinaryBound(b);int minLen = Math.min(aBytes.length, bBytes.length);for (int i = 0; i < minLen; i++) {int diff = (aBytes[i] & 0xFF) - (bBytes[i] & 0xFF);diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/ProjectionEvaluator.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/ProjectionEvaluator.javaindex 5f214828d2..639cee7c55 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/ProjectionEvaluator.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/ProjectionEvaluator.java@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsException;import java.util.ArrayList;+import java.util.HashSet;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;@@ -64,7 +65,7 @@ final class ProjectionEvaluator {}static Set<String> topLevelAttributes(String projectionExpression, JsonNode exprAttrNames) {- var attributes = new java.util.HashSet<String>();+ HashSet<String> attributes = new HashSet<>();for (String rawPath : splitProjectionPaths(projectionExpression)) {List<PathSegment> segments = resolvePath(rawPath.trim(), exprAttrNames);if (!segments.isEmpty()) {@@ -222,11 +223,11 @@ final class ProjectionEvaluator {if (content.isEmpty()) {throw syntaxError("ProjectionExpression", "]", "[]");}- final var contentLength = content.length();- for (var i = 0; i < contentLength; i++) {- var c = content.charAt(i);+ final int contentLength = content.length();+ for (int i = 0; i < contentLength; i++) {+ char c = content.charAt(i);if (c < '0' || '9' < c) {- var near = "[" + content + "]";+ String near = "[" + content + "]";throw syntaxError("ProjectionExpression", String.valueOf(c),near.substring(0, Math.min(3, near.length())));}diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2IpamService.java b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2IpamService.javaindex 956758201c..fdcfc1c78c 100644--- a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2IpamService.java+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2IpamService.java@@ -756,12 +756,12 @@ public class Ec2IpamService {Optional<AccountAwareStorageBackend.OwnedEntry<Ipam>> exact =accountAware.findAnyAccountEntry(key(region, ipamId));if (exact.isPresent()) {- var entry = exact.get();+ AccountAwareStorageBackend.OwnedEntry<Ipam> entry = exact.get();return new OwnedIpam(entry.account(), entry.value());}for (Ipam ipam : accountAware.scanAllAccounts()) {if (ipam.getIpamId().equals(ipamId)) {- var entry = accountAware.findAnyAccountEntry(+ AccountAwareStorageBackend.OwnedEntry<Ipam> entry = accountAware.findAnyAccountEntry(key(ipam.getRegion(), ipam.getIpamId())).orElseThrow();return new OwnedIpam(entry.account(), entry.value());}@@ -846,12 +846,12 @@ public class Ec2IpamService {Optional<AccountAwareStorageBackend.OwnedEntry<IpamPool>> exact =accountAware.findAnyAccountEntry(key(region, ipamPoolId));if (exact.isPresent()) {- var entry = exact.get();+ AccountAwareStorageBackend.OwnedEntry<IpamPool> entry = exact.get();return new OwnedPool(entry.account(), entry.value());}for (IpamPool pool : accountAware.scanAllAccounts()) {if (pool.getIpamPoolId().equals(ipamPoolId)) {- var entry = accountAware.findAnyAccountEntry(+ AccountAwareStorageBackend.OwnedEntry<IpamPool> entry = accountAware.findAnyAccountEntry(key(pool.getRegion(), pool.getIpamPoolId())).orElseThrow();return new OwnedPool(entry.account(), entry.value());}diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2MetadataServer.java b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2MetadataServer.javaindex ab54bb6c39..639d892a36 100644--- a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2MetadataServer.java+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2MetadataServer.java@@ -1,7 +1,9 @@package io.github.hectorvent.floci.services.ec2;import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.services.ec2.model.GroupIdentifier;import io.github.hectorvent.floci.services.ec2.model.Instance;+import io.github.hectorvent.floci.services.ec2.model.Tag;import io.github.hectorvent.floci.services.iam.IamService;import io.github.hectorvent.floci.services.iam.model.IamRole;import io.github.hectorvent.floci.services.iam.model.SessionCredential;@@ -258,7 +260,7 @@ public class Ec2MetadataServer {return;}StringBuilder sb = new StringBuilder();- for (var sg : inst.getSecurityGroups()) {+ for (GroupIdentifier sg : inst.getSecurityGroups()) {if (!sb.isEmpty()) {sb.append("\n");}@@ -469,7 +471,7 @@ public class Ec2MetadataServer {if (instance == null || instance.getTags() == null) {return "";}- for (var tag : instance.getTags()) {+ for (Tag tag : instance.getTags()) {if (tag.getKey() == null || tag.getKey().isBlank()) {continue;}@@ -485,7 +487,7 @@ public class Ec2MetadataServer {if (instance == null || instance.getTags() == null || key == null) {return Optional.empty();}- for (var tag : instance.getTags()) {+ for (Tag tag : instance.getTags()) {if (key.equals(tag.getKey())) {return Optional.of(nvl(tag.getValue()));}diff --git a/src/main/java/io/github/hectorvent/floci/services/ecr/EcrService.java b/src/main/java/io/github/hectorvent/floci/services/ecr/EcrService.javaindex 05e90626c5..d73984c4c6 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecr/EcrService.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecr/EcrService.java@@ -33,6 +33,7 @@ import java.util.ArrayList;import java.util.Base64;import java.util.List;import java.util.Map;+import java.util.Optional;import java.util.Set;import java.util.regex.Pattern;@@ -236,7 +237,7 @@ public class EcrService implements ResourceProvider {String defaultAccount = regionResolver.getAccountId();String defaultRegion = regionResolver.getDefaultRegion();String legacyKey = key(defaultRegion, defaultAccount, registryRepositoryName);- var legacyRepository = repoStore.get(legacyKey);+ Optional<Repository> legacyRepository = repoStore.get(legacyKey);if (legacyRepository.isPresent()) {Repository repo = legacyRepository.get();repo.setRepositoryUri(registryManager.getRepositoryUri(@@ -252,7 +253,7 @@ public class EcrService implements ResourceProvider {String region = namespaced ? parts[1] : defaultRegion;String repoName = namespaced ? parts[2] : registryRepositoryName;String key = key(region, account, repoName);- var existing = repoStore.get(key);+ Optional<Repository> existing = repoStore.get(key);if (existing.isPresent()) {Repository repo = existing.get();repo.setRepositoryUri(registryManager.getRepositoryUri(account, region, repoName));diff --git a/src/main/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryManager.java b/src/main/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryManager.javaindex 1ea88f0271..9cadd53803 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryManager.java@@ -34,6 +34,7 @@ import java.nio.file.Paths;import java.util.ArrayList;import java.util.List;import java.util.Optional;+import java.util.OptionalInt;import java.util.concurrent.TimeUnit;import java.util.regex.Matcher;import java.util.regex.Pattern;@@ -284,7 +285,7 @@ public class EcrRegistryManager {// Check for existing container to adopt. The registry survives shutdown by design and is// adopted BY NAME, so look up the pre-migration name too: otherwise an upgraded emulator// orphans the old container while it still holds the registry host port and its data.- var existing = lifecycleManager.findByName(name);+ Optional<Container> existing = lifecycleManager.findByName(name);String adoptedName = name;if (existing.isEmpty()) {adoptedName = legacyRegistryContainerName();@@ -630,7 +631,7 @@ public class EcrRegistryManager {ContainerInfo info = lifecycleManager.adopt(containerId, List.of(CONTAINER_INTERNAL_PORT));// The control plane reaches the backing registry through this published loopback// binding when Floci runs on the host. In Docker, httpClient() uses container DNS.- var published = info.publishedHostPort(CONTAINER_INTERNAL_PORT);+ OptionalInt published = info.publishedHostPort(CONTAINER_INTERNAL_PORT);if (published.isPresent()) {this.hostPort = published.getAsInt();} else {diff --git a/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java b/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.javaindex 9fd5774b15..75cc966a47 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.ecs.container;+import com.github.dockerjava.api.model.Ports;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;@@ -27,6 +28,7 @@ import io.github.hectorvent.floci.services.ecs.model.ContainerOverride;import io.github.hectorvent.floci.services.ecs.model.EcsTask;import io.github.hectorvent.floci.services.ecs.model.EfsVolumeConfiguration;import io.github.hectorvent.floci.services.ecs.model.FirelensConfiguration;+import io.github.hectorvent.floci.services.ecs.model.KeyValuePair;import io.github.hectorvent.floci.services.ecs.model.LogConfiguration;import io.github.hectorvent.floci.services.ecs.model.ManagedAgent;import io.github.hectorvent.floci.services.ecs.model.MountPoint;@@ -42,6 +44,7 @@ import io.github.hectorvent.floci.services.lambda.launcher.ImageCacheService.Lauimport io.github.hectorvent.floci.services.s3.S3Service;import io.github.hectorvent.floci.services.s3.model.S3Object;import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;+import io.github.hectorvent.floci.services.secretsmanager.model.SecretVersion;import io.github.hectorvent.floci.services.ssm.SsmService;import com.github.dockerjava.api.DockerClient;import com.github.dockerjava.api.async.ResultCallback;@@ -53,6 +56,7 @@ import com.github.dockerjava.api.model.ExposedPort;import com.github.dockerjava.api.model.LogConfig;import com.github.dockerjava.api.model.StatisticNetworksConfig;import com.github.dockerjava.api.model.Statistics;+import io.github.hectorvent.floci.services.ssm.model.Parameter;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.apache.commons.compress.archivers.tar.TarArchiveEntry;@@ -1809,7 +1813,7 @@ public class EcsContainerManager {*/public Integer getExitCodeIfStopped(String dockerId) {try {- var inspect = lifecycleManager.getDockerClient().inspectContainerCmd(dockerId).exec();+ InspectContainerResponse inspect = lifecycleManager.getDockerClient().inspectContainerCmd(dockerId).exec();if (Boolean.TRUE.equals(inspect.getState().getRunning())) {return null;}@@ -1852,7 +1856,7 @@ public class EcsContainerManager {envMap.put("ECS_CONTAINER_METADATA_URI_V4", flociEndpoint + "/v4/" + metadataId);}if (def.getEnvironment() != null) {- for (var kv : def.getEnvironment()) {+ for (KeyValuePair kv : def.getEnvironment()) {envMap.put(kv.name(), kv.value());}}@@ -1862,12 +1866,12 @@ public class EcsContainerManager {}}if (override != null && override.getEnvironment() != null) {- for (var kv : override.getEnvironment()) {+ for (KeyValuePair kv : override.getEnvironment()) {envMap.put(kv.name(), kv.value());}}List<String> envVars = new ArrayList<>();- for (var entry : envMap.entrySet()) {+ for (Map.Entry<String, String> entry : envMap.entrySet()) {envVars.add(entry.getKey() + "=" + entry.getValue());}return envVars;@@ -1898,14 +1902,14 @@ public class EcsContainerManager {// The valueFrom may carry the ECS selector suffix// (:json-key:version-stage:version-id); the parser strips it so the base ARN// reaches SecretsManagerService intact, keeping its partial-ARN fallback working.- var selector = SecretsManagerSelector.parse(valueFrom);+ SecretsManagerSelector selector = SecretsManagerSelector.parse(valueFrom);jsonKey = selector.jsonKey();- var secret = secretsManagerService.getSecretValue(selector.secretId(),+ SecretVersion secret = secretsManagerService.getSecretValue(selector.secretId(),selector.versionId(), selector.versionStage(), secretRegion);value = secret == null ? null : secret.getSecretString();} else {String parameterName = ssmParameterName(valueFrom);- var parameter = ssmService.getParameter(parameterName, secretRegion);+ Parameter parameter = ssmService.getParameter(parameterName, secretRegion);value = parameter == null ? null : parameter.getValue();}} catch (AwsException e) {@@ -2053,12 +2057,12 @@ public class EcsContainerManager {}DockerClient dockerClient = lifecycleManager.getDockerClient();- var inspect = dockerClient.inspectContainerCmd(dockerId).exec();- var portBindingsMap = inspect.getNetworkSettings().getPorts().getBindings();+ InspectContainerResponse inspect = dockerClient.inspectContainerCmd(dockerId).exec();+ Map<ExposedPort, Ports.Binding[]> portBindingsMap = inspect.getNetworkSettings().getPorts().getBindings();for (PortMapping pm : def.getPortMappings()) {ExposedPort ep = ExposedPort.tcp(pm.containerPort());- var binding = portBindingsMap.get(ep);+ Ports.Binding[] binding = portBindingsMap.get(ep);int hostPort = pm.containerPort();String bindIp = "0.0.0.0";@@ -2172,7 +2176,7 @@ public class EcsContainerManager {*/private void mountEfsVolume(ContainerBuilder.Builder specBuilder, EfsVolumeConfiguration efs, MountPoint mp) {String efsVolumeName = efsVolumeName(efs.fileSystemId(), efs.accessPointId(), efs.rootDirectory());- var efsCfg = config.storage().efs();+ EmulatorConfig.EfsSharingConfig efsCfg = config.storage().efs();lifecycleManager.ensureSharedVolume(efsVolumeName,efsCfg.ownerUid(), efsCfg.ownerGid(), efsCfg.rootPermissions(),efsCfg.initImage());diff --git a/src/main/java/io/github/hectorvent/floci/services/eks/EksOidcWellKnownController.java b/src/main/java/io/github/hectorvent/floci/services/eks/EksOidcWellKnownController.javaindex 727f14f8d2..b3795dd2d1 100644--- a/src/main/java/io/github/hectorvent/floci/services/eks/EksOidcWellKnownController.java+++ b/src/main/java/io/github/hectorvent/floci/services/eks/EksOidcWellKnownController.java@@ -14,6 +14,7 @@ import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.Response;import java.math.BigInteger;+import java.security.interfaces.RSAPublicKey;import java.util.Base64;import java.util.LinkedHashMap;import java.util.List;@@ -73,7 +74,7 @@ public class EksOidcWellKnownController {.orElseThrow(() -> new AwsException("ResourceNotFoundException","No OIDC signing key for cluster: " + clusterName, 404));- var publicKey = oidcService.toPublicKey(key.getPublicKey());+ RSAPublicKey publicKey = oidcService.toPublicKey(key.getPublicKey());Map<String, Object> jwk = new LinkedHashMap<>();jwk.put("kty", "RSA");jwk.put("alg", "RS256");diff --git a/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseJsonHandler.javaindex 92e297ba1b..801bfa1cd3 100644--- a/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseJsonHandler.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.firehose;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.KinesisStreamSource;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.S3Destination;import io.github.hectorvent.floci.services.firehose.model.Record;@@ -115,7 +116,7 @@ public class FirehoseJsonHandler {}case "DescribeDeliveryStream" -> {String name = getDeliveryStreamName(request);- var desc = firehoseService.describeDeliveryStream(name);+ DeliveryStreamDescription desc = firehoseService.describeDeliveryStream(name);yield Response.ok(Map.of("DeliveryStreamDescription", desc)).build();}case "ListDeliveryStreams" -> {@@ -174,7 +175,7 @@ public class FirehoseJsonHandler {List<io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.Tag> tags = firehoseService.listTagsForDeliveryStream(name, exclusiveStartTagKey, limit);boolean hasMore = false;- var allTags = firehoseService.describeDeliveryStream(name).getTags();+ List<DeliveryStreamDescription.Tag> allTags = firehoseService.describeDeliveryStream(name).getTags();if (!tags.isEmpty() && !allTags.isEmpty()) {String lastKey = tags.get(tags.size() - 1).getKey();int idx = -1;diff --git a/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseParquetConverter.java b/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseParquetConverter.javaindex f6ef8ebfc1..e7303ef494 100644--- a/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseParquetConverter.java+++ b/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseParquetConverter.java@@ -357,9 +357,9 @@ public class FirehoseParquetConverter {// schema over a 128 MiB batch would otherwise cost columns x fields.// First occurrence wins, as the per-column scan it replaces did.Map<String, JsonNode> byLowerKey = new LinkedHashMap<>();- var fields = record.fields();+ Iterator<Map.Entry<String, JsonNode>> fields = record.fields();while (fields.hasNext()) {- var field = fields.next();+ Map.Entry<String, JsonNode> field = fields.next();byLowerKey.putIfAbsent(field.getKey().toLowerCase(Locale.ROOT), field.getValue());}return byLowerKey;diff --git a/src/main/java/io/github/hectorvent/floci/services/firehose/S3DestinationValidator.java b/src/main/java/io/github/hectorvent/floci/services/firehose/S3DestinationValidator.javaindex fbff3e63a4..d629444494 100644--- a/src/main/java/io/github/hectorvent/floci/services/firehose/S3DestinationValidator.java+++ b/src/main/java/io/github/hectorvent/floci/services/firehose/S3DestinationValidator.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.firehose;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.OpenXJsonSerDe;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.OrcSerDe;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.ParquetSerDe;@@ -128,7 +129,7 @@ final class S3DestinationValidator {*/private static void collectSchemaViolations(S3Destination config, String shapeName,List<String> violations) {- var conversion = config.getDataFormatConversionConfiguration();+ DeliveryStreamDescription.DataFormatConversionConfiguration conversion = config.getDataFormatConversionConfiguration();if (conversion == null || conversion.getSchemaConfiguration() == null) {return;}@@ -168,7 +169,7 @@ final class S3DestinationValidator {*/private static void collectOpenXMappingViolations(S3Destination config, String shapeName,List<String> violations) {- var conversion = config.getDataFormatConversionConfiguration();+ DeliveryStreamDescription.DataFormatConversionConfiguration conversion = config.getDataFormatConversionConfiguration();if (conversion == null || conversion.getInputFormatConfiguration() == null|| conversion.getInputFormatConfiguration().getDeserializer() == null) {return;@@ -214,7 +215,7 @@ final class S3DestinationValidator {}private static Serializer serializer(S3Destination config) {- var conversion = config.getDataFormatConversionConfiguration();+ DeliveryStreamDescription.DataFormatConversionConfiguration conversion = config.getDataFormatConversionConfiguration();if (conversion == null || conversion.getOutputFormatConfiguration() == null) {return null;}diff --git a/src/main/java/io/github/hectorvent/floci/services/fis/FisService.java b/src/main/java/io/github/hectorvent/floci/services/fis/FisService.javaindex 0488fc0c3b..4365d0f641 100644--- a/src/main/java/io/github/hectorvent/floci/services/fis/FisService.java+++ b/src/main/java/io/github/hectorvent/floci/services/fis/FisService.java@@ -29,6 +29,7 @@ import java.util.Collections;import java.util.Comparator;import java.util.HashMap;import java.util.HashSet;+import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;@@ -1112,8 +1113,8 @@ public class FisService implements TagHandler {private Set<String> persistResolvedTargets(String region, String experimentId, JsonNode targets) {Set<String> unresolvedTargets = new HashSet<>();int index = 0;- for (var iterator = targets.fields(); iterator.hasNext();) {- var entry = iterator.next();+ for (Iterator<Map.Entry<String, JsonNode>> iterator = targets.fields(); iterator.hasNext();) {+ Map.Entry<String, JsonNode> entry = iterator.next();String targetName = entry.getKey();JsonNode target = entry.getValue();String resourceType = target.path("resourceType").asText();diff --git a/src/main/java/io/github/hectorvent/floci/services/floci/ui/FlociUiManager.java b/src/main/java/io/github/hectorvent/floci/services/floci/ui/FlociUiManager.javaindex 5a1db31442..4af87273cd 100644--- a/src/main/java/io/github/hectorvent/floci/services/floci/ui/FlociUiManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/floci/ui/FlociUiManager.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.floci.ui;import java.io.Closeable;+import java.io.InputStream;import java.net.HttpURLConnection;import java.net.URI;import java.util.ArrayList;@@ -658,7 +659,7 @@ public class FlociUiManager {return new RuntimeProbe(true, null);}JsonNode health;- try (var input = conn.getInputStream()) {+ try (InputStream input = conn.getInputStream()) {health = objectMapper.readTree(input);}String reported = health.path(console.healthReadyField()).asText("");diff --git a/src/main/java/io/github/hectorvent/floci/services/glue/GlueJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/glue/GlueJsonHandler.javaindex 22b6637cba..28472d16d9 100644--- a/src/main/java/io/github/hectorvent/floci/services/glue/GlueJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/glue/GlueJsonHandler.java@@ -780,7 +780,7 @@ public class GlueJsonHandler {String dbName = request.path("DatabaseName").asText(null);String pattern = request.path("Pattern").asText(null);String functionType = request.path("FunctionType").asText(null);- var page = glueService.getUserDefinedFunctions(+ GlueService.UserDefinedFunctionPage page = glueService.getUserDefinedFunctions(dbName, pattern, functionType, readMaxResults(request), readNextToken(request));return Response.ok(pageResponse("UserDefinedFunctions", page.functions(), page.nextToken())).build();}@@ -818,7 +818,7 @@ public class GlueJsonHandler {}private Response handleListRegistries(JsonNode request) {- var page = schemaRegistryService.listRegistries(readMaxResults(request), readNextToken(request));+ GlueSchemaRegistryService.Page<Registry> page = schemaRegistryService.listRegistries(readMaxResults(request), readNextToken(request));return Response.ok(pageResponse("Registries", registryListItems(page.items()), page.nextToken())).build();}@@ -869,7 +869,7 @@ public class GlueJsonHandler {Map<String, String> tags = request.has("Tags")? mapper.convertValue(request.get("Tags"), Map.class): null;- var result = schemaRegistryService.createSchema(+ GlueSchemaRegistryService.SchemaWithFirstVersion result = schemaRegistryService.createSchema(registryId, schemaName, dataFormat, compatibility, description, definition, tags, region);Schema schema = result.schema();SchemaVersion version = result.firstVersion();@@ -958,14 +958,14 @@ public class GlueJsonHandler {private Response handleListSchemas(JsonNode request, String region) throws Exception {RegistryId registryId = readRegistryId(request);- var page = schemaRegistryService.listSchemas(+ GlueSchemaRegistryService.Page<Schema> page = schemaRegistryService.listSchemas(registryId, region, readMaxResults(request), readNextToken(request));return Response.ok(pageResponse("Schemas", schemaListItems(page.items()), page.nextToken())).build();}private Response handleListSchemaVersions(JsonNode request, String region) throws Exception {SchemaId schemaId = readSchemaId(request);- var page = schemaRegistryService.listSchemaVersions(+ GlueSchemaRegistryService.Page<SchemaVersion> page = schemaRegistryService.listSchemaVersions(schemaId, region, readMaxResults(request), readNextToken(request));return Response.ok(pageResponse("Schemas", schemaVersionListItems(page.items()), page.nextToken())).build();}@@ -983,10 +983,10 @@ public class GlueJsonHandler {private Response handleDeleteSchemaVersions(JsonNode request, String region) throws Exception {SchemaId schemaId = readSchemaId(request);String versions = request.path("Versions").asText(null);- var results = schemaRegistryService.deleteSchemaVersions(schemaId, versions, region);+ List<GlueSchemaRegistryService.VersionDeletionResult> results = schemaRegistryService.deleteSchemaVersions(schemaId, versions, region);List<Map<String, Object>> errors = new ArrayList<>();- for (var r : results) {+ for (GlueSchemaRegistryService.VersionDeletionResult r : results) {if (r.errorCode() != null) {Map<String, Object> err = new LinkedHashMap<>();err.put("VersionNumber", r.versionNumber());@@ -1013,7 +1013,7 @@ public class GlueJsonHandler {private Response handleCheckSchemaVersionValidity(JsonNode request) {String dataFormat = request.path("DataFormat").asText(null);String definition = request.path("SchemaDefinition").asText(null);- var result = schemaRegistryService.checkSchemaVersionValidity(dataFormat, definition);+ GlueSchemaRegistryService.CheckValidityResult result = schemaRegistryService.checkSchemaVersionValidity(dataFormat, definition);Map<String, Object> response = new LinkedHashMap<>();response.put("Valid", result.valid());if (result.error() != null) {@@ -1119,7 +1119,7 @@ public class GlueJsonHandler {JsonNode kv = request.get("MetadataKeyValue");String key = kv != null ? kv.path("MetadataKey").asText(null) : null;String value = kv != null ? kv.path("MetadataValue").asText(null) : null;- var result = schemaRegistryService.putSchemaVersionMetadata(svId, key, value);+ GlueSchemaRegistryService.MetadataPutResult result = schemaRegistryService.putSchemaVersionMetadata(svId, key, value);return Response.ok(buildMetadataPutResponse(result)).build();}@@ -1128,7 +1128,7 @@ public class GlueJsonHandler {JsonNode kv = request.get("MetadataKeyValue");String key = kv != null ? kv.path("MetadataKey").asText(null) : null;String value = kv != null ? kv.path("MetadataValue").asText(null) : null;- var result = schemaRegistryService.removeSchemaVersionMetadata(svId, key, value);+ GlueSchemaRegistryService.MetadataPutResult result = schemaRegistryService.removeSchemaVersionMetadata(svId, key, value);return Response.ok(buildMetadataPutResponse(result)).build();}diff --git a/src/main/java/io/github/hectorvent/floci/services/iam/IamQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/iam/IamQueryHandler.javaindex b56fe230b7..b77d9741b5 100644--- a/src/main/java/io/github/hectorvent/floci/services/iam/IamQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/iam/IamQueryHandler.java@@ -320,7 +320,7 @@ public class IamQueryHandler {private Response handleListUsers(MultivaluedMap<String, String> params) {String pathPrefix = getParam(params, "PathPrefix");List<IamUser> userList = iamService.listUsers(pathPrefix);- var xml = new XmlBuilder().start("Users");+ XmlBuilder xml = new XmlBuilder().start("Users");for (IamUser u : userList) {xml.start("member").raw(userXml(u, false)).end("member");}@@ -526,7 +526,7 @@ public class IamQueryHandler {}private Response handleListSAMLProviders(String authorization) {- var xml = new XmlBuilder().start("SAMLProviderList");+ XmlBuilder xml = new XmlBuilder().start("SAMLProviderList");for (SAMLProvider provider : samlProviderService.list(accountResolver.resolve(authorization))) {xml.start("member").elem("Arn", provider.getArn()).end("member");}@@ -593,7 +593,7 @@ public class IamQueryHandler {// ListOpenIDConnectProviders is not paginated and carries only ARNs — the client fetches// the rest with GetOpenIDConnectProvider.private Response handleListOpenIDConnectProviders(MultivaluedMap<String, String> params) {- var xml = new XmlBuilder().start("OpenIDConnectProviderList");+ XmlBuilder xml = new XmlBuilder().start("OpenIDConnectProviderList");for (OpenIDConnectProvider provider : iamService.listOpenIDConnectProviders()) {xml.start("member").elem("Arn", provider.getArn()).end("member");}@@ -607,7 +607,7 @@ public class IamQueryHandler {getMemberList(params, "ClientIDList"),getMemberList(params, "ThumbprintList"),extractTags(params, false));- var xml = new XmlBuilder().elem("OpenIDConnectProviderArn", provider.getArn());+ XmlBuilder xml = new XmlBuilder().elem("OpenIDConnectProviderArn", provider.getArn());if (!provider.getTags().isEmpty()) {xml.start("Tags").raw(tagsXml(provider.getTags())).end("Tags");}@@ -619,7 +619,7 @@ public class IamQueryHandler {private Response handleGetOpenIDConnectProvider(MultivaluedMap<String, String> params) {OpenIDConnectProvider provider =iamService.getOpenIDConnectProvider(getParam(params, "OpenIDConnectProviderArn"));- var xml = new XmlBuilder().elem("Url", provider.getUrl());+ XmlBuilder xml = new XmlBuilder().elem("Url", provider.getUrl());xml.start("ClientIDList");for (String clientId : provider.getClientIdList()) {xml.elem("member", clientId);@@ -699,7 +699,7 @@ public class IamQueryHandler {// ListAccountAliases is paginated on the wire (IsTruncated) even though an account can only// ever hold one alias, so the envelope carries the flag to match the AWS response shape.private Response handleListAccountAliases(MultivaluedMap<String, String> params) {- var xml = new XmlBuilder().start("AccountAliases");+ XmlBuilder xml = new XmlBuilder().start("AccountAliases");iamService.getAccountAlias().ifPresent(alias -> xml.elem("member", alias));xml.end("AccountAliases").elem("IsTruncated", false);return Response.ok(AwsQueryResponse.envelope("ListAccountAliases", AwsNamespaces.IAM, xml.build())).build();@@ -755,7 +755,7 @@ public class IamQueryHandler {}private String passwordPolicyXml(AccountPasswordPolicy policy) {- var xml = new XmlBuilder().start("PasswordPolicy")+ XmlBuilder xml = new XmlBuilder().start("PasswordPolicy").elem("MinimumPasswordLength", policy.getMinimumPasswordLength()).elem("RequireSymbols", policy.isRequireSymbols()).elem("RequireNumbers", policy.isRequireNumbers())@@ -853,7 +853,7 @@ public class IamQueryHandler {return Stream.empty();}}).toList();- var xml = new XmlBuilder()+ XmlBuilder xml = new XmlBuilder().start("Group").raw(groupXml(group)).end("Group").start("Users");for (IamUser u : members) {@@ -876,7 +876,7 @@ public class IamQueryHandler {private Response handleListGroups(MultivaluedMap<String, String> params) {List<IamGroup> groupList = iamService.listGroups(getParam(params, "PathPrefix"));- var xml = new XmlBuilder().start("Groups");+ XmlBuilder xml = new XmlBuilder().start("Groups");for (IamGroup g : groupList) {xml.start("member").raw(groupXml(g)).end("member");}@@ -896,7 +896,7 @@ public class IamQueryHandler {private Response handleListGroupsForUser(MultivaluedMap<String, String> params) {List<IamGroup> groupList = iamService.listGroupsForUser(getParam(params, "UserName"));- var xml = new XmlBuilder().start("Groups");+ XmlBuilder xml = new XmlBuilder().start("Groups");for (IamGroup g : groupList) {xml.start("member").raw(groupXml(g)).end("member");}@@ -955,7 +955,7 @@ public class IamQueryHandler {private Response handleListRoles(MultivaluedMap<String, String> params) {List<IamRole> roleList = iamService.listRoles(getParam(params, "PathPrefix"));- var xml = new XmlBuilder().start("Roles");+ XmlBuilder xml = new XmlBuilder().start("Roles");for (IamRole r : roleList) {xml.start("member").raw(roleXml(r, false)).end("member");}@@ -1022,7 +1022,7 @@ public class IamQueryHandler {private Response handleListPolicies(MultivaluedMap<String, String> params) {List<IamPolicy> policyList = iamService.listPolicies(getParam(params, "Scope"), getParam(params, "PathPrefix"));- var xml = new XmlBuilder().start("Policies");+ XmlBuilder xml = new XmlBuilder().start("Policies");for (IamPolicy p : policyList) {xml.start("member").raw(policyXml(p, false)).end("member");}@@ -1032,7 +1032,7 @@ public class IamQueryHandler {private Response handleListEntitiesForPolicy(MultivaluedMap<String, String> params) {IamService.PolicyEntities entities = iamService.listEntitiesForPolicy(getParam(params, "PolicyArn"));- var xml = new XmlBuilder().start("PolicyGroups");+ XmlBuilder xml = new XmlBuilder().start("PolicyGroups");for (IamGroup group : entities.groups()) {xml.start("member").elem("GroupName", group.getGroupName()).elem("GroupId", group.getGroupId()).end("member");@@ -1052,7 +1052,7 @@ public class IamQueryHandler {}private Response handleGetAccountSummary(MultivaluedMap<String, String> params) {- var xml = new XmlBuilder().start("SummaryMap");+ XmlBuilder xml = new XmlBuilder().start("SummaryMap");for (Map.Entry<String, Long> entry : iamService.getAccountSummary().entrySet()) {xml.start("entry").elem("key", entry.getKey()).elem("value", entry.getValue()).end("entry");}@@ -1234,7 +1234,7 @@ public class IamQueryHandler {private Response handleListPolicyVersions(MultivaluedMap<String, String> params) {List<PolicyVersion> versions = iamService.listPolicyVersions(getParam(params, "PolicyArn"));- var xml = new XmlBuilder().start("Versions");+ XmlBuilder xml = new XmlBuilder().start("Versions");for (PolicyVersion v : versions) {xml.start("member").raw(policyVersionXml(v)).end("member");}@@ -1437,7 +1437,7 @@ public class IamQueryHandler {private Response handleListAccessKeys(MultivaluedMap<String, String> params, String authorization) {List<AccessKey> keys = iamService.listAccessKeys(resolveUserName(params, authorization));- var xml = new XmlBuilder().start("AccessKeyMetadata");+ XmlBuilder xml = new XmlBuilder().start("AccessKeyMetadata");for (AccessKey k : keys) {xml.start("member").raw(accessKeyXml(k, false)).end("member");}@@ -1540,7 +1540,7 @@ public class IamQueryHandler {private Response handleListInstanceProfiles(MultivaluedMap<String, String> params) {List<InstanceProfile> profiles = iamService.listInstanceProfiles(getParam(params, "PathPrefix"));- var xml = new XmlBuilder().start("InstanceProfiles");+ XmlBuilder xml = new XmlBuilder().start("InstanceProfiles");for (InstanceProfile p : profiles) {// Documented listing subset: tags are omitted here, unlike GetInstanceProfile.xml.start("member").raw(instanceProfileXml(p, false)).end("member");@@ -1561,7 +1561,7 @@ public class IamQueryHandler {private Response handleListInstanceProfilesForRole(MultivaluedMap<String, String> params) {List<InstanceProfile> profiles = iamService.listInstanceProfilesForRole(getParam(params, "RoleName"));- var xml = new XmlBuilder().start("InstanceProfiles");+ XmlBuilder xml = new XmlBuilder().start("InstanceProfiles");for (InstanceProfile p : profiles) {xml.start("member").raw(instanceProfileXml(p, true)).end("member");}@@ -2215,7 +2215,7 @@ public class IamQueryHandler {}private String accessKeyXml(AccessKey k, boolean includeSecret) {- var xml = new XmlBuilder()+ XmlBuilder xml = new XmlBuilder().elem("UserName", k.getUserName()).elem("AccessKeyId", k.getAccessKeyId()).elem("Status", k.getStatus());@@ -2232,7 +2232,7 @@ public class IamQueryHandler {// and the InstanceProfileList embedded in GetAccountAuthorizationDetails's RoleDetail carry// no such note, so they stay detailed.private String instanceProfileXml(InstanceProfile p, boolean detailed) {- var xml = new XmlBuilder()+ XmlBuilder xml = new XmlBuilder().elem("InstanceProfileName", p.getInstanceProfileName()).elem("InstanceProfileId", p.getInstanceProfileId()).elem("Arn", p.getArn())@@ -2250,7 +2250,7 @@ public class IamQueryHandler {}private String attachedPoliciesXml(List<IamPolicy> policyList) {- var xml = new XmlBuilder().start("AttachedPolicies");+ XmlBuilder xml = new XmlBuilder().start("AttachedPolicies");for (IamPolicy p : policyList) {xml.start("member").elem("PolicyName", p.getPolicyName())@@ -2261,7 +2261,7 @@ public class IamQueryHandler {}private String inlinePolicyNamesXml(List<String> names) {- var xml = new XmlBuilder().start("PolicyNames");+ XmlBuilder xml = new XmlBuilder().start("PolicyNames");for (String name : names) {xml.elem("member", name);}@@ -2285,8 +2285,8 @@ public class IamQueryHandler {}private String tagsXml(Map<String, String> tags) {- var xml = new XmlBuilder();- for (var entry : tags.entrySet()) {+ XmlBuilder xml = new XmlBuilder();+ for (Map.Entry<String, String> entry : tags.entrySet()) {xml.start("member").elem("Key", entry.getKey()).elem("Value", entry.getValue())diff --git a/src/main/java/io/github/hectorvent/floci/services/iam/ResourceArnBuilder.java b/src/main/java/io/github/hectorvent/floci/services/iam/ResourceArnBuilder.javaindex 66ca4d882c..c14860f8e3 100644--- a/src/main/java/io/github/hectorvent/floci/services/iam/ResourceArnBuilder.java+++ b/src/main/java/io/github/hectorvent/floci/services/iam/ResourceArnBuilder.java@@ -12,6 +12,7 @@ import java.io.ByteArrayInputStream;import java.io.IOException;import java.io.InputStream;import java.util.ArrayList;+import java.util.Iterator;import java.util.LinkedHashSet;import java.util.List;import java.util.Set;@@ -153,7 +154,7 @@ public class ResourceArnBuilder {}}if (json.path("TableCreationParameters").hasNonNull("TableName")) {- var tableName = json.path("TableCreationParameters").get("TableName").asText().trim();+ String tableName = json.path("TableCreationParameters").get("TableName").asText().trim();if (!tableName.isEmpty()) {return List.of(toDynamoDbTableArn(tableName, region, accountId));}@@ -183,14 +184,14 @@ public class ResourceArnBuilder {}}if (json.hasNonNull("ImportArn")) {- var importArn = json.get("ImportArn").asText().trim();+ String importArn = json.get("ImportArn").asText().trim();if (!importArn.isEmpty()) {return List.of(importArn);}}if (json.hasNonNull("RequestItems") && json.get("RequestItems").isObject()) {Set<String> arns = new LinkedHashSet<>();- var fieldNames = json.get("RequestItems").fieldNames();+ Iterator<String> fieldNames = json.get("RequestItems").fieldNames();while (fieldNames.hasNext()) {String table = fieldNames.next().trim();if (!table.isEmpty()) {diff --git a/src/main/java/io/github/hectorvent/floci/services/iam/SAMLAssertionVerifier.java b/src/main/java/io/github/hectorvent/floci/services/iam/SAMLAssertionVerifier.javaindex 4cf880d1bb..de82f5e555 100644--- a/src/main/java/io/github/hectorvent/floci/services/iam/SAMLAssertionVerifier.java+++ b/src/main/java/io/github/hectorvent/floci/services/iam/SAMLAssertionVerifier.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.iam;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsRegionFacts;import io.github.hectorvent.floci.services.iam.model.SAMLProvider;+import org.w3c.dom.Document;import org.w3c.dom.Element;import org.w3c.dom.NodeList;@@ -43,7 +44,7 @@ final class SAMLAssertionVerifier {static Verified verify(String encoded, SAMLProvider provider, Instant now) throws InvalidAssertionException {try {byte[] bytes = Base64.getDecoder().decode(encoded);- var document = SAMLXml.document(new String(bytes, java.nio.charset.StandardCharsets.UTF_8));+ Document document = SAMLXml.document(new String(bytes, StandardCharsets.UTF_8));Element assertion = document.getDocumentElement();if ("Response".equals(assertion.getLocalName())) {assertion = first(assertion, SAML, "Assertion");@@ -74,7 +75,7 @@ final class SAMLAssertionVerifier {}}X509Certificate certificate = certificate(provider.getCertificate());- var context = new DOMValidateContext(certificate.getPublicKey(), signature);+ DOMValidateContext context = new DOMValidateContext(certificate.getPublicKey(), signature);context.setProperty("org.jcp.xml.dsig.secureValidation", Boolean.TRUE);XMLSignature xmlSignature = XMLSignatureFactory.getInstance("DOM").unmarshalXMLSignature(context);if (xmlSignature.getSignedInfo().getReferences().size() != 1diff --git a/src/main/java/io/github/hectorvent/floci/services/iam/SAMLProviderService.java b/src/main/java/io/github/hectorvent/floci/services/iam/SAMLProviderService.javaindex e4ab833bdc..e1b3c52f12 100644--- a/src/main/java/io/github/hectorvent/floci/services/iam/SAMLProviderService.java+++ b/src/main/java/io/github/hectorvent/floci/services/iam/SAMLProviderService.java@@ -9,12 +9,14 @@ import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.iam.model.SAMLProvider;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;+import org.w3c.dom.Document;import java.util.Base64;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.Optional;+import java.util.regex.Matcher;import java.util.regex.Pattern;/** Minimal IAM SAML provider registry used by STS assertion verification. */@@ -76,7 +78,7 @@ public class SAMLProviderService {}public Optional<SAMLProvider> find(String arn) {- var matcher = ARN.matcher(arn == null ? "" : arn);+ Matcher matcher = ARN.matcher(arn == null ? "" : arn);if (matcher.matches()) {return findForAccount(matcher.group(1), arn);}@@ -84,7 +86,7 @@ public class SAMLProviderService {}public Optional<SAMLProvider> findForAccount(String accountId, String arn) {- var matcher = ARN.matcher(arn == null ? "" : arn);+ Matcher matcher = ARN.matcher(arn == null ? "" : arn);if (!matcher.matches() || !matcher.group(1).equals(accountId)) {return Optional.empty();}@@ -213,9 +215,9 @@ public class SAMLProviderService {record Parsed(String entityId, String certificateBase64) {}static Parsed parse(String metadata) throws Exception {- var doc = SAMLXml.document(metadata);- var entity = doc.getDocumentElement().getAttribute("entityID");- var cert = SAMLXml.text(doc, "X509Certificate");+ Document doc = SAMLXml.document(metadata);+ String entity = doc.getDocumentElement().getAttribute("entityID");+ String cert = SAMLXml.text(doc, "X509Certificate");if (entity == null || entity.isBlank() || cert == null || cert.isBlank()) {throw new Exception();}diff --git a/src/main/java/io/github/hectorvent/floci/services/iam/SAMLTrustPolicyEvaluator.java b/src/main/java/io/github/hectorvent/floci/services/iam/SAMLTrustPolicyEvaluator.javaindex 7ec8eb3d39..9114cf584e 100644--- a/src/main/java/io/github/hectorvent/floci/services/iam/SAMLTrustPolicyEvaluator.java+++ b/src/main/java/io/github/hectorvent/floci/services/iam/SAMLTrustPolicyEvaluator.java@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;+import java.util.Iterator;import java.util.List;import java.util.Map;@@ -54,15 +55,15 @@ public class SAMLTrustPolicyEvaluator {if (!condition.isObject()) {return false;}- var operators = condition.fields();+ Iterator<Map.Entry<String, JsonNode>> operators = condition.fields();while (operators.hasNext()) {- var operator = operators.next();+ Map.Entry<String, JsonNode> operator = operators.next();if (!operator.getValue().isObject()) {return false;}- var entries = operator.getValue().fields();+ Iterator<Map.Entry<String, JsonNode>> entries = operator.getValue().fields();while (entries.hasNext()) {- var entry = entries.next();+ Map.Entry<String, JsonNode> entry = entries.next();String key = entry.getKey();int colon = key.indexOf(':');String claimName = colon < 0 ? key : key.substring(colon + 1);diff --git a/src/main/java/io/github/hectorvent/floci/services/iam/WebIdentityTrustPolicyEvaluator.java b/src/main/java/io/github/hectorvent/floci/services/iam/WebIdentityTrustPolicyEvaluator.javaindex 83c3476dfa..62345c59eb 100644--- a/src/main/java/io/github/hectorvent/floci/services/iam/WebIdentityTrustPolicyEvaluator.java+++ b/src/main/java/io/github/hectorvent/floci/services/iam/WebIdentityTrustPolicyEvaluator.java@@ -7,6 +7,7 @@ import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;+import java.util.Iterator;import java.util.List;import java.util.Map;@@ -174,17 +175,17 @@ public class WebIdentityTrustPolicyEvaluator {return false;}- var operators = conditionNode.fields();+ Iterator<Map.Entry<String, JsonNode>> operators = conditionNode.fields();while (operators.hasNext()) {- var operatorEntry = operators.next();+ Map.Entry<String, JsonNode> operatorEntry = operators.next();String operator = operatorEntry.getKey();JsonNode keys = operatorEntry.getValue();if (!keys.isObject()) {return false;}- var keyIterator = keys.fields();+ Iterator<Map.Entry<String, JsonNode>> keyIterator = keys.fields();while (keyIterator.hasNext()) {- var keyEntry = keyIterator.next();+ Map.Entry<String, JsonNode> keyEntry = keyIterator.next();if (!keySatisfied(operator, keyEntry.getKey(), keyEntry.getValue(),issuerKeyPrefix, claims)) {return false;diff --git a/src/main/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreJsonHandler.javaindex 449bc0d620..0aac6d56f0 100644--- a/src/main/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreJsonHandler.java@@ -5,6 +5,7 @@ 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.AwsException;+import io.github.hectorvent.floci.core.common.PaginatedResult;import io.github.hectorvent.floci.services.identitystore.model.Group;import io.github.hectorvent.floci.services.identitystore.model.Membership;import io.github.hectorvent.floci.services.identitystore.model.User;@@ -12,6 +13,9 @@ import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;+import java.time.Instant;+import java.util.List;+@ApplicationScopedpublic class IdentityStoreJsonHandler {private static final String ENTERPRISE_EXTENSION = "aws:identitystore:enterprise";@@ -60,7 +64,7 @@ public class IdentityStoreJsonHandler {}private Response listGroups(JsonNode request) {- var page = service.listGroups(request);+ PaginatedResult<Group> page = service.listGroups(request);ObjectNode out = mapper.createObjectNode();ArrayNode array = out.putArray("Groups");for (Group group : page.items()) {@@ -95,7 +99,7 @@ public class IdentityStoreJsonHandler {private Response listUsers(JsonNode request) {boolean includeExtensions = includeExtensions(request);- var page = service.listUsers(request);+ PaginatedResult<User> page = service.listUsers(request);ObjectNode out = mapper.createObjectNode();ArrayNode array = out.putArray("Users");for (User user : page.items()) {@@ -132,7 +136,7 @@ public class IdentityStoreJsonHandler {}private Response listGroupMemberships(JsonNode request) {- var page = service.listGroupMemberships(request);+ PaginatedResult<Membership> page = service.listGroupMemberships(request);ObjectNode out = mapper.createObjectNode();ArrayNode result = out.putArray("GroupMemberships");for (Membership membership : page.items()) {@@ -145,7 +149,7 @@ public class IdentityStoreJsonHandler {}private Response listGroupMembershipsForMember(JsonNode request) {- var page = service.listGroupMembershipsForMember(request);+ PaginatedResult<Membership> page = service.listGroupMembershipsForMember(request);ObjectNode out = mapper.createObjectNode();ArrayNode result = out.putArray("GroupMemberships");for (Membership membership : page.items()) {@@ -160,7 +164,7 @@ public class IdentityStoreJsonHandler {private Response isMemberInGroups(JsonNode request) {String storeId = IdentityStoreService.required(request, "IdentityStoreId");String userId = IdentityStoreService.memberUserId(request.get("MemberId"));- var groupIds = service.validateGroupIds(request.get("GroupIds"));+ List<String> groupIds = service.validateGroupIds(request.get("GroupIds"));ObjectNode out = mapper.createObjectNode();ArrayNode results = out.putArray("Results");for (String groupId : groupIds) {@@ -238,7 +242,7 @@ public class IdentityStoreJsonHandler {private static void putTimestamp(ObjectNode target, String field, String timestamp) {if (timestamp != null) {- var instant = java.time.Instant.parse(timestamp);+ Instant instant = Instant.parse(timestamp);double unixTimestamp = instant.getEpochSecond() + instant.getNano() / 1_000_000_000.0;target.put(field, unixTimestamp);}diff --git a/src/main/java/io/github/hectorvent/floci/services/identitystore/ScimController.java b/src/main/java/io/github/hectorvent/floci/services/identitystore/ScimController.javaindex 21140ead48..0cba2baa95 100644--- a/src/main/java/io/github/hectorvent/floci/services/identitystore/ScimController.java+++ b/src/main/java/io/github/hectorvent/floci/services/identitystore/ScimController.java@@ -32,6 +32,7 @@ import jakarta.ws.rs.core.UriInfo;import java.nio.charset.StandardCharsets;import java.security.MessageDigest;import java.util.Base64;+import java.util.Iterator;import java.util.List;import java.util.Map;import java.util.regex.Matcher;@@ -738,7 +739,7 @@ public class ScimController {ArrayNode targetArray = target.putArray(targetField);for (JsonNode item : array) {ObjectNode targetItem = targetArray.addObject();- for (var field : fields.entrySet()) {+ for (Map.Entry<String, String> field : fields.entrySet()) {JsonNode value = item.get(field.getKey());if (value != null && !value.isNull()) {targetItem.set(field.getValue(), value.deepCopy());@@ -756,7 +757,7 @@ public class ScimController {ArrayNode targetArray = target.putArray(targetField);for (JsonNode item : array) {ObjectNode targetItem = targetArray.addObject();- for (var field : fields.entrySet()) {+ for (Map.Entry<String, String> field : fields.entrySet()) {JsonNode value = item.get(field.getKey());if (value != null && !value.isNull()) {targetItem.set(field.getValue(), value.deepCopy());@@ -805,9 +806,9 @@ public class ScimController {if (!value.isObject() || value.isEmpty()) {throw validation("A patch operation without path must provide an object value.");}- var fields = value.fields();+ Iterator<Map.Entry<String, JsonNode>> fields = value.fields();while (fields.hasNext()) {- var entry = fields.next();+ Map.Entry<String, JsonNode> entry = fields.next();validatePatchUserAttribute(identityStoreId, userId, op, entry.getKey(), entry.getValue());if ("userName".equals(entry.getKey())) {userNameChanges++;@@ -914,9 +915,9 @@ public class ScimController {String path = optionalText(operation, "path");JsonNode value = operation.get("value");if (path == null) {- var fields = value.fields();+ Iterator<Map.Entry<String, JsonNode>> fields = value.fields();while (fields.hasNext()) {- var entry = fields.next();+ Map.Entry<String, JsonNode> entry = fields.next();applyPatchUserAttribute(identityStoreId, userId, op, entry.getKey(), entry.getValue());}} else {diff --git a/src/main/java/io/github/hectorvent/floci/services/inspector2/Inspector2Controller.java b/src/main/java/io/github/hectorvent/floci/services/inspector2/Inspector2Controller.javaindex 5d2d263639..9708478e8e 100644--- a/src/main/java/io/github/hectorvent/floci/services/inspector2/Inspector2Controller.java+++ b/src/main/java/io/github/hectorvent/floci/services/inspector2/Inspector2Controller.java@@ -2,6 +2,8 @@ package io.github.hectorvent.floci.services.inspector2;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.AwsException;import io.github.hectorvent.floci.core.common.JsonErrorResponseUtils;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -18,6 +20,8 @@ import jakarta.ws.rs.core.HttpHeaders;import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.Response;+import java.util.Map;+@Path("/")@Produces(MediaType.APPLICATION_JSON)@Consumes(MediaType.APPLICATION_JSON)@@ -50,8 +54,8 @@ public class Inspector2Controller {throw new AwsException("ValidationException", "nextToken is invalid.", 400);}InspectorState state = service.delegatedAdminState(region(headers), requestContext.getAccountId());- var response = objectMapper.createObjectNode();- var accounts = response.putArray("delegatedAdminAccounts");+ ObjectNode response = objectMapper.createObjectNode();+ ArrayNode accounts = response.putArray("delegatedAdminAccounts");if (state.getAdminAccountId() != null) {accounts.addObject().put("accountId", state.getAdminAccountId()).put("status", "ENABLED");}@@ -64,7 +68,7 @@ public class Inspector2Controller {JsonNode request = parse(body);String accountId = request.path("delegatedAdminAccountId").asText(null);service.enableDelegatedAdmin(region(headers), requestContext.getAccountId(), accountId);- var response = objectMapper.createObjectNode();+ ObjectNode response = objectMapper.createObjectNode();response.put("delegatedAdminAccountId", accountId);return Response.ok(response).build();}@@ -75,7 +79,7 @@ public class Inspector2Controller {JsonNode request = parse(body);String accountId = request.path("delegatedAdminAccountId").asText(null);service.disableDelegatedAdmin(region(headers), requestContext.getAccountId(), accountId);- var response = objectMapper.createObjectNode();+ ObjectNode response = objectMapper.createObjectNode();response.put("delegatedAdminAccountId", accountId);return Response.ok(response).build();}@@ -90,12 +94,12 @@ public class Inspector2Controller {"accountIds must contain at most 100 account IDs.", 400);}java.util.List<String> requestedAccounts = requestedAccounts(accountIds);- var response = objectMapper.createObjectNode();- var accounts = response.putArray("accounts");+ ObjectNode response = objectMapper.createObjectNode();+ ArrayNode accounts = response.putArray("accounts");for (String accountId : requestedAccounts) {InspectorState state = service.accountStatus(region(headers), requestContext.getAccountId(), accountId);- var account = accounts.addObject();+ ObjectNode account = accounts.addObject();account.put("accountId", accountId);account.set("state", stateNode(state.getStatus()));account.set("resourceState", resourceState(state));@@ -108,11 +112,11 @@ public class Inspector2Controller {@Path("/enable")public Response enable(@Context HttpHeaders headers, String body) {JsonNode request = parse(body);- var enabled = service.enable(region(headers), requestContext.getAccountId(), request);- var response = objectMapper.createObjectNode();- var accounts = response.putArray("accounts");+ Map<String, InspectorState> enabled = service.enable(region(headers), requestContext.getAccountId(), request);+ ObjectNode response = objectMapper.createObjectNode();+ ArrayNode accounts = response.putArray("accounts");enabled.forEach((accountId, state) -> {- var account = accounts.addObject();+ ObjectNode account = accounts.addObject();account.put("accountId", accountId);account.put("status", state.getStatus());account.set("resourceStatus", resourceStatus(state));@@ -137,8 +141,8 @@ public class Inspector2Controller {}private com.fasterxml.jackson.databind.node.ObjectNode organizationConfigurationResponse(InspectorState state) {- var response = objectMapper.createObjectNode();- var autoEnable = response.putObject("autoEnable");+ ObjectNode response = objectMapper.createObjectNode();+ ObjectNode autoEnable = response.putObject("autoEnable");autoEnable.put("ec2", state.isAutoEnableEc2());autoEnable.put("ecr", state.isAutoEnableEcr());autoEnable.put("lambda", state.isAutoEnableLambda());@@ -161,7 +165,7 @@ public class Inspector2Controller {}private com.fasterxml.jackson.databind.node.ObjectNode resourceState(InspectorState state) {- var resources = objectMapper.createObjectNode();+ ObjectNode resources = objectMapper.createObjectNode();resources.set("ec2", stateNode(state.getEc2Status()));resources.set("ecr", stateNode(state.getEcrStatus()));resources.set("lambda", stateNode(state.getLambdaStatus()));@@ -171,7 +175,7 @@ public class Inspector2Controller {}private com.fasterxml.jackson.databind.node.ObjectNode resourceStatus(InspectorState state) {- var resources = objectMapper.createObjectNode();+ ObjectNode resources = objectMapper.createObjectNode();resources.put("ec2", state.getEc2Status());resources.put("ecr", state.getEcrStatus());resources.put("lambda", state.getLambdaStatus());@@ -181,7 +185,7 @@ public class Inspector2Controller {}private com.fasterxml.jackson.databind.node.ObjectNode stateNode(String status) {- var state = objectMapper.createObjectNode();+ ObjectNode state = objectMapper.createObjectNode();state.put("status", status);return state;}diff --git a/src/main/java/io/github/hectorvent/floci/services/iot/IotDataController.java b/src/main/java/io/github/hectorvent/floci/services/iot/IotDataController.javaindex c347acc3dd..54c2045789 100644--- a/src/main/java/io/github/hectorvent/floci/services/iot/IotDataController.java+++ b/src/main/java/io/github/hectorvent/floci/services/iot/IotDataController.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.iot;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.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -76,7 +77,7 @@ public class IotDataController {public Response listNamedShadowsForThing(@Context HttpHeaders headers,@PathParam("thingName") String thingName) {ObjectNode response = objectMapper.createObjectNode();- var results = response.putArray("results");+ ArrayNode results = response.putArray("results");iotService.listNamedShadowsForThing(thingName, regionResolver.resolveRegion(headers)).forEach(results::add);return Response.ok(response).build();}@@ -112,7 +113,7 @@ public class IotDataController {@QueryParam("nextToken") String nextToken) {IotService.Page<String> page = iotService.listSubscriptions(clientId, maxResults, nextToken);ObjectNode response = objectMapper.createObjectNode();- var subscriptions = response.putArray("subscriptions");+ ArrayNode subscriptions = response.putArray("subscriptions");for (String topicFilter : page.items()) {ObjectNode subscription = subscriptions.addObject();subscription.put("topicFilter", topicFilter);@@ -172,7 +173,7 @@ public class IotDataController {@QueryParam("nextToken") String nextToken) {IotService.Page<IotRetainedMessage> page = iotService.listRetainedMessages(maxResults, nextToken);ObjectNode response = objectMapper.createObjectNode();- var topics = response.putArray("retainedTopics");+ ArrayNode topics = response.putArray("retainedTopics");for (IotRetainedMessage retained : page.items()) {ObjectNode item = topics.addObject();item.put("topic", retained.getTopic());diff --git a/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisJsonHandler.javaindex 8f84cb43f3..ce5f34e895 100644--- a/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisJsonHandler.java@@ -314,7 +314,7 @@ public class KinesisJsonHandler {private Response handleRegisterStreamConsumer(JsonNode request, String region) {String streamArn = request.path("StreamARN").asText();String consumerName = request.path("ConsumerName").asText();- var consumer = service.registerStreamConsumer(streamArn, consumerName, region);+ KinesisConsumer consumer = service.registerStreamConsumer(streamArn, consumerName, region);ObjectNode response = objectMapper.createObjectNode();response.set("Consumer", consumerToNode(consumer));return Response.ok(response).build();@@ -332,7 +332,7 @@ public class KinesisJsonHandler {String streamArn = request.has("StreamARN") ? request.path("StreamARN").asText() : null;String consumerName = request.has("ConsumerName") ? request.path("ConsumerName").asText() : null;String consumerArn = request.has("ConsumerARN") ? request.path("ConsumerARN").asText() : null;- var consumer = service.describeStreamConsumer(streamArn, consumerName, consumerArn, region);+ KinesisConsumer consumer = service.describeStreamConsumer(streamArn, consumerName, consumerArn, region);ObjectNode response = objectMapper.createObjectNode();response.set("ConsumerDescription", consumerToNode(consumer));return Response.ok(response).build();@@ -340,7 +340,7 @@ public class KinesisJsonHandler {private Response handleListStreamConsumers(JsonNode request, String region) {String streamArn = request.path("StreamARN").asText();- var consumers = service.listStreamConsumers(streamArn, region);+ List<KinesisConsumer> consumers = service.listStreamConsumers(streamArn, region);ObjectNode response = objectMapper.createObjectNode();ArrayNode array = response.putArray("Consumers");consumers.forEach(c -> array.add(consumerToNode(c)));diff --git a/src/main/java/io/github/hectorvent/floci/services/kinesisanalytics/container/FlinkRestClient.java b/src/main/java/io/github/hectorvent/floci/services/kinesisanalytics/container/FlinkRestClient.javaindex ca0de4e169..0ed3a8905f 100644--- a/src/main/java/io/github/hectorvent/floci/services/kinesisanalytics/container/FlinkRestClient.java+++ b/src/main/java/io/github/hectorvent/floci/services/kinesisanalytics/container/FlinkRestClient.java@@ -177,9 +177,9 @@ public class FlinkRestClient {if (resp.statusCode() != 200) {return null;}- var root = mapper.readTree(resp.body());+ JsonNode root = mapper.readTree(resp.body());String statusId = root.path("status").path("id").asText(null);- var operation = root.path("operation");+ JsonNode operation = root.path("operation");boolean failed = operation.has("failure-cause");String location = operation.path("location").asText(null);return new SavepointStatus(statusId, location, failed);diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/EsmStore.java b/src/main/java/io/github/hectorvent/floci/services/lambda/EsmStore.javaindex 7dd6bfc1c2..35a38bf681 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/EsmStore.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/EsmStore.java@@ -67,7 +67,7 @@ public class EsmStore {public List<EventSourceMapping> listByFunction(String functionKey) {return backend.scan(k -> {- var esm = backend.get(k).orElse(null);+ EventSourceMapping esm = backend.get(k).orElse(null);if (esm == null) return false;// Match by full ARN or by short function namereturn functionKey.equals(esm.getFunctionArn()) || functionKey.equals(esm.getFunctionName());diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/KinesisEventSourcePoller.java b/src/main/java/io/github/hectorvent/floci/services/lambda/KinesisEventSourcePoller.javaindex 581fab44b8..c476cad052 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/KinesisEventSourcePoller.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/KinesisEventSourcePoller.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.lambda;import com.fasterxml.jackson.core.JsonProcessingException;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;@@ -200,7 +201,7 @@ public class KinesisEventSourcePoller implements Resettable {private String buildKinesisEvent(List<KinesisRecord> records, EventSourceMapping esm, String shardId) {try {- var recordsArray = objectMapper.createArrayNode();+ ArrayNode recordsArray = objectMapper.createArrayNode();for (KinesisRecord rec : records) {ObjectNode kinesisNode = objectMapper.createObjectNode();kinesisNode.put("kinesisSchemaVersion", "1.0");diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaLayerController.java b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaLayerController.javaindex ea7cd2a2da..0fb88af5b8 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaLayerController.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaLayerController.java@@ -204,13 +204,13 @@ public class LambdaLayerController {* by a non-default account resolves the default-account bucket and 404s.*/private String tasksLocation(LambdaLayerVersion lv, String region, UriInfo uriInfo) {- var base = uriInfo.getBaseUri().toString();+ String base = uriInfo.getBaseUri().toString();if (base.endsWith("/")) {base = base.substring(0, base.length() - 1);}- var account = AwsArnUtils.accountOrDefault(lv.getLayerVersionArn(), "000000000000");- var bucket = LambdaService.tasksBucketName(region);- var key = LambdaService.layerObjectKey(account, lv.getLayerName(), lv.getVersion());+ String account = AwsArnUtils.accountOrDefault(lv.getLayerVersionArn(), "000000000000");+ String bucket = LambdaService.tasksBucketName(region);+ String key = LambdaService.layerObjectKey(account, lv.getLayerName(), lv.getVersion());return base + "/" + LambdaService.encodeObjectPath(bucket)+ "/" + LambdaService.encodeObjectPath(key)+ "?X-Amz-Credential=" + account + "%2F00010101%2F" + region + "%2Fs3%2Faws4_request";diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaLayerService.java b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaLayerService.javaindex 30a5edb141..86c793d317 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaLayerService.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaLayerService.java@@ -432,7 +432,7 @@ public class LambdaLayerService {return;}try {- var account = AwsArnUtils.accountOrDefault(lv.getLayerVersionArn(), "000000000000");+ String account = AwsArnUtils.accountOrDefault(lv.getLayerVersionArn(), "000000000000");s3Service.deleteObject(LambdaService.tasksBucketName(region),LambdaService.layerObjectKey(account, lv.getLayerName(), lv.getVersion()));} catch (Exception e) {diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePoller.java b/src/main/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePoller.javaindex 245c868ed2..29bc02039f 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePoller.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePoller.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.lambda;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;@@ -377,7 +378,7 @@ public class SqsEventSourcePoller implements Resettable {}Set<String> receivedIds = received.stream().map(Message::getMessageId).collect(Collectors.toSet());try {- var failures = objectMapper.readTree(result.getPayload()).get("batchItemFailures");+ JsonNode failures = objectMapper.readTree(result.getPayload()).get("batchItemFailures");if (failures == null || failures.isNull()) {return Set.of();}@@ -385,8 +386,8 @@ public class SqsEventSourcePoller implements Resettable {return failWholeBatch(esm, receivedIds, "batchItemFailures is not an array");}Set<String> failedIds = new HashSet<>();- for (var item : failures) {- var id = item.get("itemIdentifier");+ for (JsonNode item : failures) {+ JsonNode id = item.get("itemIdentifier");if (id == null || id.isNull() || id.asText().isEmpty()) {return failWholeBatch(esm, receivedIds, "entry has a missing, null or empty itemIdentifier");}@@ -410,7 +411,7 @@ public class SqsEventSourcePoller implements Resettable {String buildSqsEvent(List<Message> messages, EventSourceMapping esm) {try {- var records = objectMapper.createArrayNode();+ ArrayNode records = objectMapper.createArrayNode();for (Message msg : messages) {records.add(buildSqsRecordNode(msg, esm));}diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/LambdaRuntimeLauncherProducer.java b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/LambdaRuntimeLauncherProducer.javaindex 73929c88f4..07930be9f1 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/LambdaRuntimeLauncherProducer.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/LambdaRuntimeLauncherProducer.java@@ -43,7 +43,7 @@ public class LambdaRuntimeLauncherProducer {LambdaRuntimeLauncher launcher(EmulatorConfig config,Instance<ContainerLauncher> docker,Instance<KubernetesPodLauncher> kubernetes) {- var executor = requireValidExecutor(config);+ String executor = requireValidExecutor(config);if (executor.equals("kubernetes")) {LOG.info("Lambda executor: kubernetes (environments run as pods)");return kubernetes.get();@@ -52,7 +52,7 @@ public class LambdaRuntimeLauncherProducer {}private static String requireValidExecutor(EmulatorConfig config) {- var executor = config.services().lambda().executor().trim().toLowerCase(Locale.ROOT);+ String executor = config.services().lambda().executor().trim().toLowerCase(Locale.ROOT);if (!executor.equals("docker") && !executor.equals("kubernetes")) {throw new IllegalArgumentException("Unknown floci.services.lambda.executor '" + executordiff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/EksTokenMinter.java b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/EksTokenMinter.javaindex 3870b2e224..470399d145 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/EksTokenMinter.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/EksTokenMinter.java@@ -94,9 +94,9 @@ final class EksTokenMinter {if (!isAwsEksGetToken(exec)) {return Optional.empty();}- var execEnv = execEnv(exec);+ Map<String, String> execEnv = execEnv(exec);UnaryOperator<String> env = name -> execEnv.getOrDefault(name, System.getenv(name));- var args = parseArgs(exec, env);+ ExecArgs args = parseArgs(exec, env);return Optional.of(new CachingTokenSupplier(args.clusterName(), args.region(), execEnv));}@@ -109,14 +109,14 @@ final class EksTokenMinter {* profile-scoped kubeconfig silently resolves the wrong AWS identity.*/private static Map<String, String> execEnv(JsonNode exec) {- var envNode = exec.path("env");+ JsonNode envNode = exec.path("env");if (!envNode.isArray()) {return Map.of();}- var result = new LinkedHashMap<String, String>();- for (var entry : envNode) {- var name = entry.path("name").asText(null);- var value = entry.path("value").asText(null);+ LinkedHashMap<String, String> result = new LinkedHashMap<>();+ for (JsonNode entry : envNode) {+ String name = entry.path("name").asText(null);+ String value = entry.path("value").asText(null);if (name != null && value != null) {result.put(name, value);}@@ -125,12 +125,12 @@ final class EksTokenMinter {}static boolean isAwsEksGetToken(JsonNode exec) {- var command = exec.path("command").asText("");+ String command = exec.path("command").asText("");if (command.isBlank()) {return false;}- var fileName = Path.of(command).getFileName();- var commandName = fileName == null ? command : fileName.toString();+ Path fileName = Path.of(command).getFileName();+ String commandName = fileName == null ? command : fileName.toString();if (!"aws".equals(commandName)) { // partition-literal: kubeconfig exec commandreturn false;}@@ -148,7 +148,7 @@ final class EksTokenMinter {if (!args.isArray()) {return -1;}- for (var i = 0; i + 1 < args.size(); i++) {+ for (int i = 0; i + 1 < args.size(); i++) {if ("eks".equals(args.get(i).asText()) && "get-token".equals(args.get(i + 1).asText())) {return i;}@@ -165,15 +165,15 @@ final class EksTokenMinter {* the region fallback is deterministically testable regardless of the host's own environment.*/static ExecArgs parseArgs(JsonNode exec, UnaryOperator<String> env) {- var args = exec.path("args");- var subcommandIndex = findSubcommandIndex(args);+ JsonNode args = exec.path("args");+ int subcommandIndex = findSubcommandIndex(args);String clusterName = null;String region = null;- for (var i = 0; i < args.size(); i++) {+ for (int i = 0; i < args.size(); i++) {if (i == subcommandIndex || i == subcommandIndex + 1) {continue;}- var arg = args.get(i).asText();+ String arg = args.get(i).asText();if (isRoleOption(arg)) {throw new IllegalStateException("kubeconfig exec plugin 'aws eks get-token --role-arn' is not supported: the "@@ -182,7 +182,7 @@ final class EksTokenMinter {+ "that already have cluster access.");}if (("--cluster-name".equals(arg) || "--region".equals(arg)) && i + 1 < args.size()) {- var value = args.get(++i).asText();+ String value = args.get(++i).asText();if ("--cluster-name".equals(arg)) {clusterName = value;} else {@@ -222,7 +222,7 @@ final class EksTokenMinter {* with or without a {@code --flag=value} suffix, is rejected explicitly.*/private static boolean isRoleOption(String arg) {- var name = arg.split("=", 2)[0];+ String name = arg.split("=", 2)[0];return name.length() >= "--role".length() && "--role-arn".startsWith(name);}@@ -241,7 +241,7 @@ final class EksTokenMinter {@Overridepublic synchronized String get() {- var now = Instant.now();+ Instant now = Instant.now();if (token == null || !now.isBefore(expiresAt.minusSeconds(REFRESH_MARGIN_SECONDS))) {token = mint(clusterName, region, execEnv);expiresAt = now.plusSeconds(TOKEN_VALIDITY_SECONDS);@@ -265,14 +265,14 @@ final class EksTokenMinter {* can only ever be checked for shape, never against a hard-coded expected value.*/static String mint(String clusterName, String region, AwsCredentials credentials, Clock clock) {- var now = clock.instant();- var amzDate = AMZ_DATE.format(now);- var dateStamp = AMZ_DATE_STAMP.format(now);- var host = stsHost(region);- var credentialScope = dateStamp + "/" + region + "/sts/aws4_request";- var signedHeaders = "host;" + CLUSTER_ID_HEADER;-- var queryParams = new TreeMap<String, String>();+ Instant now = clock.instant();+ String amzDate = AMZ_DATE.format(now);+ String dateStamp = AMZ_DATE_STAMP.format(now);+ String host = stsHost(region);+ String credentialScope = dateStamp + "/" + region + "/sts/aws4_request";+ String signedHeaders = "host;" + CLUSTER_ID_HEADER;++ TreeMap<String, String> queryParams = new TreeMap<>();queryParams.put("Action", "GetCallerIdentity");queryParams.put("Version", "2011-06-15");queryParams.put("X-Amz-Algorithm", "AWS4-HMAC-SHA256");@@ -284,21 +284,21 @@ final class EksTokenMinter {queryParams.put("X-Amz-Security-Token", credentials.sessionToken());}- var canonicalQueryString = queryParams.entrySet().stream()+ String canonicalQueryString = queryParams.entrySet().stream().map(e -> uriEncode(e.getKey()) + "=" + uriEncode(e.getValue())).collect(Collectors.joining("&"));// Sorted by header name ("host" < "x-k8s-aws-id"), matching X-Amz-SignedHeaders above.- var canonicalHeaders = "host:" + host + "\n" + CLUSTER_ID_HEADER + ":" + clusterName + "\n";- var canonicalRequest = "GET\n/\n" + canonicalQueryString + "\n"+ String canonicalHeaders = "host:" + host + "\n" + CLUSTER_ID_HEADER + ":" + clusterName + "\n";+ String canonicalRequest = "GET\n/\n" + canonicalQueryString + "\n"+ canonicalHeaders + "\n" + signedHeaders + "\n" + EMPTY_BODY_SHA256;- var stringToSign = "AWS4-HMAC-SHA256\n" + amzDate + "\n" + credentialScope + "\n"+ String stringToSign = "AWS4-HMAC-SHA256\n" + amzDate + "\n" + credentialScope + "\n"+ sha256Hex(canonicalRequest);- var signingKey = deriveSigningKey(credentials.secretAccessKey(), dateStamp, region, "sts");- var signature = hexEncode(hmacSha256(signingKey, stringToSign));+ byte[] signingKey = deriveSigningKey(credentials.secretAccessKey(), dateStamp, region, "sts");+ String signature = hexEncode(hmacSha256(signingKey, stringToSign));- var url = "https://" + host + "/?" + canonicalQueryString + "&X-Amz-Signature=" + signature;+ String url = "https://" + host + "/?" + canonicalQueryString + "&X-Amz-Signature=" + signature;return TOKEN_PREFIX + Base64.getUrlEncoder().withoutPadding().encodeToString(url.getBytes(StandardCharsets.UTF_8));}@@ -344,8 +344,8 @@ final class EksTokenMinter {// execEnv has neither key at this point (the check above already rejected exactly one// being present), so these are necessarily ambient-sourced; the session token must be// too, for the same reason as the exec.env branch above.- var accessKeyId = ambientEnv.apply("AWS_ACCESS_KEY_ID");- var secretAccessKey = ambientEnv.apply("AWS_SECRET_ACCESS_KEY");+ String accessKeyId = ambientEnv.apply("AWS_ACCESS_KEY_ID");+ String secretAccessKey = ambientEnv.apply("AWS_SECRET_ACCESS_KEY");if (hasPairedKeys("the environment", accessKeyId, secretAccessKey)) {return new AwsCredentials(accessKeyId, secretAccessKey, ambientEnv.apply("AWS_SESSION_TOKEN"));}@@ -361,8 +361,8 @@ final class EksTokenMinter {* intended to supply.*/private static boolean hasPairedKeys(String source, String accessKeyId, String secretAccessKey) {- var hasAccessKeyId = accessKeyId != null && !accessKeyId.isBlank();- var hasSecretAccessKey = secretAccessKey != null && !secretAccessKey.isBlank();+ boolean hasAccessKeyId = accessKeyId != null && !accessKeyId.isBlank();+ boolean hasSecretAccessKey = secretAccessKey != null && !secretAccessKey.isBlank();if (hasAccessKeyId != hasSecretAccessKey) {throw new IllegalStateException("Partial AWS credentials in " + source + ": "@@ -374,8 +374,8 @@ final class EksTokenMinter {}private static AwsCredentials resolveFromSharedCredentialsFile(UnaryOperator<String> env, String profileEnv) {- var pathValue = env.apply("AWS_SHARED_CREDENTIALS_FILE");- var path = (pathValue != null && !pathValue.isBlank())+ String pathValue = env.apply("AWS_SHARED_CREDENTIALS_FILE");+ Path path = (pathValue != null && !pathValue.isBlank())? Path.of(pathValue): Path.of(System.getProperty("user.home"), ".aws", "credentials");if (!Files.exists(path)) {@@ -385,10 +385,10 @@ final class EksTokenMinter {+ path + ". Set AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY, or "+ "AWS_SHARED_CREDENTIALS_FILE.");}- var profile = (profileEnv == null || profileEnv.isBlank()) ? "default" : profileEnv;- var section = readIniSection(path, profile);- var accessKeyId = section.get("aws_access_key_id");- var secretAccessKey = section.get("aws_secret_access_key");+ String profile = (profileEnv == null || profileEnv.isBlank()) ? "default" : profileEnv;+ Map<String, String> section = readIniSection(path, profile);+ String accessKeyId = section.get("aws_access_key_id");+ String secretAccessKey = section.get("aws_secret_access_key");if (accessKeyId == null || secretAccessKey == null) {throw new IllegalStateException("AWS credentials profile '" + profile + "' in " + path@@ -398,12 +398,12 @@ final class EksTokenMinter {}private static Map<String, String> readIniSection(Path path, String profile) {- var target = "[" + profile + "]";- var result = new LinkedHashMap<String, String>();+ String target = "[" + profile + "]";+ LinkedHashMap<String, String> result = new LinkedHashMap<>();try {- var inSection = false;- for (var raw : Files.readAllLines(path, StandardCharsets.UTF_8)) {- var line = raw.strip();+ boolean inSection = false;+ for (String raw : Files.readAllLines(path, StandardCharsets.UTF_8)) {+ String line = raw.strip();if (line.isEmpty() || line.startsWith("#") || line.startsWith(";")) {continue;}@@ -414,7 +414,7 @@ final class EksTokenMinter {if (!inSection) {continue;}- var eq = line.indexOf('=');+ int eq = line.indexOf('=');if (eq > 0) {result.put(line.substring(0, eq).strip(), line.substring(eq + 1).strip());}@@ -430,9 +430,9 @@ final class EksTokenMinter {/** RFC 3986 percent-encoding, byte-wise over UTF-8, per the SigV4 spec (not {@link java.net.URLEncoder}). */private static String uriEncode(String input) {- var result = new StringBuilder();- for (var b : input.getBytes(StandardCharsets.UTF_8)) {- var c = (char) (b & 0xFF);+ StringBuilder result = new StringBuilder();+ for (byte b : input.getBytes(StandardCharsets.UTF_8)) {+ char c = (char) (b & 0xFF);if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9')|| c == '-' || c == '_' || c == '.' || c == '~') {result.append(c);@@ -444,16 +444,16 @@ final class EksTokenMinter {}private static byte[] deriveSigningKey(String secretKey, String date, String region, String service) {- var kSecret = ("AWS4" + secretKey).getBytes(StandardCharsets.UTF_8);- var kDate = hmacSha256(kSecret, date);- var kRegion = hmacSha256(kDate, region);- var kService = hmacSha256(kRegion, service);+ byte[] kSecret = ("AWS4" + secretKey).getBytes(StandardCharsets.UTF_8);+ byte[] kDate = hmacSha256(kSecret, date);+ byte[] kRegion = hmacSha256(kDate, region);+ byte[] kService = hmacSha256(kRegion, service);return hmacSha256(kService, "aws4_request");}private static byte[] hmacSha256(byte[] key, String data) {try {- var mac = Mac.getInstance("HmacSHA256");+ Mac mac = Mac.getInstance("HmacSHA256");mac.init(new SecretKeySpec(key, "HmacSHA256"));return mac.doFinal(data.getBytes(StandardCharsets.UTF_8));} catch (GeneralSecurityException e) {@@ -463,7 +463,7 @@ final class EksTokenMinter {private static String sha256Hex(String input) {try {- var digest = MessageDigest.getInstance("SHA-256");+ MessageDigest digest = MessageDigest.getInstance("SHA-256");return hexEncode(digest.digest(input.getBytes(StandardCharsets.UTF_8)));} catch (GeneralSecurityException e) {throw new IllegalStateException("Could not compute SHA-256: " + e.getMessage(), e);@@ -471,8 +471,8 @@ final class EksTokenMinter {}private static String hexEncode(byte[] bytes) {- var sb = new StringBuilder(bytes.length * 2);- for (var b : bytes) {+ StringBuilder sb = new StringBuilder(bytes.length * 2);+ for (byte b : bytes) {sb.append(String.format("%02x", b));}return sb.toString();diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesApiClient.java b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesApiClient.javaindex 36b135395a..968f6c1311 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesApiClient.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesApiClient.java@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;import jakarta.enterprise.context.ApplicationScoped;+import java.util.Collection;import javax.net.ssl.KeyManager;import javax.net.ssl.KeyManagerFactory;import javax.net.ssl.SSLContext;@@ -127,11 +128,11 @@ public class KubernetesApiClient {}public List<JsonNode> listPods(String namespace, Map<String, String> labelSelector) {- var selector = labelSelector.entrySet().stream()+ String selector = labelSelector.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.joining(","));- var path = podsPath(namespace) + "?labelSelector=" + URLEncoder.encode(selector, StandardCharsets.UTF_8);- var items = new ArrayList<JsonNode>();+ String path = podsPath(namespace) + "?labelSelector=" + URLEncoder.encode(selector, StandardCharsets.UTF_8);+ ArrayList<JsonNode> items = new ArrayList<>();send("GET", path, null, 200).path("items").forEach(items::add);return items;}@@ -155,9 +156,9 @@ public class KubernetesApiClient {* @throws IllegalStateException if {@code condition} is not satisfied within {@code timeoutSeconds}*/public JsonNode waitForPod(String namespace, String name, Predicate<JsonNode> condition, int timeoutSeconds) {- var deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(timeoutSeconds);+ long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(timeoutSeconds);while (true) {- var pod = getPod(namespace, name).orElse(null);+ JsonNode pod = getPod(namespace, name).orElse(null);if (condition.test(pod)) {return pod;}@@ -184,8 +185,8 @@ public class KubernetesApiClient {if (e.getStatusCode() != 409) {throw e;}- var name = configMap.path("metadata").path("name").asText();- var existing = getOptional(configMapPath(namespace, name)).orElseThrow(() -> e);+ String name = configMap.path("metadata").path("name").asText();+ JsonNode existing = getOptional(configMapPath(namespace, name)).orElseThrow(() -> e);((ObjectNode) configMap.path("metadata")).put("resourceVersion", existing.path("metadata").path("resourceVersion").asText());send("PUT", configMapPath(namespace, name), configMap, 200);@@ -199,12 +200,12 @@ public class KubernetesApiClient {*/public InputStream openPodLogStream(String namespace, String podName, String containerName) {ensureInitialized();- var path = podPath(namespace, podName) + "/log?container="+ String path = podPath(namespace, podName) + "/log?container="+ URLEncoder.encode(containerName, StandardCharsets.UTF_8) + "&follow=true";try {- var response = http.send(requestBuilder(path).GET().build(), HttpResponse.BodyHandlers.ofInputStream());+ HttpResponse<InputStream> response = http.send(requestBuilder(path).GET().build(), HttpResponse.BodyHandlers.ofInputStream());if (response.statusCode() != 200) {- var body = new String(response.body().readAllBytes(), StandardCharsets.UTF_8);+ String body = new String(response.body().readAllBytes(), StandardCharsets.UTF_8);throw new KubernetesApiException("GET", path, response.statusCode(), body);}return response.body();@@ -219,14 +220,14 @@ public class KubernetesApiClient {private JsonNode send(String method, String path, JsonNode body, int expectedStatus) {ensureInitialized();try {- var builder = requestBuilder(path);+ HttpRequest.Builder builder = requestBuilder(path);if (body != null) {builder.header("Content-Type", "application/json").method(method, HttpRequest.BodyPublishers.ofByteArray(mapper.writeValueAsBytes(body)));} else {builder.method(method, HttpRequest.BodyPublishers.noBody());}- var response = http.send(builder.build(), HttpResponse.BodyHandlers.ofByteArray());+ HttpResponse<byte[]> response = http.send(builder.build(), HttpResponse.BodyHandlers.ofByteArray());if (response.statusCode() != expectedStatus) {throw new KubernetesApiException(method, path, response.statusCode(),new String(response.body(), StandardCharsets.UTF_8));@@ -243,7 +244,7 @@ public class KubernetesApiClient {private Optional<JsonNode> getOptional(String path) {ensureInitialized();try {- var response = http.send(requestBuilder(path).GET().build(), HttpResponse.BodyHandlers.ofByteArray());+ HttpResponse<byte[]> response = http.send(requestBuilder(path).GET().build(), HttpResponse.BodyHandlers.ofByteArray());if (response.statusCode() == 404) {return Optional.empty();}@@ -261,7 +262,7 @@ public class KubernetesApiClient {}private HttpRequest.Builder requestBuilder(String path) {- var builder = HttpRequest.newBuilder(baseUri.resolve(path)).timeout(Duration.ofSeconds(30));+ HttpRequest.Builder builder = HttpRequest.newBuilder(baseUri.resolve(path)).timeout(Duration.ofSeconds(30));if (tokenSupplier != null) {builder.header("Authorization", "Bearer " + tokenSupplier.get());}@@ -299,9 +300,9 @@ public class KubernetesApiClient {}private void resolveInCluster() {- var host = System.getenv("KUBERNETES_SERVICE_HOST");- var port = System.getenv("KUBERNETES_SERVICE_PORT");- var authority = (host != null && port != null) ? host + ":" + port : "kubernetes.default.svc";+ String host = System.getenv("KUBERNETES_SERVICE_HOST");+ String port = System.getenv("KUBERNETES_SERVICE_PORT");+ String authority = (host != null && port != null) ? host + ":" + port : "kubernetes.default.svc";this.baseUri = URI.create("https://" + authority);this.http = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(5))@@ -326,29 +327,29 @@ public class KubernetesApiClient {+ " and no kubeconfig at " + path + ". Set KUBECONFIG or place one at ~/.kube/config.");}JsonNode root;- try (var in = Files.newInputStream(path)) {+ try (InputStream in = Files.newInputStream(path)) {root = new ObjectMapper(new YAMLFactory()).readTree(in);} catch (IOException e) {throw new IllegalStateException("Could not read kubeconfig at " + path + ": " + e.getMessage(), e);}- var currentContextName = root.path("current-context").asText(null);+ String currentContextName = root.path("current-context").asText(null);if (currentContextName == null || currentContextName.isBlank()) {throw new IllegalStateException("kubeconfig at " + path + " has no current-context set");}- var context = findNamed(root.path("contexts"), currentContextName, "context")+ JsonNode context = findNamed(root.path("contexts"), currentContextName, "context").orElseThrow(() -> new IllegalStateException("kubeconfig context '" + currentContextName + "' not found in " + path));- var clusterName = context.path("cluster").asText(null);- var cluster = findNamed(root.path("clusters"), clusterName, "cluster")+ String clusterName = context.path("cluster").asText(null);+ JsonNode cluster = findNamed(root.path("clusters"), clusterName, "cluster").orElseThrow(() -> new IllegalStateException("kubeconfig cluster '" + clusterName + "' not found in " + path));- var userName = context.path("user").asText(null);- var user = userName == null ? JsonNodeFactory.instance.objectNode()+ String userName = context.path("user").asText(null);+ JsonNode user = userName == null ? JsonNodeFactory.instance.objectNode(): findNamed(root.path("users"), userName, "user").orElseGet(JsonNodeFactory.instance::objectNode);- var server = cluster.path("server").asText(null);+ String server = cluster.path("server").asText(null);if (server == null || server.isBlank()) {throw new IllegalStateException("kubeconfig cluster '" + clusterName + "' has no server URL in " + path);}@@ -356,23 +357,23 @@ public class KubernetesApiClient {// Matches kubectl: when set, this wins over any certificate-authority (chain// validation is skipped either way, so a CA to validate against is moot).- var insecureSkipTlsVerify = cluster.path("insecure-skip-tls-verify").asBoolean(false);+ boolean insecureSkipTlsVerify = cluster.path("insecure-skip-tls-verify").asBoolean(false);X509TrustManager trustManager;if (insecureSkipTlsVerify) {trustManager = INSECURE_TRUST_MANAGER;} else {- var caBytes = pemBytes(cluster, "certificate-authority", "certificate-authority-data", path);+ byte[] caBytes = pemBytes(cluster, "certificate-authority", "certificate-authority-data", path);trustManager = caBytes != null ? trustManagerFromPem(caBytes) : defaultTrustManager();}- var certBytes = pemBytes(user, "client-certificate", "client-certificate-data", path);- var keyBytes = pemBytes(user, "client-key", "client-key-data", path);+ byte[] certBytes = pemBytes(user, "client-certificate", "client-certificate-data", path);+ byte[] keyBytes = pemBytes(user, "client-key", "client-key-data", path);KeyManager[] keyManagers = null;if (certBytes != null && keyBytes != null) {keyManagers = keyManagersFromPem(certBytes, keyBytes);}- var token = user.path("token").asText(null);+ String token = user.path("token").asText(null);Supplier<String> execTokenSupplier = user.has("exec")? EksTokenMinter.tokenSupplierIfRecognized(user.path("exec")).orElse(null): null;@@ -389,14 +390,14 @@ public class KubernetesApiClient {+ "' has no supported credential (token or client-certificate/client-key) in " + path);}- var httpBuilder = HttpClient.newBuilder()+ HttpClient.Builder httpBuilder = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(5)).sslContext(sslContext(trustManager, keyManagers));if (insecureSkipTlsVerify) {// The trust manager above already skips chain validation; this additionally// skips hostname verification, matching kubectl's --insecure-skip-tls-verify// (otherwise a kind/minikube server cert with no matching SAN still fails).- var sslParameters = new SSLParameters();+ SSLParameters sslParameters = new SSLParameters();sslParameters.setEndpointIdentificationAlgorithm("");httpBuilder.sslParameters(sslParameters);}@@ -406,9 +407,9 @@ public class KubernetesApiClient {}private static Path kubeconfigPath() {- var envValue = System.getenv("KUBECONFIG");+ String envValue = System.getenv("KUBECONFIG");if (envValue != null && !envValue.isBlank()) {- var separator = System.getProperty("os.name", "").toLowerCase(Locale.ROOT).contains("win") ? ";" : ":";+ String separator = System.getProperty("os.name", "").toLowerCase(Locale.ROOT).contains("win") ? ";" : ":";return Path.of(envValue.split(Pattern.quote(separator))[0]);}return Path.of(System.getProperty("user.home"), ".kube", "config");@@ -418,7 +419,7 @@ public class KubernetesApiClient {if (name == null) {return Optional.empty();}- for (var entry : array) {+ for (JsonNode entry : array) {if (name.equals(entry.path("name").asText(null))) {return Optional.of(entry.path(childKey));}@@ -428,15 +429,15 @@ public class KubernetesApiClient {/** Reads a `<field>` (a path, resolved relative to the kubeconfig) or `<field>-data` (base64) entry. */private static byte[] pemBytes(JsonNode node, String fileField, String dataField, Path kubeconfigPath) {- var data = node.path(dataField).asText(null);+ String data = node.path(dataField).asText(null);if (data != null && !data.isBlank()) {return Base64.getDecoder().decode(data);}- var file = node.path(fileField).asText(null);+ String file = node.path(fileField).asText(null);if (file == null || file.isBlank()) {return null;}- var resolved = Path.of(file).isAbsolute() ? Path.of(file) : kubeconfigPath.getParent().resolve(file);+ Path resolved = Path.of(file).isAbsolute() ? Path.of(file) : kubeconfigPath.getParent().resolve(file);try {return Files.readAllBytes(resolved);} catch (IOException e) {@@ -456,14 +457,14 @@ public class KubernetesApiClient {private static X509TrustManager trustManagerFromPem(byte[] pem) {try {- var certs = CertificateFactory.getInstance("X.509").generateCertificates(new ByteArrayInputStream(pem));- var keyStore = KeyStore.getInstance(KeyStore.getDefaultType());+ Collection<? extends Certificate> certs = CertificateFactory.getInstance("X.509").generateCertificates(new ByteArrayInputStream(pem));+ KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());keyStore.load(null, null);- var i = 0;- for (var cert : certs) {+ int i = 0;+ for (Certificate cert : certs) {keyStore.setCertificateEntry("ca" + (i++), cert);}- var trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());+ TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());trustManagerFactory.init(keyStore);return firstX509(trustManagerFactory.getTrustManagers(),"No X509TrustManager produced from the supplied CA certificate(s)");@@ -475,7 +476,7 @@ public class KubernetesApiClient {private static X509TrustManager defaultTrustManager() {try {- var trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());+ TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());trustManagerFactory.init((KeyStore) null);return firstX509(trustManagerFactory.getTrustManagers(), "No default X509TrustManager available");} catch (GeneralSecurityException e) {@@ -484,7 +485,7 @@ public class KubernetesApiClient {}private static X509TrustManager firstX509(TrustManager[] managers, String errorIfNone) {- for (var manager : managers) {+ for (TrustManager manager : managers) {if (manager instanceof X509TrustManager x509) {return x509;}@@ -494,12 +495,12 @@ public class KubernetesApiClient {private static KeyManager[] keyManagersFromPem(byte[] certPem, byte[] keyPem) {try {- var cert = CertificateFactory.getInstance("X.509").generateCertificate(new ByteArrayInputStream(certPem));- var privateKey = privateKeyFromPem(keyPem);- var keyStore = KeyStore.getInstance(KeyStore.getDefaultType());+ Certificate cert = CertificateFactory.getInstance("X.509").generateCertificate(new ByteArrayInputStream(certPem));+ PrivateKey privateKey = privateKeyFromPem(keyPem);+ KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());keyStore.load(null, null);keyStore.setKeyEntry("client", privateKey, new char[0], new Certificate[]{cert});- var keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());+ KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());keyManagerFactory.init(keyStore, new char[0]);return keyManagerFactory.getKeyManagers();} catch (GeneralSecurityException | IOException e) {@@ -509,19 +510,19 @@ public class KubernetesApiClient {}private static PrivateKey privateKeyFromPem(byte[] pem) {- var text = new String(pem, StandardCharsets.US_ASCII);+ String text = new String(pem, StandardCharsets.US_ASCII);if (text.contains("BEGIN RSA PRIVATE KEY") || text.contains("BEGIN EC PRIVATE KEY")) {throw new IllegalStateException("kubeconfig client-key is in PKCS#1 format (BEGIN RSA/EC PRIVATE KEY); only PKCS#8 "+ "(BEGIN PRIVATE KEY) is supported. Convert it with: openssl pkcs8 -topk8 "+ "-nocrypt -in key.pem -out key-pkcs8.pem");}- var base64 = text.replaceAll("-----BEGIN [^-]+-----", "")+ String base64 = text.replaceAll("-----BEGIN [^-]+-----", "").replaceAll("-----END [^-]+-----", "").replaceAll("\\s", "");- var keySpec = new PKCS8EncodedKeySpec(Base64.getDecoder().decode(base64));+ PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(Base64.getDecoder().decode(base64));GeneralSecurityException last = null;- for (var algorithm : new String[]{"RSA", "EC"}) {+ for (String algorithm : new String[]{"RSA", "EC"}) {try {return KeyFactory.getInstance(algorithm).generatePrivate(keySpec);} catch (GeneralSecurityException e) {@@ -534,7 +535,7 @@ public class KubernetesApiClient {private static SSLContext sslContext(X509TrustManager trustManager, KeyManager[] keyManagers) {try {- var context = SSLContext.getInstance("TLS");+ SSLContext context = SSLContext.getInstance("TLS");context.init(keyManagers, new TrustManager[]{trustManager}, null);return context;} catch (GeneralSecurityException e) {diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesFlociAddressResolver.java b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesFlociAddressResolver.javaindex a20aaa55f0..b23e0d2c9f 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesFlociAddressResolver.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesFlociAddressResolver.java@@ -10,6 +10,8 @@ import java.net.InetAddress;import java.net.NetworkInterface;import java.nio.file.Files;import java.nio.file.Path;+import java.util.Enumeration;+import java.util.Optional;/*** Resolves the address Lambda pods use to reach the Floci process: the Runtime API@@ -53,7 +55,7 @@ public class KubernetesFlociAddressResolver {* Docker/embedded-DNS specific.*/public String flociBaseUrl() {- var scheme = config.tls().enabled() ? "https" : "http";+ String scheme = config.tls().enabled() ? "https" : "http";return scheme + "://" + resolve() + ":" + mainPort();}@@ -75,10 +77,10 @@ public class KubernetesFlociAddressResolver {}private String doResolve() {- var override = config.services().lambda().kubernetes().flociAddress()+ Optional<String> override = config.services().lambda().kubernetes().flociAddress().filter(s -> !s.isBlank());if (override.isPresent()) {- var address = override.get().trim();+ String address = override.get().trim();// Reachability can only be judged from the pods' network, not from here,// but anything beyond hostname/IP characters is always a mistake worth// failing on: the value is embedded in URLs and in single-quoted@@ -115,7 +117,7 @@ public class KubernetesFlociAddressResolver {// IPv4 only: an IPv6 literal would need bracketing in every URL this address// feeds, and busybox wget cannot fetch from unbracketed IPv6 hosts.try {- var local = InetAddress.getLocalHost();+ InetAddress local = InetAddress.getLocalHost();if (local instanceof Inet4Address && !local.isLoopbackAddress()) {return local.getHostAddress();}@@ -123,15 +125,15 @@ public class KubernetesFlociAddressResolver {LOG.debugv("getLocalHost failed, scanning interfaces: {0}", e.getMessage());}try {- var interfaces = NetworkInterface.getNetworkInterfaces();+ Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();while (interfaces.hasMoreElements()) {- var nic = interfaces.nextElement();+ NetworkInterface nic = interfaces.nextElement();if (!nic.isUp() || nic.isLoopback()) {continue;}- var addresses = nic.getInetAddresses();+ Enumeration<InetAddress> addresses = nic.getInetAddresses();while (addresses.hasMoreElements()) {- var address = addresses.nextElement();+ InetAddress address = addresses.nextElement();if (address instanceof Inet4Address && !address.isLoopbackAddress()) {return address.getHostAddress();}diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesPodLauncher.java b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesPodLauncher.javaindex 83f0f07c69..f0593e5766 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesPodLauncher.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesPodLauncher.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.lambda.launcher.kubernetes;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.node.JsonNodeFactory;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.config.ContainerCaBundle;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsArnUtils;@@ -15,6 +16,8 @@ import io.github.hectorvent.floci.services.lambda.launcher.ImageResolver;import io.github.hectorvent.floci.services.lambda.launcher.LambdaRuntimeLauncher;import io.github.hectorvent.floci.services.lambda.model.ContainerState;import io.github.hectorvent.floci.services.lambda.model.LambdaFunction;+import io.github.hectorvent.floci.services.lambda.model.LambdaLayerVersion;+import io.github.hectorvent.floci.services.lambda.runtime.RuntimeApiServer;import io.github.hectorvent.floci.services.lambda.runtime.RuntimeApiServerFactory;import io.github.hectorvent.floci.services.s3.S3Service;import jakarta.enterprise.context.ApplicationScoped;@@ -22,6 +25,7 @@ import jakarta.enterprise.inject.Typed;import jakarta.inject.Inject;import org.jboss.logging.Logger;+import java.io.Closeable;import java.nio.file.Files;import java.nio.file.Path;import java.util.ArrayList;@@ -145,35 +149,35 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {+ "kubernetes executor; pods receive placeholder credentials instead");}- var namespace = namespace();+ String namespace = namespace();sweepOrphansOnce(namespace);LOG.infov("Launching pod for function: {0}", fn.getFunctionName());- var runtimeApiServer = runtimeApiServerFactory.create();+ RuntimeApiServer runtimeApiServer = runtimeApiServerFactory.create();// Mirrors ContainerLauncher: any failure after the runtime-api server is allocated// must release its port and delete a half-created pod, or cold-start bursts leak// ports until the pool is exhausted.String podName = null;try {- var imagePackage = "Image".equals(fn.getPackageType()) && fn.getImageUri() != null;+ boolean imagePackage = "Image".equals(fn.getPackageType()) && fn.getImageUri() != null;// No emulated-ECR rewrite here: the kubelet pulls images, and Floci's loopback// registry is not reachable from cluster nodes. URIs pass through unchanged.- var image = imagePackage ? fn.getImageUri() : imageResolver.resolve(fn.getRuntime());+ String image = imagePackage ? fn.getImageUri() : imageResolver.resolve(fn.getRuntime());- var shortId = UUID.randomUUID().toString().replace("-", "").substring(0, 8);+ String shortId = UUID.randomUUID().toString().replace("-", "").substring(0, 8);podName = LambdaPodSpecFactory.podName(fn.getFunctionName(), shortId);- var region = AwsArnUtils.regionOrDefault(fn.getFunctionArn(), config.defaultRegion());+ String region = AwsArnUtils.regionOrDefault(fn.getFunctionArn(), config.defaultRegion());String accountId = AwsArnUtils.accountOrDefault(fn.getFunctionArn(), config.defaultAccountId());- var cwLogGroup = "/aws/lambda/" + fn.getFunctionName();- var cwLogStream = logStreamer.logStreamName(shortId);+ String cwLogGroup = "/aws/lambda/" + fn.getFunctionName();+ String cwLogStream = logStreamer.logStreamName(shortId);- var codeDownloadUrl = imagePackage ? null : codeDownloadUrl(fn, region);- var layerUrls = imagePackage ? List.<String>of() : layerDownloadUrls(fn, region);+ String codeDownloadUrl = imagePackage ? null : codeDownloadUrl(fn, region);+ List<String> layerUrls = imagePackage ? List.of() : layerDownloadUrls(fn, region);- var caConfigMap = ContainerCaBundle.hostPath(config).map(bundle -> ensureCaConfigMap(namespace, bundle));+ Optional<String> caConfigMap = ContainerCaBundle.hostPath(config).map(bundle -> ensureCaConfigMap(namespace, bundle));- var env = new ArrayList<String>();+ ArrayList<String> env = new ArrayList<>();env.add("AWS_LAMBDA_RUNTIME_API=" + addressResolver.resolve() + ":" + runtimeApiServer.getPort());env.add("AWS_LAMBDA_FUNCTION_NAME=" + fn.getFunctionName());env.add("AWS_LAMBDA_FUNCTION_MEMORY_SIZE=" + fn.getMemorySize());@@ -200,14 +204,14 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {});}- var imageConfig = imagePackage+ LambdaPodSpecFactory.ImageConfig imageConfig = imagePackage? new LambdaPodSpecFactory.ImageConfig(fn.getImageConfigEntryPoint(),fn.getImageConfigCommand(), fn.getImageConfigWorkingDirectory()): null;// After the function's own variables, so a value it sets wins, as in the docker launcher.- var podEnv = caConfigMap.isPresent() ? ContainerCaBundle.appendEnv(env) : env;- var pod = podSpecFactory.buildPod(podName, fn.getFunctionName(), image, podEnv,+ List<String> podEnv = caConfigMap.isPresent() ? ContainerCaBundle.appendEnv(env) : env;+ ObjectNode pod = podSpecFactory.buildPod(podName, fn.getFunctionName(), image, podEnv,codeDownloadUrl, layerUrls, isProvidedRuntime(fn.getRuntime()),imagePackage ? null : fn.getHandler(), imageConfig, fn.getMemorySize(), caConfigMap);@@ -217,13 +221,13 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {awaitRunning(namespace, podName, fn.getFunctionName());- var handle = new ContainerHandle(podName, fn.getFunctionName(),+ ContainerHandle handle = new ContainerHandle(podName, fn.getFunctionName(),runtimeApiServer, ContainerState.WARM, false);// Log streaming is non-essential and runs after the pod is already Running,// so a failure here (e.g. a missing pods/log RBAC verb) must not tear down a// healthy execution environment.try {- var logHandle = logStreamer.attachForAccount(accountId, namespace, podName,+ Closeable logHandle = logStreamer.attachForAccount(accountId, namespace, podName,cwLogGroup, cwLogStream, region, "lambda:" + fn.getFunctionName());handle.setLogStream(logHandle);} catch (Exception logFailure) {@@ -304,7 +308,7 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {@Overridepublic boolean isAlive(ContainerHandle handle) {try {- var pod = client.getPod(namespace(), handle.getContainerId()).orElse(null);+ JsonNode pod = client.getPod(namespace(), handle.getContainerId()).orElse(null);return pod != null&& "Running".equals(pod.path("status").path("phase").asText(null))&& isAbsent(pod.path("metadata").path("deletionTimestamp"));@@ -343,13 +347,13 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {return;}try {- var orphans = client.listPods(namespace, LambdaPodSpecFactory.managedPodSelector()).stream()+ List<JsonNode> orphans = client.listPods(namespace, LambdaPodSpecFactory.managedPodSelector()).stream().filter(pod -> !ownPodNames.contains(pod.path("metadata").path("name").asText())).toList();if (!orphans.isEmpty()) {LOG.infov("Deleting {0} orphaned Lambda pod(s) from a previous run in namespace {1}",orphans.size(), namespace);- for (var orphan : orphans) {+ for (JsonNode orphan : orphans) {client.deletePod(namespace, orphan.path("metadata").path("name").asText());}}@@ -374,8 +378,8 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {}private String codeDownloadUrl(LambdaFunction fn, String region) {- var bucket = LambdaService.tasksBucketName(region);- var key = LambdaService.codeObjectKey(fn);+ String bucket = LambdaService.tasksBucketName(region);+ String key = LambdaService.codeObjectKey(fn);try {s3Service.headObject(bucket, key);} catch (AwsException e) {@@ -384,7 +388,7 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {+ " — the kubernetes executor downloads code from Floci's S3, and the copy "+ "stored at deploy time is missing. Re-deploy the function code.", e);}- var account = fn.getAccountId() != null ? fn.getAccountId() : config.defaultAccountId();+ String account = fn.getAccountId() != null ? fn.getAccountId() : config.defaultAccountId();return downloadUrl(bucket, key, account, region);}@@ -392,20 +396,20 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {if (fn.getLayers() == null || fn.getLayers().isEmpty()) {return List.of();}- var urls = new ArrayList<String>();- for (var layerArn : fn.getLayers()) {- var layer = layerService.resolveLayerByArn(layerArn);+ ArrayList<String> urls = new ArrayList<>();+ for (String layerArn : fn.getLayers()) {+ LambdaLayerVersion layer = layerService.resolveLayerByArn(layerArn);if (layer == null) {LOG.warnv("Could not resolve layer ARN {0} for function {1}", layerArn, fn.getFunctionName());continue;}// The archive lives under the layer's own region and account (the canonical// ARN assigned at publish), which may differ from the function's.- var arn = layer.getLayerVersionArn();- var layerRegion = AwsArnUtils.regionOrDefault(arn, functionRegion);- var account = AwsArnUtils.accountOrDefault(arn, config.defaultAccountId());- var bucket = LambdaService.tasksBucketName(layerRegion);- var key = LambdaService.layerObjectKey(account, layer.getLayerName(), layer.getVersion());+ String arn = layer.getLayerVersionArn();+ String layerRegion = AwsArnUtils.regionOrDefault(arn, functionRegion);+ String account = AwsArnUtils.accountOrDefault(arn, config.defaultAccountId());+ String bucket = LambdaService.tasksBucketName(layerRegion);+ String key = LambdaService.layerObjectKey(account, layer.getLayerName(), layer.getVersion());try {s3Service.headObject(bucket, key);} catch (AwsException e) {@@ -432,7 +436,7 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {}private void awaitRunning(String namespace, String podName, String functionName) {- var timeoutSeconds = POD_STARTUP_TIMEOUT_SECONDS;+ int timeoutSeconds = POD_STARTUP_TIMEOUT_SECONDS;JsonNode pod;try {// A missing pod (deleted out-of-band) is terminal too, otherwise the wait@@ -454,7 +458,7 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {}private static boolean hasTerminalFailure(JsonNode pod) {- var phase = pod.path("status").path("phase").asText(null);+ String phase = pod.path("status").path("phase").asText(null);// Succeeded means the runtime exited before serving — terminal for a server pod.if ("Failed".equals(phase) || "Succeeded".equals(phase)) {return true;@@ -463,7 +467,7 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {}private static String unschedulableReason(JsonNode pod) {- for (var condition : pod.path("status").path("conditions")) {+ for (JsonNode condition : pod.path("status").path("conditions")) {// A pod the scheduler cannot place — e.g. a memory request above every node's// capacity — stays Pending with no container statuses; fail the cold start// instead of blocking the invoker for the full startup timeout.@@ -477,18 +481,18 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {}private static String describeTerminalReason(JsonNode pod) {- for (var statuses : List.of(pod.path("status").path("initContainerStatuses"),+ for (JsonNode statuses : List.of(pod.path("status").path("initContainerStatuses"),pod.path("status").path("containerStatuses"))) {- for (var status : statuses) {- var waiting = status.path("state").path("waiting");- var waitingReason = waiting.path("reason").asText(null);+ for (JsonNode status : statuses) {+ JsonNode waiting = status.path("state").path("waiting");+ String waitingReason = waiting.path("reason").asText(null);// A missing reason must never match; Set.of(...).contains(null) throws,// which would abort an otherwise healthy cold start.if (waitingReason != null && TERMINAL_WAITING_REASONS.contains(waitingReason)) {return status.path("name").asText() + ": " + waitingReason+ " (" + waiting.path("message").asText("") + ")";}- var exitCode = status.path("state").path("terminated").path("exitCode");+ JsonNode exitCode = status.path("state").path("terminated").path("exitCode");if (!exitCode.isMissingNode() && exitCode.asInt() != 0) {return status.path("name").asText() + ": exited with code " + exitCode.asInt();}@@ -501,7 +505,7 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {if (pod == null || pod.path("status").isMissingNode()) {return "pod no longer exists";}- var reason = describeTerminalReason(pod);+ String reason = describeTerminalReason(pod);if (reason == null) {reason = unschedulableReason(pod);}@@ -522,13 +526,13 @@ public class KubernetesPodLauncher implements LambdaRuntimeLauncher {return CA_CONFIG_MAP_NAME;}try {- var pem = Files.readString(bundle);- var nodes = JsonNodeFactory.instance;- var labels = nodes.objectNode();+ String pem = Files.readString(bundle);+ JsonNodeFactory nodes = JsonNodeFactory.instance;+ ObjectNode labels = nodes.objectNode();LambdaPodSpecFactory.managedPodSelector().forEach(labels::put);- var metadata = nodes.objectNode().put("name", CA_CONFIG_MAP_NAME);+ ObjectNode metadata = nodes.objectNode().put("name", CA_CONFIG_MAP_NAME);metadata.set("labels", labels);- var configMap = nodes.objectNode().put("apiVersion", "v1").put("kind", "ConfigMap");+ ObjectNode configMap = nodes.objectNode().put("apiVersion", "v1").put("kind", "ConfigMap");configMap.set("metadata", metadata);configMap.set("data", nodes.objectNode().put(CA_CONFIG_MAP_KEY, pem));client.createOrUpdateConfigMap(namespace, configMap);diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesPodLogStreamer.java b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesPodLogStreamer.javaindex d88e4d1a37..ce5483d443 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesPodLogStreamer.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesPodLogStreamer.java@@ -49,13 +49,13 @@ public class KubernetesPodLogStreamer {InputStream logStreamBody = client.openPodLogStream(namespace, podName, "runtime");// Virtual thread: one blocking reader per warm pod is near-free this way.- var reader = Thread.ofVirtual().name("lambda-pod-logs-" + podName).start(() -> {- try (var lines = new BufferedReader(new InputStreamReader(logStreamBody, StandardCharsets.UTF_8))) {+ Thread reader = Thread.ofVirtual().name("lambda-pod-logs-" + podName).start(() -> {+ try (BufferedReader lines = new BufferedReader(new InputStreamReader(logStreamBody, StandardCharsets.UTF_8))) {String line;while ((line = lines.readLine()) != null) {// Match the docker log path: trim trailing whitespace and drop blank// lines so both executors write identical CloudWatch events.- var trimmed = line.stripTrailing();+ String trimmed = line.stripTrailing();if (trimmed.isEmpty()) {continue;}diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/LambdaPodSpecFactory.java b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/LambdaPodSpecFactory.javaindex e8fe985658..a447ba8fd8 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/LambdaPodSpecFactory.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/LambdaPodSpecFactory.java@@ -73,12 +73,12 @@ public class LambdaPodSpecFactory {ImageConfig imageConfig,int memoryMb,Optional<String> caConfigMapName) {- var hasCode = codeDownloadUrl != null;- var hasLayers = !layerDownloadUrls.isEmpty();- var nodes = JsonNodeFactory.instance;+ boolean hasCode = codeDownloadUrl != null;+ boolean hasLayers = !layerDownloadUrls.isEmpty();+ JsonNodeFactory nodes = JsonNodeFactory.instance;- var volumes = nodes.arrayNode();- var runtimeMounts = nodes.arrayNode();+ ArrayNode volumes = nodes.arrayNode();+ ArrayNode runtimeMounts = nodes.arrayNode();if (hasCode) {volumes.add(emptyDirVolume(nodes, "task"));runtimeMounts.add(mount(nodes, "task", TASK_DIR));@@ -90,7 +90,7 @@ public class LambdaPodSpecFactory {// The provided.* base images exec /var/runtime/bootstrap with no /var/task// fallback, and their /var/runtime ships empty, so masking it with an emptyDir// that the init container copies bootstrap into is safe and required.- var needsRuntimeDir = providedRuntime && hasCode;+ boolean needsRuntimeDir = providedRuntime && hasCode;if (needsRuntimeDir) {volumes.add(emptyDirVolume(nodes, "runtime"));runtimeMounts.add(mount(nodes, "runtime", RUNTIME_DIR));@@ -105,12 +105,12 @@ public class LambdaPodSpecFactory {.put("readOnly", true));});- var resources = nodes.objectNode();- var memory = memoryMb + "Mi";+ ObjectNode resources = nodes.objectNode();+ String memory = memoryMb + "Mi";resources.set("requests", nodes.objectNode().put("memory", memory));resources.set("limits", nodes.objectNode().put("memory", memory));- var runtime = nodes.objectNode()+ ObjectNode runtime = nodes.objectNode().put("name", "runtime").put("image", image)// Explicit IfNotPresent: the default for :latest/untagged is Always,@@ -133,9 +133,9 @@ public class LambdaPodSpecFactory {runtime.put("workingDir", imageConfig.workingDirectory());}- var initContainers = nodes.arrayNode();+ ArrayNode initContainers = nodes.arrayNode();if (hasCode) {- var initMounts = nodes.arrayNode();+ ArrayNode initMounts = nodes.arrayNode();initMounts.add(mount(nodes, "task", TASK_DIR));if (hasLayers) {initMounts.add(mount(nodes, "opt", OPT_DIR));@@ -143,7 +143,7 @@ public class LambdaPodSpecFactory {if (needsRuntimeDir) {initMounts.add(mount(nodes, "runtime", RUNTIME_DIR));}- var init = nodes.objectNode()+ ObjectNode init = nodes.objectNode().put("name", "code-download").put("image", config.services().lambda().kubernetes().initImage()).put("imagePullPolicy", "IfNotPresent");@@ -153,19 +153,19 @@ public class LambdaPodSpecFactory {initContainers.add(init);}- var metadata = nodes.objectNode().put("name", podName);- var labels = nodes.objectNode();+ ObjectNode metadata = nodes.objectNode().put("name", podName);+ ObjectNode labels = nodes.objectNode();podLabels(functionName).forEach(labels::put);metadata.set("labels", labels);- var spec = nodes.objectNode()+ ObjectNode spec = nodes.objectNode().put("restartPolicy", "Never").put("terminationGracePeriodSeconds", 5);spec.set("initContainers", initContainers);spec.set("containers", nodes.arrayNode().add(runtime));spec.set("volumes", volumes);- var pod = nodes.objectNode()+ ObjectNode pod = nodes.objectNode().put("apiVersion", "v1").put("kind", "Pod");pod.set("metadata", metadata);@@ -184,11 +184,11 @@ public class LambdaPodSpecFactory {String initScript(String codeDownloadUrl, List<String> layerDownloadUrls, boolean providedRuntime) {// Download URLs are always plain HTTP (see KubernetesFlociAddressResolver// .downloadBaseUrl): busybox wget's built-in TLS cannot handshake with Floci.- var wget = "wget -q";- var script = new StringBuilder("set -e\n");+ String wget = "wget -q";+ StringBuilder script = new StringBuilder("set -e\n");script.append(wget).append(" -O /tmp/code.zip '").append(codeDownloadUrl).append("'\n");script.append("unzip -oq /tmp/code.zip -d ").append(TASK_DIR).append("\n");- for (var i = 0; i < layerDownloadUrls.size(); i++) {+ for (int i = 0; i < layerDownloadUrls.size(); i++) {script.append(wget).append(" -O /tmp/layer").append(i).append(".zip '").append(layerDownloadUrls.get(i)).append("'\n");script.append("unzip -oq /tmp/layer").append(i).append(".zip -d ").append(OPT_DIR).append("\n");@@ -206,11 +206,11 @@ public class LambdaPodSpecFactory {}Map<String, String> podLabels(String functionName) {- var labels = new LinkedHashMap<String, String>();+ LinkedHashMap<String, String> labels = new LinkedHashMap<>();config.services().lambda().kubernetes().labels().orElse(List.of()).forEach(entry -> {- var eq = entry.indexOf('=');- var key = eq > 0 ? entry.substring(0, eq).trim() : "";- var value = eq > 0 ? entry.substring(eq + 1).trim() : "";+ int eq = entry.indexOf('=');+ String key = eq > 0 ? entry.substring(0, eq).trim() : "";+ String value = eq > 0 ? entry.substring(eq + 1).trim() : "";// Invalid entries are dropped, not sanitized: a silently rewritten label// would no longer match the NetworkPolicy/selector the user wrote it for,// and the API server would reject the pod at cold start otherwise.@@ -239,9 +239,9 @@ public class LambdaPodSpecFactory {* suffix stays intact; the function name is truncated to fit.*/static String podName(String functionName, String shortId) {- var prefix = "floci-lambda-";- var sanitized = functionName.toLowerCase(Locale.ROOT).replaceAll("[^a-z0-9-]", "-");- var budget = MAX_NAME_LENGTH - prefix.length() - shortId.length() - 1;+ String prefix = "floci-lambda-";+ String sanitized = functionName.toLowerCase(Locale.ROOT).replaceAll("[^a-z0-9-]", "-");+ int budget = MAX_NAME_LENGTH - prefix.length() - shortId.length() - 1;if (sanitized.length() > budget) {sanitized = sanitized.substring(0, budget);}@@ -254,7 +254,7 @@ public class LambdaPodSpecFactory {/** Label values allow [a-zA-Z0-9-_.], max 63 chars, alphanumeric at both ends. */static String sanitizeLabelValue(String value) {- var sanitized = value.replaceAll("[^a-zA-Z0-9-_.]", "-");+ String sanitized = value.replaceAll("[^a-zA-Z0-9-_.]", "-");if (sanitized.length() > MAX_NAME_LENGTH) {sanitized = sanitized.substring(0, MAX_NAME_LENGTH);}@@ -271,7 +271,7 @@ public class LambdaPodSpecFactory {}private static ArrayNode stringArray(JsonNodeFactory nodes, List<String> values) {- var array = nodes.arrayNode();+ ArrayNode array = nodes.arrayNode();values.forEach(array::add);return array;}@@ -287,11 +287,11 @@ public class LambdaPodSpecFactory {}private static ArrayNode toEnvVars(JsonNodeFactory nodes, List<String> env) {- var vars = nodes.arrayNode();- for (var entry : env) {- var eq = entry.indexOf('=');- var key = eq >= 0 ? entry.substring(0, eq) : entry;- var value = eq >= 0 ? entry.substring(eq + 1) : "";+ ArrayNode vars = nodes.arrayNode();+ for (String entry : env) {+ int eq = entry.indexOf('=');+ String key = eq >= 0 ? entry.substring(0, eq) : entry;+ String value = eq >= 0 ? entry.substring(eq + 1) : "";// The API server rejects a pod whose env var has an empty name.if (key.isEmpty()) {LOG.warnv("Skipping env entry with an empty name in the pod spec: ''{0}''", entry);diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/runtime/RuntimeApiServer.java b/src/main/java/io/github/hectorvent/floci/services/lambda/runtime/RuntimeApiServer.javaindex 079b165290..2d7ea611e1 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/runtime/RuntimeApiServer.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/runtime/RuntimeApiServer.java@@ -420,7 +420,7 @@ public class RuntimeApiServer {return;}List<String> events = List.of("INVOKE", "SHUTDOWN");- var body = ctx.body().asJsonObject();+ JsonObject body = ctx.body().asJsonObject();if (body != null && body.getJsonArray("events") != null) {events = body.getJsonArray("events").stream().map(String::valueOf).toList();}diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/zip/CodeStore.java b/src/main/java/io/github/hectorvent/floci/services/lambda/zip/CodeStore.javaindex 4c12cf026e..11167feff6 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/zip/CodeStore.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/zip/CodeStore.java@@ -10,6 +10,7 @@ import java.nio.file.StandardCopyOption;import java.nio.file.Files;import java.nio.file.Path;import java.util.Comparator;+import java.util.stream.Stream;/*** Manages on-disk locations of extracted Lambda function code.@@ -101,7 +102,7 @@ public class CodeStore {}Path target = getVersionCodePath(accountId, region, functionName, version);deleteDirectory(target, functionName);- try (var walk = Files.walk(source)) {+ try (Stream<Path> walk = Files.walk(source)) {for (Path from : walk.toList()) {Path to = target.resolve(source.relativize(from).toString());if (Files.isDirectory(from)) {@@ -148,7 +149,7 @@ public class CodeStore {if (!Files.exists(path)) {return;}- try (var walk = Files.walk(path)) {+ try (Stream<Path> walk = Files.walk(path)) {walk.sorted(Comparator.reverseOrder()).forEach(p -> {try {@@ -168,7 +169,7 @@ public class CodeStore {if (!Files.exists(codePath)) {return false;}- try (var listing = Files.list(codePath)) {+ try (Stream<Path> listing = Files.list(codePath)) {return listing.findAny().isPresent();} catch (IOException e) {return false;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/zip/ZipExtractor.java b/src/main/java/io/github/hectorvent/floci/services/lambda/zip/ZipExtractor.javaindex a7de922a00..90e5398289 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/zip/ZipExtractor.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/zip/ZipExtractor.java@@ -11,7 +11,9 @@ import java.nio.file.Files;import java.nio.file.Path;import java.nio.file.StandardCopyOption;import java.util.Comparator;+import java.util.Enumeration;import java.util.UUID;+import java.util.stream.Stream;import java.util.zip.CRC32;import java.util.zip.ZipEntry;import java.util.zip.ZipException;@@ -81,7 +83,7 @@ public class ZipExtractor {try {Files.write(staged, zipBytes);try (ZipFile zip = new ZipFile(staged.toFile())) {- var entries = zip.entries();+ Enumeration<? extends ZipEntry> entries = zip.entries();int entryCount = 0;long expandedBytes = 0;while (entries.hasMoreElements()) {@@ -224,7 +226,7 @@ public class ZipExtractor {if (!Files.exists(root)) {return;}- try (var paths = Files.walk(root)) {+ try (Stream<Path> paths = Files.walk(root)) {for (Path p : paths.sorted(Comparator.reverseOrder()).toList()) {Files.deleteIfExists(p);}diff --git a/src/main/java/io/github/hectorvent/floci/services/marketplace/MarketplaceEntitlementService.java b/src/main/java/io/github/hectorvent/floci/services/marketplace/MarketplaceEntitlementService.javaindex d4a2c58d58..839a35e2d6 100644--- a/src/main/java/io/github/hectorvent/floci/services/marketplace/MarketplaceEntitlementService.java+++ b/src/main/java/io/github/hectorvent/floci/services/marketplace/MarketplaceEntitlementService.java@@ -15,6 +15,7 @@ import jakarta.inject.Inject;import java.util.ArrayList;import java.util.Comparator;+import java.util.Iterator;import java.util.List;import java.util.Map;import java.util.Set;@@ -109,9 +110,9 @@ public class MarketplaceEntitlementService implements Resettable {if (filter == null || filter.isNull()) {return true;}- var fields = filter.fields();+ Iterator<Map.Entry<String, JsonNode>> fields = filter.fields();while (fields.hasNext()) {- var entry = fields.next();+ Map.Entry<String, JsonNode> entry = fields.next();String actual = switch (entry.getKey()) {case "CUSTOMER_IDENTIFIER" -> entitlement.customerIdentifier();case "CUSTOMER_AWS_ACCOUNT_ID" -> entitlement.customerAwsAccountId();diff --git a/src/main/java/io/github/hectorvent/floci/services/memorydb/MemoryDbService.java b/src/main/java/io/github/hectorvent/floci/services/memorydb/MemoryDbService.javaindex b000ebde86..c60055e12d 100644--- a/src/main/java/io/github/hectorvent/floci/services/memorydb/MemoryDbService.java+++ b/src/main/java/io/github/hectorvent/floci/services/memorydb/MemoryDbService.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.memorydb;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;@@ -26,6 +27,7 @@ import java.util.ArrayList;import java.util.Collection;import java.util.List;import java.util.Map;+import java.util.Optional;import java.util.Set;import java.util.concurrent.ConcurrentHashMap;@@ -526,7 +528,7 @@ public class MemoryDbService {throw new AwsException("InvalidParameterValueException", "ResourceArn is required.", 400);}try {- var arn = io.github.hectorvent.floci.core.common.AwsArnUtils.parse(resourceArn);+ AwsArnUtils.Arn arn = AwsArnUtils.parse(resourceArn);if (!"memorydb".equals(arn.service()) || !currentRegion().equals(arn.region())|| !regionResolver.getAccountId().equals(arn.accountId())) {throw new IllegalArgumentException("ARN owner mismatch");@@ -647,11 +649,11 @@ public class MemoryDbService {}private <V> java.util.Optional<V> resourceGet(StorageBackend<String, V> store, String name, String region) {- var result = store.get(key(region, name));+ Optional<V> result = store.get(key(region, name));if (result.isPresent()) {return result;}- var legacy = legacyGet(store, name, region);+ Optional<V> legacy = legacyGet(store, name, region);if (legacy.isPresent()) {setOwner(legacy.get(), region);store.put(key(region, name), legacy.get());diff --git a/src/main/java/io/github/hectorvent/floci/services/msk/MskController.java b/src/main/java/io/github/hectorvent/floci/services/msk/MskController.javaindex 936e46d9d4..af2ce3f7a8 100644--- a/src/main/java/io/github/hectorvent/floci/services/msk/MskController.java+++ b/src/main/java/io/github/hectorvent/floci/services/msk/MskController.java@@ -57,14 +57,14 @@ public class MskController {@GET@Path("/v1/clusters")public Response listClusters() {- var clusters = mskService.listProvisionedClusters().stream().map(this::toClusterViewV1).toList();+ List<Map<String, Object>> clusters = mskService.listProvisionedClusters().stream().map(this::toClusterViewV1).toList();return Response.ok(Map.of("clusterInfoList", clusters)).build();}@GET@Path("/api/v2/clusters")public Response listClustersV2() {- var clusters = mskService.listClusters().stream().map(this::toClusterViewV2).toList();+ List<Map<String, Object>> clusters = mskService.listClusters().stream().map(this::toClusterViewV2).toList();return Response.ok(Map.of("clusterInfoList", clusters)).build();}@@ -121,7 +121,7 @@ public class MskController {@QueryParam("nextToken") String nextToken) {PaginatedResult<MskConfiguration> result = mskService.listConfigurations(Pagination.parseMaxResults(maxResultsParam, "BadRequestException"), nextToken);- var configurations = result.items().stream()+ List<Map<String, Object>> configurations = result.items().stream().map(this::toConfigurationView).toList();diff --git a/src/main/java/io/github/hectorvent/floci/services/msk/RedpandaManager.java b/src/main/java/io/github/hectorvent/floci/services/msk/RedpandaManager.javaindex 15640291ab..14fc520987 100644--- a/src/main/java/io/github/hectorvent/floci/services/msk/RedpandaManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/msk/RedpandaManager.java@@ -1,5 +1,9 @@package io.github.hectorvent.floci.services.msk;+import com.github.dockerjava.api.DockerClient;+import com.github.dockerjava.api.command.InspectContainerResponse;+import com.github.dockerjava.api.model.ExposedPort;+import com.github.dockerjava.api.model.Ports;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -220,10 +224,10 @@ public class RedpandaManager {// Derive admin URL from the containerString adminUrl;if (!containerDetector.isRunningInContainer()) {- var dockerClient = lifecycleManager.getDockerClient();- var inspect = dockerClient.inspectContainerCmd(cluster.getContainerId()).exec();- var bindings = inspect.getNetworkSettings().getPorts().getBindings();- var binding = bindings.get(com.github.dockerjava.api.model.ExposedPort.tcp(ADMIN_PORT));+ DockerClient dockerClient = lifecycleManager.getDockerClient();+ InspectContainerResponse inspect = dockerClient.inspectContainerCmd(cluster.getContainerId()).exec();+ Map<ExposedPort, Ports.Binding[]> bindings = inspect.getNetworkSettings().getPorts().getBindings();+ Ports.Binding[] binding = bindings.get(ExposedPort.tcp(ADMIN_PORT));if (binding != null && binding.length > 0) {adminUrl = "http://localhost:" + binding[0].getHostPortSpec() + ADMIN_READY_PATH;} else {diff --git a/src/main/java/io/github/hectorvent/floci/services/oam/OamService.java b/src/main/java/io/github/hectorvent/floci/services/oam/OamService.javaindex 4663d18168..a6d17b8f3e 100644--- a/src/main/java/io/github/hectorvent/floci/services/oam/OamService.java+++ b/src/main/java/io/github/hectorvent/floci/services/oam/OamService.java@@ -18,6 +18,7 @@ import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Base64;import java.util.Collection;+import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Locale;@@ -301,14 +302,14 @@ public class OamService {return true;}List<String> allowed = new ArrayList<>();- var operators = condition.fields();+ Iterator<Map.Entry<String, JsonNode>> operators = condition.fields();while (operators.hasNext()) {Map.Entry<String, JsonNode> operator = operators.next();JsonNode entries = operator.getValue();if (!entries.isObject()) {return false;}- var conditions = entries.fields();+ Iterator<Map.Entry<String, JsonNode>> conditions = entries.fields();while (conditions.hasNext()) {Map.Entry<String, JsonNode> entry = conditions.next();if (!"oam:ResourceTypes".equalsIgnoreCase(entry.getKey())) {diff --git a/src/main/java/io/github/hectorvent/floci/services/pipes/PipesController.java b/src/main/java/io/github/hectorvent/floci/services/pipes/PipesController.javaindex 312d48c699..76cc522af7 100644--- a/src/main/java/io/github/hectorvent/floci/services/pipes/PipesController.java+++ b/src/main/java/io/github/hectorvent/floci/services/pipes/PipesController.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.pipes;+import com.fasterxml.jackson.databind.node.ArrayNode;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsErrorResponse;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -160,7 +161,7 @@ public class PipesController {desiredState, currentState, region);ObjectNode response = objectMapper.createObjectNode();- var pipesArray = response.putArray("Pipes");+ ArrayNode pipesArray = response.putArray("Pipes");for (Pipe pipe : pipes) {pipesArray.add(buildPipeListEntry(pipe));}diff --git a/src/main/java/io/github/hectorvent/floci/services/pipes/PipesFilterMatcher.java b/src/main/java/io/github/hectorvent/floci/services/pipes/PipesFilterMatcher.javaindex f8f9467427..35ac24992b 100644--- a/src/main/java/io/github/hectorvent/floci/services/pipes/PipesFilterMatcher.java+++ b/src/main/java/io/github/hectorvent/floci/services/pipes/PipesFilterMatcher.java@@ -8,7 +8,9 @@ import org.jboss.logging.Logger;import java.math.BigDecimal;import java.util.ArrayList;+import java.util.Iterator;import java.util.List;+import java.util.Map;@ApplicationScopedpublic class PipesFilterMatcher {@@ -70,9 +72,9 @@ public class PipesFilterMatcher {if (!pattern.isObject()) {return false;}- var fields = pattern.fields();+ Iterator<Map.Entry<String, JsonNode>> fields = pattern.fields();while (fields.hasNext()) {- var field = fields.next();+ Map.Entry<String, JsonNode> field = fields.next();String key = field.getKey();JsonNode patternValue = field.getValue();JsonNode actualValue = actual.path(key);diff --git a/src/main/java/io/github/hectorvent/floci/services/pipes/PipesPoller.java b/src/main/java/io/github/hectorvent/floci/services/pipes/PipesPoller.javaindex bcfcaee4d8..3783316817 100644--- a/src/main/java/io/github/hectorvent/floci/services/pipes/PipesPoller.java+++ b/src/main/java/io/github/hectorvent/floci/services/pipes/PipesPoller.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.pipes;import com.fasterxml.jackson.core.JsonProcessingException;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;@@ -623,7 +624,7 @@ public class PipesPoller implements Resettable {}private String bareArray(List<JsonNode> records) {- var arr = objectMapper.createArrayNode();+ ArrayNode arr = objectMapper.createArrayNode();records.forEach(arr::add);return arr.toString();}@@ -688,7 +689,7 @@ public class PipesPoller implements Resettable {private String wrapRecords(List<JsonNode> records) {try {- var recordsArray = objectMapper.createArrayNode();+ ArrayNode recordsArray = objectMapper.createArrayNode();records.forEach(recordsArray::add);ObjectNode root = objectMapper.createObjectNode();root.set("Records", recordsArray);@@ -778,14 +779,14 @@ public class PipesPoller implements Resettable {putKafkaBinaryField(node, "key", record.key());putKafkaBinaryField(node, "value", record.value());- var headersNode = node.putArray("headers");+ ArrayNode headersNode = node.putArray("headers");for (KafkaHeaderDto header : record.headers()) {ObjectNode headerNode = objectMapper.createObjectNode();byte[] headerValue = header.value();if (headerValue == null) {headerNode.putNull(header.key());} else {- var values = headerNode.putArray(header.key());+ ArrayNode values = headerNode.putArray(header.key());for (byte b : headerValue) {values.add(b & 0xFF);}diff --git a/src/main/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2Controller.java b/src/main/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2Controller.javaindex 4c6400b72c..b3123d54b8 100644--- a/src/main/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2Controller.java+++ b/src/main/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2Controller.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.resourceexplorer2;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.services.resourceexplorer2.model.*;@@ -94,7 +95,7 @@ public class ResourceExplorer2Controller {String region = regionResolver.resolveRegion(headers);Map<String, String> tags = parseTags(req);Index index = service.createIndex(region, tags);- var result = objectMapper.createObjectNode();+ ObjectNode result = objectMapper.createObjectNode();result.put("Arn", index.arn());result.put("CreatedAt", index.createdAt().toString());// Real AWS returns CREATING immediately; we store ACTIVE synchronously but the@@ -108,7 +109,7 @@ public class ResourceExplorer2Controller {public Response getIndex(@Context HttpHeaders headers) {String region = regionResolver.resolveRegion(headers);Index index = service.getIndex(region);- var result = objectMapper.createObjectNode();+ ObjectNode result = objectMapper.createObjectNode();result.put("Arn", index.arn());result.put("CreatedAt", index.createdAt().toString());result.put("LastUpdatedAt", index.lastUpdatedAt().toString());@@ -129,7 +130,7 @@ public class ResourceExplorer2Controller {throw new AwsException("ValidationException", "Arn is required", 400);}Index deleted = service.deleteIndex(indexArn);- var result = objectMapper.createObjectNode();+ ObjectNode result = objectMapper.createObjectNode();result.put("Arn", deleted.arn());result.put("LastUpdatedAt", deleted.lastUpdatedAt().toString());result.put("State", deleted.state().name());@@ -165,7 +166,7 @@ public class ResourceExplorer2Controller {throw new AwsException("ValidationException", "Invalid index type: " + req.get("Type").asText(), 400);}Index index = service.updateIndexType(arn, type);- var result = objectMapper.createObjectNode();+ ObjectNode result = objectMapper.createObjectNode();result.put("Arn", index.arn());result.put("LastUpdatedAt", index.lastUpdatedAt().toString());result.put("State", index.state().name());@@ -184,7 +185,7 @@ public class ResourceExplorer2Controller {List<IncludedProperty> includedProperties = parseIncludedProperties(req);Map<String, String> tags = parseTags(req);View view = service.createView(region, viewName, scope, filters, includedProperties, tags);- var result = objectMapper.createObjectNode();+ ObjectNode result = objectMapper.createObjectNode();result.set("View", service.buildViewNode(view));return Response.ok(result).build();}@@ -198,7 +199,7 @@ public class ResourceExplorer2Controller {throw new AwsException("ValidationException", "ViewArn is required", 400);}View view = service.getView(viewArn);- var result = objectMapper.createObjectNode();+ ObjectNode result = objectMapper.createObjectNode();result.set("View", service.buildViewNode(view));result.set("Tags", objectMapper.valueToTree(view.tags() != null ? view.tags() : Map.of()));@@ -214,7 +215,7 @@ public class ResourceExplorer2Controller {throw new AwsException("ValidationException", "ViewArn is required", 400);}service.deleteView(viewArn);- var result = objectMapper.createObjectNode();+ ObjectNode result = objectMapper.createObjectNode();result.put("ViewArn", viewArn);return Response.ok(result).build();}@@ -230,7 +231,7 @@ public class ResourceExplorer2Controller {SearchFilter filters = parseFilters(req);List<IncludedProperty> includedProperties = parseIncludedProperties(req);View view = service.updateView(viewArn, filters, includedProperties);- var result = objectMapper.createObjectNode();+ ObjectNode result = objectMapper.createObjectNode();result.set("View", service.buildViewNode(view));return Response.ok(result).build();}@@ -261,7 +262,7 @@ public class ResourceExplorer2Controller {throw new AwsException("ValidationException", "ViewArn is required", 400);}service.associateDefaultView(regionResolver.resolveRegion(headers), viewArn);- var result = objectMapper.createObjectNode();+ ObjectNode result = objectMapper.createObjectNode();result.put("ViewArn", viewArn);return Response.ok(result).build();}@@ -277,7 +278,7 @@ public class ResourceExplorer2Controller {@Path("/GetDefaultView")public Response getDefaultView(@Context HttpHeaders headers) {String viewArn = service.getDefaultView(regionResolver.resolveRegion(headers));- var result = objectMapper.createObjectNode();+ ObjectNode result = objectMapper.createObjectNode();if (viewArn != null) {result.put("ViewArn", viewArn);}@@ -377,7 +378,7 @@ public class ResourceExplorer2Controller {stringArray(req, "RegionList"),optString(req, "ViewName"),stringArray(req, "AggregatorRegions"));- var result = objectMapper.createObjectNode();+ ObjectNode result = objectMapper.createObjectNode();result.put("TaskId", taskId);return Response.ok(result).build();}@@ -390,7 +391,7 @@ public class ResourceExplorer2Controller {? req.get("DeleteInAllRegions").asBoolean() : null;String taskId = service.deleteResourceExplorerSetup(deleteInAllRegions, stringArray(req, "RegionList"));- var result = objectMapper.createObjectNode();+ ObjectNode result = objectMapper.createObjectNode();result.put("TaskId", taskId);return Response.ok(result).build();}@@ -442,7 +443,7 @@ public class ResourceExplorer2Controller {private List<IncludedProperty> parseIncludedProperties(JsonNode req) {List<IncludedProperty> includedProperties = new ArrayList<>();if (req.has("IncludedProperties") && req.get("IncludedProperties").isArray()) {- for (var p : req.get("IncludedProperties")) {+ for (JsonNode p : req.get("IncludedProperties")) {includedProperties.add(new IncludedProperty(p.has("Name") ? p.get("Name").asText() : ""));}}diff --git a/src/main/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2Service.java b/src/main/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2Service.javaindex 5be52ab22d..0d6e0bc900 100644--- a/src/main/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2Service.java+++ b/src/main/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2Service.java@@ -1027,7 +1027,7 @@ public class ResourceExplorer2Service {if (includeTags && r.tags() != null && !r.tags().isEmpty()) {ObjectNode tagProp = objectMapper.createObjectNode();ArrayNode tagData = objectMapper.createArrayNode();- for (var entry : r.tags().entrySet()) {+ for (Map.Entry<String, String> entry : r.tags().entrySet()) {ObjectNode tagEntry = objectMapper.createObjectNode();tagEntry.put("Key", entry.getKey());tagEntry.put("Value", entry.getValue());diff --git a/src/main/java/io/github/hectorvent/floci/services/resourceexplorer2/query/ResourceFilter.java b/src/main/java/io/github/hectorvent/floci/services/resourceexplorer2/query/ResourceFilter.javaindex 53f690103e..eb609cc55e 100644--- a/src/main/java/io/github/hectorvent/floci/services/resourceexplorer2/query/ResourceFilter.java+++ b/src/main/java/io/github/hectorvent/floci/services/resourceexplorer2/query/ResourceFilter.java@@ -41,7 +41,7 @@ public final class ResourceFilter {*/public static boolean matches(ExplorerResource resource, ParsedQuery query,Set<String> taggableResourceTypes) {- for (var filter : query.filters()) {+ for (ParsedQuery.Filter filter : query.filters()) {boolean anyValueMatches = filter.values().stream().anyMatch(v -> matchesValue(resource, filter.attribute(), v, taggableResourceTypes));if (filter.negated()) {@@ -63,7 +63,7 @@ public final class ResourceFilter {private static boolean matchesKeywords(ExplorerResource resource, List<ParsedQuery.Keyword> keywords) {boolean sawPositive = false;boolean anyPositiveMatched = false;- for (var keyword : keywords) {+ for (ParsedQuery.Keyword keyword : keywords) {boolean matched = matchesKeyword(resource, keyword.value());if (keyword.negated()) {if (matched) {diff --git a/src/main/java/io/github/hectorvent/floci/services/route53resolver/Route53ResolverJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/route53resolver/Route53ResolverJsonHandler.javaindex 5fcbee06fe..9c19c9ebbc 100644--- a/src/main/java/io/github/hectorvent/floci/services/route53resolver/Route53ResolverJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/route53resolver/Route53ResolverJsonHandler.java@@ -10,6 +10,8 @@ import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;import org.jboss.logging.Logger;+import java.util.Optional;+/*** JSON 1.1 handler for Route 53 Resolver operations.* Dispatches {@code X-Amz-Target: Route53Resolver.*} actions to {@link Route53ResolverService}.@@ -106,7 +108,7 @@ public class Route53ResolverJsonHandler {private Response handleGetFirewallDomainList(JsonNode request, String region) {String id = text(request, "FirewallDomainListId");- var custom = service.getCustomFirewallDomainList(id);+ Optional<ObjectNode> custom = service.getCustomFirewallDomainList(id);if (custom.isPresent()) {return firewallDomainListResponse(custom.get());}diff --git a/src/main/java/io/github/hectorvent/floci/services/rum/RumController.java b/src/main/java/io/github/hectorvent/floci/services/rum/RumController.javaindex 4a4b757258..1b4903c052 100644--- a/src/main/java/io/github/hectorvent/floci/services/rum/RumController.java+++ b/src/main/java/io/github/hectorvent/floci/services/rum/RumController.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.rum;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.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -110,7 +111,7 @@ public class RumController {RumService.Page page = service.listAppMonitors(regionResolver.resolveRegion(headers), maxResults, nextToken);ObjectNode response = objectMapper.createObjectNode();- var summaries = response.putArray("AppMonitorSummaries");+ ArrayNode summaries = response.putArray("AppMonitorSummaries");for (AppMonitor monitor : page.monitors()) {ObjectNode summary = objectMapper.createObjectNode();summary.put("Created", monitor.getCreated());diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/PreSignedUrlFilter.java b/src/main/java/io/github/hectorvent/floci/services/s3/PreSignedUrlFilter.javaindex 4d7522b4f1..212eadc582 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3/PreSignedUrlFilter.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3/PreSignedUrlFilter.java@@ -21,6 +21,7 @@ import java.util.ArrayList;import java.util.Comparator;import java.util.List;import java.util.Locale;+import java.util.Map;import java.util.Optional;import java.util.Set;import java.util.stream.Collectors;@@ -66,7 +67,7 @@ public class PreSignedUrlFilter implements ContainerRequestFilter {return;}- var queryParams = requestContext.getUriInfo().getQueryParameters();+ MultivaluedMap<String, String> queryParams = requestContext.getUriInfo().getQueryParameters();// Only process if this is a pre-signed URL requestString algorithm = queryParams.getFirst("X-Amz-Algorithm");@@ -198,7 +199,7 @@ public class PreSignedUrlFilter implements ContainerRequestFilter {private boolean verifySigV4Signature(ContainerRequestContext requestContext,String signature, String secretKey) {try {- var queryParams = requestContext.getUriInfo().getQueryParameters();+ MultivaluedMap<String, String> queryParams = requestContext.getUriInfo().getQueryParameters();String credential = queryParams.getFirst("X-Amz-Credential");String amzDate = queryParams.getFirst("X-Amz-Date");String signedHeaders = queryParams.getFirst("X-Amz-SignedHeaders");@@ -285,7 +286,7 @@ public class PreSignedUrlFilter implements ContainerRequestFilter {*/static String buildCanonicalQueryString(MultivaluedMap<String, String> decodedParams) {List<String[]> encodedParams = new ArrayList<>();- for (var entry : decodedParams.entrySet()) {+ for (Map.Entry<String, List<String>> entry : decodedParams.entrySet()) {if ("X-Amz-Signature".equals(entry.getKey())) {continue;}diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/model/S3Object.java b/src/main/java/io/github/hectorvent/floci/services/s3/model/S3Object.javaindex 8850b6f8aa..cff8b443a6 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3/model/S3Object.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3/model/S3Object.java@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.security.MessageDigest;import java.time.Instant;import java.time.temporal.ChronoUnit;import java.util.ArrayList;@@ -163,9 +164,9 @@ public class S3Object {public static String computeETag(byte[] data) {try {- var md = java.security.MessageDigest.getInstance("MD5");+ MessageDigest md = MessageDigest.getInstance("MD5");byte[] digest = md.digest(data);- var sb = new StringBuilder("\"");+ StringBuilder sb = new StringBuilder("\"");for (byte b : digest) {sb.append(String.format("%02x", b));}diff --git a/src/main/java/io/github/hectorvent/floci/services/securityadmin/SecurityAdminController.java b/src/main/java/io/github/hectorvent/floci/services/securityadmin/SecurityAdminController.javaindex fce129dc94..4fa9b1c764 100644--- a/src/main/java/io/github/hectorvent/floci/services/securityadmin/SecurityAdminController.java+++ b/src/main/java/io/github/hectorvent/floci/services/securityadmin/SecurityAdminController.java@@ -1,6 +1,8 @@package io.github.hectorvent.floci.services.securityadmin;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.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.SigV4CredentialScope;@@ -55,8 +57,8 @@ public class SecurityAdminController {if ("guardduty".equals(service) || service.isBlank()) {GuardDutyService.Page<AdminAccount> page = guardDutyService.listOrganizationAdminAccounts(regionResolver.resolveRegion(headers), maxResults, nextToken);- var response = mapper.createObjectNode();- var accounts = response.putArray("adminAccounts");+ ObjectNode response = mapper.createObjectNode();+ ArrayNode accounts = response.putArray("adminAccounts");for (AdminAccount account : page.items()) {accounts.add(mapper.valueToTree(account));}diff --git a/src/main/java/io/github/hectorvent/floci/services/securityhub/SecurityHubController.java b/src/main/java/io/github/hectorvent/floci/services/securityhub/SecurityHubController.javaindex 50b8132b58..a84c4d4b08 100644--- a/src/main/java/io/github/hectorvent/floci/services/securityhub/SecurityHubController.java+++ b/src/main/java/io/github/hectorvent/floci/services/securityhub/SecurityHubController.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.securityhub;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.AwsException;import io.github.hectorvent.floci.core.common.JsonErrorResponseUtils;@@ -58,7 +59,7 @@ public class SecurityHubController {}SecurityHubState state = securityHubService.organizationAdminState(region(headers));ObjectNode response = objectMapper.createObjectNode();- var accounts = response.putArray("AdminAccounts");+ ArrayNode accounts = response.putArray("AdminAccounts");String requestedFeature = securityHubService.normalizeFeature(feature);if (state.getAdminAccountId() != null && requestedFeature.equals(state.getAdminFeature())) {accounts.addObject()@@ -122,7 +123,7 @@ public class SecurityHubController {}SecurityHubState state = securityHubService.state(region(headers));ObjectNode response = objectMapper.createObjectNode();- var items = response.putArray("FindingAggregators");+ ArrayNode items = response.putArray("FindingAggregators");if (state.getAggregatorArn() != null) {items.addObject().put("FindingAggregatorArn", state.getAggregatorArn());}@@ -185,7 +186,7 @@ public class SecurityHubController {PaginatedResult<java.util.Map.Entry<String, JsonNode>> page =securityHubService.policyPage(region, maxResults, nextToken);ObjectNode response = objectMapper.createObjectNode();- var items = response.putArray("ConfigurationPolicySummaries");+ ArrayNode items = response.putArray("ConfigurationPolicySummaries");page.items().forEach(entry -> items.add(policySummary(region, entry.getKey(), entry.getValue())));if (page.nextToken() != null) {response.put("NextToken", page.nextToken());@@ -246,7 +247,7 @@ public class SecurityHubController {String region = region(headers);PaginatedResult<SecurityHubAssociation> page = securityHubService.associationPage(region, readTree(body));ObjectNode response = objectMapper.createObjectNode();- var items = response.putArray("ConfigurationPolicyAssociationSummaries");+ ArrayNode items = response.putArray("ConfigurationPolicyAssociationSummaries");page.items().forEach(entry -> items.add(association(entry)));if (page.nextToken() != null) {response.put("NextToken", page.nextToken());diff --git a/src/main/java/io/github/hectorvent/floci/services/servicecatalog/ServiceCatalogJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/servicecatalog/ServiceCatalogJsonHandler.javaindex 58d0f51268..3d3af53a37 100644--- a/src/main/java/io/github/hectorvent/floci/services/servicecatalog/ServiceCatalogJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/servicecatalog/ServiceCatalogJsonHandler.java@@ -362,7 +362,7 @@ public class ServiceCatalogJsonHandler {private Response batchDisassociateServiceActionFromProvisioningArtifact(JsonNode request) {ObjectNode response = objectMapper.createObjectNode();- var failures = service.batchDisassociateServiceActionFromProvisioningArtifact(request);+ List<ObjectNode> failures = service.batchDisassociateServiceActionFromProvisioningArtifact(request);if (!failures.isEmpty()) {ArrayNode failed = response.putArray("FailedServiceActionAssociations");failures.forEach(failed::add);@@ -640,8 +640,8 @@ public class ServiceCatalogJsonHandler {}}- var all = service.listProvisionedProductPlans(provisionProductId);- var page = all.stream().skip(offset).limit(pageSize).toList();+ List<ObjectNode> all = service.listProvisionedProductPlans(provisionProductId);+ List<ObjectNode> page = all.stream().skip(offset).limit(pageSize).toList();ObjectNode response = objectMapper.createObjectNode();ArrayNode plans = response.putArray("ProvisionedProductPlans");@@ -698,7 +698,7 @@ public class ServiceCatalogJsonHandler {private Response listServiceActions() {ObjectNode response = objectMapper.createObjectNode();- var summaries = response.putArray("ServiceActionSummaries");+ ArrayNode summaries = response.putArray("ServiceActionSummaries");service.listServiceActions().forEach(action -> {ObjectNode summary = objectMapper.createObjectNode();summary.put("Id", action.path("Id").asText());diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SmtpRelay.java b/src/main/java/io/github/hectorvent/floci/services/ses/SmtpRelay.javaindex 2e5d3b4e5f..abafa29b5d 100644--- a/src/main/java/io/github/hectorvent/floci/services/ses/SmtpRelay.java+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SmtpRelay.java@@ -31,6 +31,7 @@ import org.jboss.logging.Logger;import java.io.ByteArrayInputStream;import java.io.ByteArrayOutputStream;import java.io.IOException;+import java.io.InputStream;import java.nio.charset.Charset;import java.nio.charset.StandardCharsets;import java.util.ArrayList;@@ -310,8 +311,8 @@ public class SmtpRelay {private void doRelayRaw(RawRelayMessage relayMessage) {try {byte[] mimeBytes = tryBase64Decode(relayMessage.rawMessage());- var builder = new DefaultMessageBuilder();- var message = builder.parseMessage(new ByteArrayInputStream(mimeBytes));+ DefaultMessageBuilder builder = new DefaultMessageBuilder();+ Message message = builder.parseMessage(new ByteArrayInputStream(mimeBytes));MailMessage mail = new MailMessage();@@ -573,7 +574,7 @@ public class SmtpRelay {textBody.getMimeCharset());}}- try (var is = textBody.getInputStream()) {+ try (InputStream is = textBody.getInputStream()) {return new String(is.readAllBytes(), charset);}} catch (Exception e) {diff --git a/src/main/java/io/github/hectorvent/floci/services/sns/SnsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/sns/SnsJsonHandler.javaindex cbee2b7e82..5cf5f61baf 100644--- a/src/main/java/io/github/hectorvent/floci/services/sns/SnsJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/sns/SnsJsonHandler.java@@ -113,7 +113,7 @@ public class SnsJsonHandler {Map<String, String> attrs = snsService.getTopicAttributes(topicArn, region);ObjectNode response = objectMapper.createObjectNode();ObjectNode attrsNode = response.putObject("Attributes");- for (var entry : attrs.entrySet()) {+ for (Map.Entry<String, String> entry : attrs.entrySet()) {attrsNode.put(entry.getKey(), entry.getValue());}return Response.ok(response).build();@@ -240,7 +240,7 @@ public class SnsJsonHandler {Map<String, String> tags = snsService.listTagsForResource(resourceArn, region);ObjectNode response = objectMapper.createObjectNode();ArrayNode tagsArray = response.putArray("Tags");- for (var entry : tags.entrySet()) {+ for (Map.Entry<String, String> entry : tags.entrySet()) {ObjectNode tag = objectMapper.createObjectNode();tag.put("Key", entry.getKey());tag.put("Value", entry.getValue());@@ -311,7 +311,7 @@ public class SnsJsonHandler {Map<String, String> attrs = snsService.getSubscriptionAttributes(subscriptionArn, region);ObjectNode response = objectMapper.createObjectNode();ObjectNode attrsNode = response.putObject("Attributes");- for (var entry : attrs.entrySet()) {+ for (Map.Entry<String, String> entry : attrs.entrySet()) {attrsNode.put(entry.getKey(), entry.getValue());}return Response.ok(response).build();@@ -366,7 +366,7 @@ public class SnsJsonHandler {Map<String, String> attrs = snsService.getPlatformApplicationAttributes(arn, region);ObjectNode response = objectMapper.createObjectNode();ObjectNode attrsNode = response.putObject("Attributes");- for (var entry : attrs.entrySet()) {+ for (Map.Entry<String, String> entry : attrs.entrySet()) {attrsNode.put(entry.getKey(), entry.getValue());}return Response.ok(response).build();@@ -387,7 +387,7 @@ public class SnsJsonHandler {ObjectNode node = objectMapper.createObjectNode();node.put("PlatformApplicationArn", app.getArn());ObjectNode attrsNode = node.putObject("Attributes");- for (var entry : app.getAttributes().entrySet()) {+ for (Map.Entry<String, String> entry : app.getAttributes().entrySet()) {attrsNode.put(entry.getKey(), entry.getValue());}arr.add(node);@@ -417,7 +417,7 @@ public class SnsJsonHandler {Map<String, String> attrs = snsService.getEndpointAttributes(arn, region);ObjectNode response = objectMapper.createObjectNode();ObjectNode attrsNode = response.putObject("Attributes");- for (var entry : attrs.entrySet()) {+ for (Map.Entry<String, String> entry : attrs.entrySet()) {attrsNode.put(entry.getKey(), entry.getValue());}return Response.ok(response).build();@@ -439,7 +439,7 @@ public class SnsJsonHandler {ObjectNode node = objectMapper.createObjectNode();node.put("EndpointArn", ep.getArn());ObjectNode attrsNode = node.putObject("Attributes");- for (var entry : ep.getAttributes().entrySet()) {+ for (Map.Entry<String, String> entry : ep.getAttributes().entrySet()) {attrsNode.put(entry.getKey(), entry.getValue());}arr.add(node);diff --git a/src/main/java/io/github/hectorvent/floci/services/sns/SnsQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/sns/SnsQueryHandler.javaindex 8e2ce60322..b8209c0dd0 100644--- a/src/main/java/io/github/hectorvent/floci/services/sns/SnsQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/sns/SnsQueryHandler.java@@ -95,7 +95,7 @@ public class SnsQueryHandler {private Response handleListTopics(MultivaluedMap<String, String> params, String region) {List<Topic> topics = snsService.listTopics(region);- var xml = new XmlBuilder().start("Topics");+ XmlBuilder xml = new XmlBuilder().start("Topics");for (Topic t : topics) {xml.start("member").elem("TopicArn", t.getTopicArn()).end("member");}@@ -108,8 +108,8 @@ public class SnsQueryHandler {try {Map<String, String> attrs = snsService.getTopicAttributes(topicArn, region);- var xml = new XmlBuilder().start("Attributes");- for (var entry : attrs.entrySet()) {+ XmlBuilder xml = new XmlBuilder().start("Attributes");+ for (Map.Entry<String, String> entry : attrs.entrySet()) {xml.start("entry").elem("key", entry.getKey()).elem("value", entry.getValue())@@ -202,7 +202,7 @@ public class SnsQueryHandler {}private Response buildSubscriptionListResponse(String action, List<Subscription> subs) {- var xml = new XmlBuilder().start("Subscriptions");+ XmlBuilder xml = new XmlBuilder().start("Subscriptions");for (Subscription s : subs) {xml.start("member").elem("TopicArn", s.getTopicArn())@@ -267,8 +267,8 @@ public class SnsQueryHandler {String arn = getParam(params, "PlatformApplicationArn");try {Map<String, String> attrs = snsService.getPlatformApplicationAttributes(arn, region);- var xml = new XmlBuilder().start("Attributes");- for (var entry : attrs.entrySet()) {+ XmlBuilder xml = new XmlBuilder().start("Attributes");+ for (Map.Entry<String, String> entry : attrs.entrySet()) {xml.start("entry").elem("key", entry.getKey()).elem("value", entry.getValue()).end("entry");}xml.end("Attributes");@@ -291,10 +291,10 @@ public class SnsQueryHandler {private Response handleListPlatformApplications(String region) {List<PlatformApplication> apps = snsService.listPlatformApplications(region);- var xml = new XmlBuilder().start("PlatformApplications");+ XmlBuilder xml = new XmlBuilder().start("PlatformApplications");for (PlatformApplication app : apps) {xml.start("member").elem("PlatformApplicationArn", app.getArn()).start("Attributes");- for (var entry : app.getAttributes().entrySet()) {+ for (Map.Entry<String, String> entry : app.getAttributes().entrySet()) {xml.start("entry").elem("key", entry.getKey()).elem("value", entry.getValue()).end("entry");}xml.end("Attributes").end("member");@@ -327,8 +327,8 @@ public class SnsQueryHandler {String arn = getParam(params, "EndpointArn");try {Map<String, String> attrs = snsService.getEndpointAttributes(arn, region);- var xml = new XmlBuilder().start("Attributes");- for (var entry : attrs.entrySet()) {+ XmlBuilder xml = new XmlBuilder().start("Attributes");+ for (Map.Entry<String, String> entry : attrs.entrySet()) {xml.start("entry").elem("key", entry.getKey()).elem("value", entry.getValue()).end("entry");}xml.end("Attributes");@@ -353,10 +353,10 @@ public class SnsQueryHandler {String appArn = getParam(params, "PlatformApplicationArn");try {List<PlatformEndpoint> endpoints = snsService.listEndpointsByPlatformApplication(appArn, region);- var xml = new XmlBuilder().start("Endpoints");+ XmlBuilder xml = new XmlBuilder().start("Endpoints");for (PlatformEndpoint ep : endpoints) {xml.start("member").elem("EndpointArn", ep.getArn()).start("Attributes");- for (var entry : ep.getAttributes().entrySet()) {+ for (Map.Entry<String, String> entry : ep.getAttributes().entrySet()) {xml.start("entry").elem("key", entry.getKey()).elem("value", entry.getValue()).end("entry");}xml.end("Attributes").end("member");@@ -398,7 +398,7 @@ public class SnsQueryHandler {try {SnsService.BatchPublishResult result = snsService.publishBatch(topicArn, entries, region);- var xml = new XmlBuilder().start("Successful");+ XmlBuilder xml = new XmlBuilder().start("Successful");for (String[] s : result.successful()) {xml.start("member").elem("Id", s[0]).elem("MessageId", s[1]).end("member");}@@ -420,8 +420,8 @@ public class SnsQueryHandler {String subscriptionArn = getParam(params, "SubscriptionArn");try {Map<String, String> attrs = snsService.getSubscriptionAttributes(subscriptionArn, region);- var xml = new XmlBuilder().start("Attributes");- for (var entry : attrs.entrySet()) {+ XmlBuilder xml = new XmlBuilder().start("Attributes");+ for (Map.Entry<String, String> entry : attrs.entrySet()) {xml.start("entry").elem("key", entry.getKey()).elem("value", entry.getValue()).end("entry");}xml.end("Attributes");@@ -487,8 +487,8 @@ public class SnsQueryHandler {try {Map<String, String> tags = snsService.listTagsForResource(resourceArn, region);- var xml = new XmlBuilder().start("Tags");- for (var entry : tags.entrySet()) {+ XmlBuilder xml = new XmlBuilder().start("Tags");+ for (Map.Entry<String, String> entry : tags.entrySet()) {xml.start("member").elem("Key", entry.getKey()).elem("Value", entry.getValue())diff --git a/src/main/java/io/github/hectorvent/floci/services/sns/SnsService.java b/src/main/java/io/github/hectorvent/floci/services/sns/SnsService.javaindex cd57f6617e..f42f128d62 100644--- a/src/main/java/io/github/hectorvent/floci/services/sns/SnsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/sns/SnsService.java@@ -396,7 +396,7 @@ public class SnsService implements Resettable, ResourceProvider {String key = topicKey(region, topicArn);Topic topic = topicStore.get(key).orElseThrow(() -> new AwsException("NotFound", "Topic does not exist.", 404));- var attrs = new java.util.LinkedHashMap<>(topic.getAttributes());+ LinkedHashMap<String, String> attrs = new LinkedHashMap<>(topic.getAttributes());List<Subscription> subs = subscriptionsByTopic(topicArn, region);long confirmed = subs.stream().filter(s -> !"true".equals(s.getAttributes().get("PendingConfirmation")))@@ -1088,7 +1088,7 @@ public class SnsService implements Resettable, ResourceProvider {String key = subKey(region, subscriptionArn);Subscription sub = subscriptionStore.get(key).orElseThrow(() -> new AwsException("NotFound", "Subscription does not exist.", 404));- var attrs = new java.util.LinkedHashMap<>(sub.getAttributes());+ LinkedHashMap<String, String> attrs = new LinkedHashMap<>(sub.getAttributes());attrs.put("SubscriptionArn", sub.getSubscriptionArn());attrs.put("TopicArn", sub.getTopicArn());attrs.put("Protocol", sub.getProtocol());@@ -1345,9 +1345,9 @@ public class SnsService implements Resettable, ResourceProvider {}return false;}- var fields = policy.fields();+ Iterator<Map.Entry<String, JsonNode>> fields = policy.fields();while (fields.hasNext()) {- var entry = fields.next();+ Map.Entry<String, JsonNode> entry = fields.next();String key = entry.getKey();JsonNode ruleOrNested = entry.getValue();if (isOrOperator(key, ruleOrNested)) {@@ -1842,7 +1842,7 @@ public class SnsService implements Resettable, ResourceProvider {String body = rawDelivery? protocolMessage: buildSnsHttpNotification(protocolMessage, subject, messageAttributes, topicArn, messageId, sub.getSubscriptionArn());- var requestBuilder = HttpRequest.newBuilder()+ HttpRequest.Builder requestBuilder = HttpRequest.newBuilder().uri(URI.create(sub.getEndpoint())).timeout(Duration.ofSeconds(5)).header("Content-Type", "text/plain; charset=UTF-8")@@ -2029,7 +2029,7 @@ public class SnsService implements Resettable, ResourceProvider {snsNode.put("UnsubscribeUrl", "EXAMPLE");ObjectNode attrs = snsNode.putObject("MessageAttributes");if (messageAttributes != null) {- for (var entry : messageAttributes.entrySet()) {+ for (Map.Entry<String, MessageAttributeValue> entry : messageAttributes.entrySet()) {ObjectNode attr = attrs.putObject(entry.getKey());attr.put("Type", entry.getValue().getDataType());if (entry.getValue().getBinaryValue() != null) {@@ -2084,7 +2084,7 @@ public class SnsService implements Resettable, ResourceProvider {node.put("Message", message);ObjectNode attrs = node.putObject("MessageAttributes");if (messageAttributes != null) {- for (var entry : messageAttributes.entrySet()) {+ for (Map.Entry<String, MessageAttributeValue> entry : messageAttributes.entrySet()) {ObjectNode attr = attrs.putObject(entry.getKey());attr.put("Type", entry.getValue().getDataType());if (entry.getValue().getBinaryValue() != null) {@@ -2121,7 +2121,7 @@ public class SnsService implements Resettable, ResourceProvider {node.put("UnsubscribeURL", baseUrl + "/?Action=Unsubscribe&SubscriptionArn=" + subscriptionArn);ObjectNode attrs = node.putObject("MessageAttributes");if (messageAttributes != null) {- for (var entry : messageAttributes.entrySet()) {+ for (Map.Entry<String, MessageAttributeValue> entry : messageAttributes.entrySet()) {ObjectNode attr = attrs.putObject(entry.getKey());attr.put("Type", entry.getValue().getDataType());if (entry.getValue().getBinaryValue() != null) {diff --git a/src/main/java/io/github/hectorvent/floci/services/ssm/SsmDirectCommandExecutor.java b/src/main/java/io/github/hectorvent/floci/services/ssm/SsmDirectCommandExecutor.javaindex c98aa7787b..31ddfeea4d 100644--- a/src/main/java/io/github/hectorvent/floci/services/ssm/SsmDirectCommandExecutor.java+++ b/src/main/java/io/github/hectorvent/floci/services/ssm/SsmDirectCommandExecutor.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.ssm;import com.github.dockerjava.api.DockerClient;import com.github.dockerjava.api.async.ResultCallback;+import com.github.dockerjava.api.command.ExecCreateCmd;import com.github.dockerjava.api.model.Frame;import com.github.dockerjava.api.model.StreamType;import io.github.hectorvent.floci.services.ec2.Ec2Service;@@ -110,7 +111,7 @@ public class SsmDirectCommandExecutor {private ExecutionResult executeInContainer(String containerId, String script, String workingDirectory, int timeoutSeconds)throws InterruptedException {String[] cmd = {"sh", "-c", timeoutWrappedScript(script, timeoutSeconds)};- var create = dockerClient.execCreateCmd(containerId)+ ExecCreateCmd create = dockerClient.execCreateCmd(containerId).withCmd(cmd).withAttachStdout(true).withAttachStderr(true);@@ -204,7 +205,7 @@ public class SsmDirectCommandExecutor {}private String collectFailureDiagnostics(String containerId) throws InterruptedException {- var create = dockerClient.execCreateCmd(containerId)+ ExecCreateCmd create = dockerClient.execCreateCmd(containerId).withCmd("sh", "-c", failureDiagnosticsScript()).withAttachStdout(true).withAttachStderr(true);diff --git a/src/main/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminJsonHandler.javaindex 8a8df7b96a..2c90d2c7e6 100644--- a/src/main/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminJsonHandler.java@@ -6,16 +6,30 @@ import com.fasterxml.jackson.databind.node.ArrayNode;import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.PaginatedResult;+import io.github.hectorvent.floci.services.ssoadmin.model.ApplicationAccessScope;+import io.github.hectorvent.floci.services.ssoadmin.model.ApplicationAuthenticationMethod;+import io.github.hectorvent.floci.services.ssoadmin.model.ApplicationGrant;import io.github.hectorvent.floci.services.ssoadmin.model.Assignment;+import io.github.hectorvent.floci.services.ssoadmin.model.AssignmentDeletionOperation;import io.github.hectorvent.floci.services.ssoadmin.model.AssignmentOperation;import io.github.hectorvent.floci.services.ssoadmin.model.ApplicationAssignment;+import io.github.hectorvent.floci.services.ssoadmin.model.CustomerManagedPolicyReference;+import io.github.hectorvent.floci.services.ssoadmin.model.InstanceAccessControlAttributeConfiguration;+import io.github.hectorvent.floci.services.ssoadmin.model.InstanceUpdateState;+import io.github.hectorvent.floci.services.ssoadmin.model.OidcJwtIssuerConfiguration;import io.github.hectorvent.floci.services.ssoadmin.model.PermissionSet;import io.github.hectorvent.floci.services.ssoadmin.model.PermissionSetProvisioningOperation;+import io.github.hectorvent.floci.services.ssoadmin.model.PermissionsBoundary;+import io.github.hectorvent.floci.services.ssoadmin.model.RegionMetadata;import io.github.hectorvent.floci.services.ssoadmin.model.SsoApplication;+import io.github.hectorvent.floci.services.ssoadmin.model.SsoInstance;+import io.github.hectorvent.floci.services.ssoadmin.model.TrustedTokenIssuer;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;+import java.util.Map;+@ApplicationScopedpublic class SsoAdminJsonHandler {private final SsoAdminService service;@@ -119,7 +133,7 @@ public class SsoAdminJsonHandler {ObjectNode node = instances.addObject();node.put("InstanceArn", instance.instanceArn());node.put("IdentityStoreId", instance.identityStoreId());- var updateState = service.instanceUpdateState(instance);+ InstanceUpdateState updateState = service.instanceUpdateState(instance);if (updateState.name() != null) {node.put("Name", updateState.name());}@@ -143,7 +157,7 @@ public class SsoAdminJsonHandler {}private Response createInstance(JsonNode request, String callerAccountId, String region) {- var instance = service.createInstance(request, callerAccountId, region);+ SsoInstance instance = service.createInstance(request, callerAccountId, region);return Response.ok(mapper.createObjectNode().put("InstanceArn", instance.instanceArn())).build();}@@ -153,8 +167,8 @@ public class SsoAdminJsonHandler {}private Response describeInstance(JsonNode request) {- var instance = service.describeInstance(request);- var updateState = service.instanceUpdateState(instance);+ SsoInstance instance = service.describeInstance(request);+ InstanceUpdateState updateState = service.instanceUpdateState(instance);ObjectNode response = mapper.createObjectNode();response.put("CreatedDate", instance.createdDateEpochMillis() / 1000.0d);response.put("IdentityStoreId", instance.identityStoreId());@@ -191,7 +205,7 @@ public class SsoAdminJsonHandler {}private Response describeInstanceAccessControlAttributeConfiguration(JsonNode request) {- var configuration = service.describeInstanceAccessControlAttributeConfiguration(request);+ InstanceAccessControlAttributeConfiguration configuration = service.describeInstanceAccessControlAttributeConfiguration(request);ObjectNode response = mapper.createObjectNode();ObjectNode configurationNode = response.putObject("InstanceAccessControlAttributeConfiguration");ArrayNode attributes = configurationNode.putArray("AccessControlAttributes");@@ -218,7 +232,7 @@ public class SsoAdminJsonHandler {}private Response createTrustedTokenIssuer(JsonNode request, String callerAccountId) {- var issuer = service.createTrustedTokenIssuer(request, callerAccountId);+ TrustedTokenIssuer issuer = service.createTrustedTokenIssuer(request, callerAccountId);return Response.ok(mapper.createObjectNode().put("TrustedTokenIssuerArn", issuer.trustedTokenIssuerArn())).build();}@@ -229,10 +243,10 @@ public class SsoAdminJsonHandler {}private Response describeTrustedTokenIssuer(JsonNode request) {- var issuer = service.describeTrustedTokenIssuer(request);+ TrustedTokenIssuer issuer = service.describeTrustedTokenIssuer(request);ObjectNode response = trustedTokenIssuerMetadataNode(issuer);ObjectNode configuration = response.putObject("TrustedTokenIssuerConfiguration");- var oidc = issuer.oidcJwtConfiguration();+ OidcJwtIssuerConfiguration oidc = issuer.oidcJwtConfiguration();ObjectNode oidcNode = configuration.putObject("OidcJwtConfiguration");oidcNode.put("ClaimAttributePath", oidc.claimAttributePath());oidcNode.put("IdentityStoreAttributePath", oidc.identityStoreAttributePath());@@ -242,7 +256,7 @@ public class SsoAdminJsonHandler {}private Response listTrustedTokenIssuers(JsonNode request) {- var page = service.listTrustedTokenIssuers(request);+ PaginatedResult<TrustedTokenIssuer> page = service.listTrustedTokenIssuers(request);ObjectNode response = mapper.createObjectNode();ArrayNode issuers = response.putArray("TrustedTokenIssuers");page.items().forEach(issuer -> issuers.add(trustedTokenIssuerMetadataNode(issuer)));@@ -266,12 +280,12 @@ public class SsoAdminJsonHandler {}private Response addRegion(JsonNode request) {- var region = service.addRegion(request);+ RegionMetadata region = service.addRegion(request);return Response.ok(mapper.createObjectNode().put("Status", region.status())).build();}private Response removeRegion(JsonNode request, String requestRegion) {- var region = service.removeRegion(request, requestRegion);+ RegionMetadata region = service.removeRegion(request, requestRegion);return Response.ok(mapper.createObjectNode().put("Status", region.status())).build();}@@ -280,7 +294,7 @@ public class SsoAdminJsonHandler {}private Response listRegions(JsonNode request) {- var page = service.listRegions(request);+ PaginatedResult<RegionMetadata> page = service.listRegions(request);ObjectNode response = mapper.createObjectNode();ArrayNode regions = response.putArray("Regions");page.items().forEach(region -> regions.add(regionNode(region)));@@ -300,7 +314,7 @@ public class SsoAdminJsonHandler {}private Response listTagsForResource(JsonNode request) {- var page = service.listTagsForResource(request);+ PaginatedResult<Map.Entry<String, String>> page = service.listTagsForResource(request);ObjectNode response = mapper.createObjectNode();ArrayNode tags = response.putArray("Tags");page.items().forEach(tag -> tags.addObject()@@ -343,7 +357,7 @@ public class SsoAdminJsonHandler {}private Response getApplicationAccessScope(JsonNode request) {- var accessScope = service.getApplicationAccessScope(request);+ ApplicationAccessScope accessScope = service.getApplicationAccessScope(request);ObjectNode response = mapper.createObjectNode();response.put("Scope", accessScope.scope());ArrayNode targets = response.putArray("AuthorizedTargets");@@ -352,7 +366,7 @@ public class SsoAdminJsonHandler {}private Response listApplicationAccessScopes(JsonNode request) {- var page = service.listApplicationAccessScopes(request);+ PaginatedResult<ApplicationAccessScope> page = service.listApplicationAccessScopes(request);ObjectNode response = mapper.createObjectNode();ArrayNode scopes = response.putArray("Scopes");page.items().forEach(accessScope -> {@@ -391,7 +405,7 @@ public class SsoAdminJsonHandler {}private Response listApplicationProviders(JsonNode request, String region) {- var page = service.listApplicationProviders(request, region);+ PaginatedResult<String> page = service.listApplicationProviders(request, region);ObjectNode response = mapper.createObjectNode();ArrayNode providers = response.putArray("ApplicationProviders");page.items().forEach(provider -> providers.add(applicationProviderNode(provider)));@@ -409,12 +423,12 @@ public class SsoAdminJsonHandler {}private Response listApplicationAssignments(JsonNode request) {- var page = service.listApplicationAssignments(request);+ PaginatedResult<ApplicationAssignment> page = service.listApplicationAssignments(request);return applicationAssignmentsResponse(page);}private Response listApplicationAssignmentsForPrincipal(JsonNode request, String callerAccountId) {- var page = service.listApplicationAssignmentsForPrincipal(request, callerAccountId);+ PaginatedResult<ApplicationAssignment> page = service.listApplicationAssignmentsForPrincipal(request, callerAccountId);return applicationAssignmentsResponse(page);}@@ -439,14 +453,14 @@ public class SsoAdminJsonHandler {}private Response getApplicationAuthenticationMethod(JsonNode request) {- var method = service.getApplicationAuthenticationMethod(request);+ ApplicationAuthenticationMethod method = service.getApplicationAuthenticationMethod(request);ObjectNode response = mapper.createObjectNode();response.set("AuthenticationMethod", method.authenticationMethod());return Response.ok(response).build();}private Response listApplicationAuthenticationMethods(JsonNode request) {- var page = service.listApplicationAuthenticationMethods(request);+ PaginatedResult<ApplicationAuthenticationMethod> page = service.listApplicationAuthenticationMethods(request);ObjectNode response = mapper.createObjectNode();ArrayNode methods = response.putArray("AuthenticationMethods");page.items().forEach(method -> {@@ -471,12 +485,12 @@ public class SsoAdminJsonHandler {}private Response getApplicationGrant(JsonNode request) {- var grant = service.getApplicationGrant(request);+ ApplicationGrant grant = service.getApplicationGrant(request);return Response.ok(mapper.createObjectNode().set("Grant", grant.grant())).build();}private Response listApplicationGrants(JsonNode request) {- var page = service.listApplicationGrants(request);+ PaginatedResult<ApplicationGrant> page = service.listApplicationGrants(request);ObjectNode response = mapper.createObjectNode();ArrayNode grants = response.putArray("Grants");page.items().forEach(grant -> {@@ -529,7 +543,7 @@ public class SsoAdminJsonHandler {}private Response listApplications(JsonNode request, String callerAccountId) {- var page = service.listApplications(request, callerAccountId);+ PaginatedResult<SsoApplication> page = service.listApplications(request, callerAccountId);ObjectNode response = mapper.createObjectNode();ArrayNode applications = response.putArray("Applications");page.items().forEach(application -> applications.add(applicationNode(application)));@@ -570,7 +584,7 @@ public class SsoAdminJsonHandler {}private Response listPermissionSets(JsonNode request) {- var page = service.listPermissionSets(request);+ PaginatedResult<PermissionSet> page = service.listPermissionSets(request);ObjectNode response = mapper.createObjectNode();ArrayNode arns = response.putArray("PermissionSets");page.items().forEach(p -> arns.add(p.arn()));@@ -608,7 +622,7 @@ public class SsoAdminJsonHandler {}private Response listManagedPolicies(JsonNode request) {- var page = service.listManagedPolicies(request);+ PaginatedResult<Map.Entry<String, String>> page = service.listManagedPolicies(request);ObjectNode response = mapper.createObjectNode();ArrayNode policies = response.putArray("AttachedManagedPolicies");page.items().forEach(policy -> policies.addObject()@@ -636,7 +650,7 @@ public class SsoAdminJsonHandler {}private Response listCustomerManagedPolicyReferences(JsonNode request) {- var page = service.listCustomerManagedPolicyReferences(request);+ PaginatedResult<CustomerManagedPolicyReference> page = service.listCustomerManagedPolicyReferences(request);ObjectNode response = mapper.createObjectNode();ArrayNode references = response.putArray("CustomerManagedPolicyReferences");page.items().forEach(reference -> references.addObject()@@ -676,7 +690,7 @@ public class SsoAdminJsonHandler {}private Response getPermissionsBoundary(JsonNode request) {- var boundary = service.getPermissionsBoundary(+ PermissionsBoundary boundary = service.getPermissionsBoundary(SsoAdminService.required(request, "InstanceArn"),SsoAdminService.required(request, "PermissionSetArn"));ObjectNode response = mapper.createObjectNode();@@ -703,7 +717,7 @@ public class SsoAdminJsonHandler {}private Response listAccountAssignments(JsonNode request) {- var page = service.listAssignments(request);+ PaginatedResult<Assignment> page = service.listAssignments(request);ObjectNode response = mapper.createObjectNode();ArrayNode array = response.putArray("AccountAssignments");for (Assignment a : page.items()) {@@ -717,7 +731,7 @@ public class SsoAdminJsonHandler {}private Response listAccountAssignmentsForPrincipal(JsonNode request, String callerAccountId) {- var page = service.listAssignmentsForPrincipal(request, callerAccountId);+ PaginatedResult<Assignment> page = service.listAssignmentsForPrincipal(request, callerAccountId);ObjectNode response = mapper.createObjectNode();ArrayNode array = response.putArray("AccountAssignments");for (Assignment assignment : page.items()) {@@ -772,7 +786,7 @@ public class SsoAdminJsonHandler {}private Response listPermissionSetProvisioningStatus(JsonNode request) {- var page = service.listPermissionSetProvisioningStatus(request);+ PaginatedResult<PermissionSetProvisioningOperation> page = service.listPermissionSetProvisioningStatus(request);ObjectNode response = mapper.createObjectNode();ArrayNode statuses = response.putArray("PermissionSetsProvisioningStatus");for (PermissionSetProvisioningOperation operation : page.items()) {@@ -788,7 +802,7 @@ public class SsoAdminJsonHandler {}private Response listPermissionSetsProvisionedToAccount(JsonNode request) {- var page = service.listPermissionSetsProvisionedToAccount(request);+ PaginatedResult<String> page = service.listPermissionSetsProvisionedToAccount(request);ObjectNode response = mapper.createObjectNode();ArrayNode permissionSets = response.putArray("PermissionSets");page.items().forEach(permissionSets::add);@@ -799,7 +813,7 @@ public class SsoAdminJsonHandler {}private Response listAccountsForProvisionedPermissionSet(JsonNode request) {- var page = service.listAccountsForProvisionedPermissionSet(request);+ PaginatedResult<String> page = service.listAccountsForProvisionedPermissionSet(request);ObjectNode response = mapper.createObjectNode();ArrayNode accountIds = response.putArray("AccountIds");page.items().forEach(accountIds::add);@@ -817,7 +831,7 @@ public class SsoAdminJsonHandler {}private Response deleteAccountAssignment(JsonNode request) {- var operation = service.deleteAssignment(request);+ AssignmentDeletionOperation operation = service.deleteAssignment(request);ObjectNode response = mapper.createObjectNode();ObjectNode status = response.putObject("AccountAssignmentDeletionStatus");status.put("RequestId", operation.requestId());@@ -844,7 +858,7 @@ public class SsoAdminJsonHandler {}private Response listAccountAssignmentCreationStatus(JsonNode request) {- var page = service.listAccountAssignmentCreationStatus(request);+ PaginatedResult<AssignmentOperation> page = service.listAccountAssignmentCreationStatus(request);ObjectNode response = mapper.createObjectNode();ArrayNode statuses = response.putArray("AccountAssignmentsCreationStatus");for (AssignmentOperation operation : page.items()) {@@ -860,7 +874,7 @@ public class SsoAdminJsonHandler {}private Response describeAssignmentDeletion(JsonNode request) {- var operation = service.getAssignmentDeletionOperation(+ AssignmentDeletionOperation operation = service.getAssignmentDeletionOperation(SsoAdminService.required(request, "InstanceArn"),SsoAdminService.required(request, "AccountAssignmentDeletionRequestId"));ObjectNode response = mapper.createObjectNode();@@ -880,7 +894,7 @@ public class SsoAdminJsonHandler {}private Response listAccountAssignmentDeletionStatus(JsonNode request) {- var page = service.listAccountAssignmentDeletionStatus(request);+ PaginatedResult<AssignmentDeletionOperation> page = service.listAccountAssignmentDeletionStatus(request);ObjectNode response = mapper.createObjectNode();ArrayNode statuses = response.putArray("AccountAssignmentsDeletionStatus");page.items().forEach(operation -> {diff --git a/src/main/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminService.java b/src/main/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminService.javaindex 3b8f416d8f..e39ef0b9fd 100644--- a/src/main/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminService.java+++ b/src/main/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminService.java@@ -352,7 +352,7 @@ public class SsoAdminService implements Resettable {}String tokenKey = clientToken == null ? null : instanceArn + "::" + clientToken;if (tokenKey != null) {- var priorArn = trustedTokenIssuerClientTokens.get(tokenKey);+ Optional<String> priorArn = trustedTokenIssuerClientTokens.get(tokenKey);if (priorArn.isPresent()) {TrustedTokenIssuer prior = trustedTokenIssuers.get(priorArn.get()).orElse(null);if (prior != null && trustedTokenIssuerMatches(prior, name, issuerType, oidcConfiguration, tags)) {@@ -647,7 +647,7 @@ public class SsoAdminService implements Resettable {}}String tokenKey = callerAccountId + "::" + clientToken;- var priorArn = instanceClientTokens.get(tokenKey);+ Optional<String> priorArn = instanceClientTokens.get(tokenKey);if (priorArn.isPresent()) {SsoInstance prior = findInstanceByArn(priorArn.get());if (prior != null && java.util.Objects.equals(prior.name(), name)@@ -1389,7 +1389,7 @@ public class SsoAdminService implements Resettable {String tokenKey = clientToken == null ? null : callerAccountId + "::" + region + "::" + clientToken;if (tokenKey != null) {- var existingArn = applicationClientTokens.get(tokenKey);+ Optional<String> existingArn = applicationClientTokens.get(tokenKey);if (existingArn.isPresent()) {SsoApplication existing = applications.get(existingArn.get()).orElse(null);if (existing != null && applicationMatches(existing, providerArn, description, name, portalOptions, status, tags)) {diff --git a/src/main/java/io/github/hectorvent/floci/services/ssooidc/SsoOidcController.java b/src/main/java/io/github/hectorvent/floci/services/ssooidc/SsoOidcController.javaindex d5059bb265..08bf210e75 100644--- a/src/main/java/io/github/hectorvent/floci/services/ssooidc/SsoOidcController.java+++ b/src/main/java/io/github/hectorvent/floci/services/ssooidc/SsoOidcController.java@@ -3,7 +3,9 @@ package io.github.hectorvent.floci.services.ssooidc;import com.fasterxml.jackson.databind.DeserializationFeature;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.ssoadmin.model.TrustedTokenIssuer;import io.github.hectorvent.floci.services.ssooidc.model.AuthorizationCode;import io.github.hectorvent.floci.services.ssooidc.model.DeviceAuthorization;import io.github.hectorvent.floci.services.ssooidc.model.RegisteredClient;@@ -185,7 +187,7 @@ public class SsoOidcController {- System.currentTimeMillis() / 1000L)));response.put("tokenType", "Bearer");if (scopes != null) {- var scopeArray = response.putArray("scope");+ ArrayNode scopeArray = response.putArray("scope");scopes.forEach(scopeArray::add);}if (issuedTokenType != null) {@@ -251,7 +253,7 @@ public class SsoOidcController {continue;}try {- var trusted = ssoAdminService.getTrustedTokenIssuer(issuerArn);+ TrustedTokenIssuer trusted = ssoAdminService.getTrustedTokenIssuer(issuerArn);if (!issuer.equals(trusted.oidcJwtConfiguration().issuerUrl())) {continue;}@@ -379,7 +381,7 @@ public class SsoOidcController {authorization = service.createAuthorizationCodeForPrincipal(clientId, redirectUri, codeChallenge, redirects, resolveLocalPrincipal(principalId));} else {- var client = service.requireClient(clientId);+ RegisteredClient client = service.requireClient(clientId);authorization = service.createAuthorizationCodeForPrincipal(clientId, redirectUri, codeChallenge, client.redirectUris(), resolveLocalPrincipal(principalId));}diff --git a/src/main/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalController.java b/src/main/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalController.javaindex f23cff1908..b01f83f93b 100644--- a/src/main/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalController.java+++ b/src/main/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalController.java@@ -1,6 +1,9 @@package io.github.hectorvent.floci.services.ssoportal;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.PaginatedResult;import io.github.hectorvent.floci.services.ssoportal.model.PortalAccountInfo;import io.github.hectorvent.floci.services.ssoportal.model.PortalRoleInfo;import io.github.hectorvent.floci.services.ssoportal.model.PortalRoleCredentials;@@ -42,8 +45,8 @@ public class SsoPortalController {@QueryParam("account_id") String accountId,@QueryParam("role_name") String roleName) {PortalRoleCredentials credentials = service.getRoleCredentials(accessToken, accountId, roleName);- var response = objectMapper.createObjectNode();- var roleCredentials = response.putObject("roleCredentials");+ ObjectNode response = objectMapper.createObjectNode();+ ObjectNode roleCredentials = response.putObject("roleCredentials");roleCredentials.put("accessKeyId", credentials.accessKeyId());roleCredentials.put("expiration", credentials.expiration());roleCredentials.put("secretAccessKey", credentials.secretAccessKey());@@ -58,11 +61,11 @@ public class SsoPortalController {@QueryParam("account_id") String accountId,@QueryParam("max_result") String maxResults,@QueryParam("next_token") String nextToken) {- var page = service.listAccountRoles(accessToken, accountId, maxResults, nextToken);- var response = objectMapper.createObjectNode();- var roles = response.putArray("roleList");+ PaginatedResult<PortalRoleInfo> page = service.listAccountRoles(accessToken, accountId, maxResults, nextToken);+ ObjectNode response = objectMapper.createObjectNode();+ ArrayNode roles = response.putArray("roleList");for (PortalRoleInfo role : page.items()) {- var item = roles.addObject();+ ObjectNode item = roles.addObject();item.put("accountId", role.accountId());item.put("roleName", role.roleName());}@@ -78,11 +81,11 @@ public class SsoPortalController {@HeaderParam("x-amz-sso_bearer_token") String accessToken,@QueryParam("max_result") String maxResults,@QueryParam("next_token") String nextToken) {- var page = service.listAccounts(accessToken, maxResults, nextToken);- var response = objectMapper.createObjectNode();- var accounts = response.putArray("accountList");+ PaginatedResult<PortalAccountInfo> page = service.listAccounts(accessToken, maxResults, nextToken);+ ObjectNode response = objectMapper.createObjectNode();+ ArrayNode accounts = response.putArray("accountList");for (PortalAccountInfo account : page.items()) {- var item = accounts.addObject();+ ObjectNode item = accounts.addObject();item.put("accountId", account.accountId());if (account.accountName() != null) {item.put("accountName", account.accountName());diff --git a/src/main/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalService.java b/src/main/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalService.javaindex eac43810bf..2a08ed85bd 100644--- a/src/main/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalService.java+++ b/src/main/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalService.java@@ -8,6 +8,8 @@ import io.github.hectorvent.floci.core.common.ServicePrincipals;import io.github.hectorvent.floci.services.iam.IamService;import io.github.hectorvent.floci.services.organizations.OrganizationsService;import io.github.hectorvent.floci.services.ssoadmin.SsoAdminService;+import io.github.hectorvent.floci.services.ssoadmin.model.Assignment;+import io.github.hectorvent.floci.services.ssoadmin.model.PermissionSet;import io.github.hectorvent.floci.services.ssooidc.SsoOidcException;import io.github.hectorvent.floci.services.ssooidc.SsoOidcService;import io.github.hectorvent.floci.services.ssooidc.model.TokenSession;@@ -78,7 +80,7 @@ public class SsoPortalService {ssoAdminService.portalAssignmentsForUser(session.principalId()).stream().filter(assignment -> accountId.equals(assignment.accountId())).forEach(assignment -> {- var permissionSet = ssoAdminService.permissionSetForPortal(assignment.permissionSetArn());+ PermissionSet permissionSet = ssoAdminService.permissionSetForPortal(assignment.permissionSetArn());roles.putIfAbsent(assignment.permissionSetArn(),new PortalRoleInfo(accountId, permissionSet.name()));});@@ -96,14 +98,14 @@ public class SsoPortalService {if (roleName == null || roleName.isBlank()) {throw new AwsException("InvalidRequestException", "roleName is required.", 400);}- var assignment = ssoAdminService.portalAssignmentsForUser(session.principalId()).stream()+ Assignment assignment = ssoAdminService.portalAssignmentsForUser(session.principalId()).stream().filter(candidate -> accountId.equals(candidate.accountId())).filter(candidate -> roleName.equals(ssoAdminService.permissionSetForPortal(candidate.permissionSetArn()).name())).findFirst().orElseThrow(() -> new AwsException("ResourceNotFoundException","The requested account role is not assigned to this user.", 404));- var permissionSet = ssoAdminService.permissionSetForPortal(assignment.permissionSetArn());+ PermissionSet permissionSet = ssoAdminService.permissionSetForPortal(assignment.permissionSetArn());Instant expiration = Instant.now().plus(Duration.parse(permissionSet.sessionDuration()));String accessKeyId = "ASIA" + random(UPPER_ALPHANUMERIC, 16);String secretAccessKey = random(SECRET_CHARACTERS, 40);diff --git a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutor.java b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutor.javaindex c77864f66d..f6e2ca31e8 100644--- a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutor.java+++ b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutor.java@@ -18,6 +18,7 @@ import io.github.hectorvent.floci.services.dynamodb.DynamoDbJsonHandler;import io.github.hectorvent.floci.services.dynamodb.backend.DynamoDbItemAccess;import io.github.hectorvent.floci.services.dynamodb.backend.DynamoDbOperations.Scope;import io.github.hectorvent.floci.services.ec2.Ec2Service;+import io.github.hectorvent.floci.services.ecs.model.Container;import io.github.hectorvent.floci.services.eventbridge.EventBridgeHandler;import io.github.hectorvent.floci.services.ecs.EcsJsonHandler;import io.github.hectorvent.floci.services.ecs.EcsService;@@ -488,7 +489,7 @@ public class AslExecutor {private void doExecute(StateMachine sm, Execution exec, List<HistoryEvent> history,BiConsumer<Execution, List<HistoryEvent>> onUpdate) {- var chain = HistoryChain.of(history);+ HistoryChain chain = HistoryChain.of(history);try {JsonNode definition = objectMapper.readTree(sm.getDefinition());JsonNode states = definition.path("States");@@ -563,7 +564,7 @@ public class AslExecutor {private StateResult runState(HistoryChain chain, String name, JsonNode stateDef, JsonNode input,StateMachine sm, String topLevelQueryLanguage, JsonNode context,ObjectNode variables, long executionDeadlineNanos) throws Exception {- var type = stateDef.path("Type").asText();+ String type = stateDef.path("Type").asText();long enteredEventId = chain.publishStateEntered(type, stateEnteredEventType(type),Map.of("name", name, "input", input.toString(), "inputDetails", Map.of("truncated", false)));try {@@ -580,7 +581,7 @@ public class AslExecutor {String topLevelQueryLanguage, JsonNode context, ObjectNode variables,long executionDeadlineNanos) throws Exception {updateStateContext(context, name);- var jsonata = isJsonata(stateDef, topLevelQueryLanguage);+ boolean jsonata = isJsonata(stateDef, topLevelQueryLanguage);StateResult result;try {result = executeStateWithRetry(name, enteredEventId, type, stateDef, input, chain, sm, jsonata,@@ -589,14 +590,14 @@ public class AslExecutor {result = new StateResult(result.output(), null);}} catch (FailStateException failure) {- var beforeFailed = chain.lastEventId();+ long beforeFailed = chain.lastEventId();publishStateFailedEvent(chain, type, failure);try {result = handleCatch(stateDef, input, failure, jsonata, context, variables);} catch (FailStateException catchClauseFailure) {// AWS reports a failure inside the Catch clause itself, and no later clause catches// it. The clause's EvaluationFailed is recorded from before the state's Failed event.- var clauseFailure = catchClauseFailure.attributedTo(name, enteredEventId);+ FailStateException clauseFailure = catchClauseFailure.attributedTo(name, enteredEventId);chain.continueFrom(beforeFailed);publishEvaluationFailedEvent(chain, name, clauseFailure);publishStateFailedEvent(chain, type, clauseFailure);@@ -628,7 +629,7 @@ public class AslExecutor {if (!"States.QueryEvaluationError".equals(failure.error)) {return;}- var details = failureDetails(failure);+ Map<String, Object> details = failureDetails(failure);if (failure.location != null) {details.put("location", failure.location);}@@ -653,24 +654,24 @@ public class AslExecutor {String topLevelQueryLanguage, JsonNode context,ObjectNode variables, long executionDeadlineNanos)throws Exception {- var retriers = stateDef.path("Retry");- var attemptsPerRetrier = new HashMap<Integer, Integer>();- var attempt = 0;+ JsonNode retriers = stateDef.path("Retry");+ HashMap<Integer, Integer> attemptsPerRetrier = new HashMap<>();+ int attempt = 0;while (true) {try {return executeState(name, type, stateDef, input, chain, sm, jsonata,topLevelQueryLanguage, context, variables, executionDeadlineNanos);} catch (FailStateException raised) {- var e = raised.attributedTo(name, enteredEventId);+ FailStateException e = raised.attributedTo(name, enteredEventId);if (!raised.hasFinalCause()) {publishEvaluationFailedEvent(chain, name, e);}- var retrierIndex = findMatchingRetrier(retriers, e);+ int retrierIndex = findMatchingRetrier(retriers, e);if (retrierIndex < 0) {throw e;}- var retrier = retriers.get(retrierIndex);- var attemptsUsed = attemptsPerRetrier.merge(retrierIndex, 1, Integer::sum);+ JsonNode retrier = retriers.get(retrierIndex);+ Integer attemptsUsed = attemptsPerRetrier.merge(retrierIndex, 1, Integer::sum);if (attemptsUsed > retrier.path("MaxAttempts").asInt(3)) {throw e;}@@ -685,7 +686,7 @@ public class AslExecutor {if (!retriers.isArray()) {return -1;}- for (var i = 0; i < retriers.size(); i++) {+ for (int i = 0; i < retriers.size(); i++) {if (catchMatches(retriers.get(i), failure)) {return i;}@@ -713,9 +714,9 @@ public class AslExecutor {* zero and the computed delay. Jitter applies after the caps, matching AWS.*/static double retryDelaySeconds(JsonNode retrier, int attemptsUsed, double random, int maxWaitSeconds) {- var interval = retrier.path("IntervalSeconds").asDouble(1.0);- var backoffRate = retrier.path("BackoffRate").asDouble(2.0);- var delaySeconds = interval * Math.pow(backoffRate, attemptsUsed - 1.0);+ double interval = retrier.path("IntervalSeconds").asDouble(1.0);+ double backoffRate = retrier.path("BackoffRate").asDouble(2.0);+ double delaySeconds = interval * Math.pow(backoffRate, attemptsUsed - 1.0);double maxDelay = retrier.path("MaxDelaySeconds").asDouble(maxWaitSeconds);// Like the Wait state, cap the delay at the configured ceiling to keep emulated runs fast.delaySeconds = Math.min(delaySeconds, Math.min(maxDelay, maxWaitSeconds));@@ -780,16 +781,16 @@ public class AslExecutor {HistoryChain chain, StateMachine sm, boolean jsonata,JsonNode context, ObjectNode variables,long executionDeadlineNanos) throws Exception {- var resource = stateDef.path("Resource").asText();- var isWaitForToken = resource.endsWith(".waitForTaskToken");- var effectiveResource = isWaitForToken+ String resource = stateDef.path("Resource").asText();+ boolean isWaitForToken = resource.endsWith(".waitForTaskToken");+ String effectiveResource = isWaitForToken? resource.substring(0, resource.length() - ".waitForTaskToken".length()): resource;- var isActivity = isActivityArn(effectiveResource);- var mockedInvocation = findMockedInvocation(context, stateName);+ boolean isActivity = isActivityArn(effectiveResource);+ MockedTaskInvocation mockedInvocation = findMockedInvocation(context, stateName);// A mocked task never calls the integrated service, so it neither registers a task token// nor waits for one; the mocked response stands in for the whole interaction.- var needsToken = mockedInvocation == null && (isWaitForToken || isActivity);+ boolean needsToken = mockedInvocation == null && (isWaitForToken || isActivity);String taskToken = null;if (needsToken) {@@ -801,7 +802,7 @@ public class AslExecutor {if (jsonata) {effectiveInput = input;if (stateDef.has("Arguments")) {- var statesVar = buildStatesVar(input, null, context);+ JsonNode statesVar = buildStatesVar(input, null, context);effectiveInput = jsonataEvaluator.resolveTemplate(stateDef.get("Arguments"), "Arguments", statesVar, variables);}@@ -813,8 +814,8 @@ public class AslExecutor {}// Registered after the input template resolved, so a template failure leaves no token behind.- var tokenFuture = needsToken ? sfnService.get().registerPendingToken(taskToken) : null;- var profile = taskEventProfile(resource, isActivity);+ CompletableFuture<JsonNode> tokenFuture = needsToken ? sfnService.get().registerPendingToken(taskToken) : null;+ TaskEventProfile profile = taskEventProfile(resource, isActivity);JsonNode taskResult;// Read before the scheduled event is built, so a large input or a slow history callback// does not extend the Task's own TimeoutSeconds.@@ -852,7 +853,7 @@ public class AslExecutor {// that cut it records its TaskStateAborted.throw e;} catch (Exception e) {- var failure = e instanceof FailStateException f ? f : null;+ FailStateException failure = e instanceof FailStateException f ? f : null;addTaskFailedEvent(chain, profile,failure != null && failure.error != null ? failure.error : "States.Runtime",failure != null ? failure.cause : e.getMessage());@@ -889,22 +890,22 @@ public class AslExecutor {if (activeMocks.isEmpty()) {return null;}- var executionArn = context.path("Execution").path("Id").asText(null);+ String executionArn = context.path("Execution").path("Id").asText(null);if (executionArn == null) {return null;}- var activeMock = activeMocks.get(executionArn);+ ActiveMockExecution activeMock = activeMocks.get(executionArn);if (activeMock == null) {return null;}- var steps = activeMock.testCase().stateResponses().get(stateName);+ List<MockedResponseStep> steps = activeMock.testCase().stateResponses().get(stateName);return steps != null? new MockedTaskInvocation(steps, activeMock.nextResponseIndex(stateName)): null;}private JsonNode mockedTaskResult(List<MockedResponseStep> steps, String stateName, int responseIndex) {- for (var step : steps) {+ for (MockedResponseStep step : steps) {if (step.covers(responseIndex)) {if (step.isThrow()) {// The mocked Error and Cause must reach Retry/Catch unchanged; routing them@@ -1358,7 +1359,7 @@ public class AslExecutor {data = body.toString().getBytes(StandardCharsets.UTF_8);}try {- var stored = s3Service.putObject(bucket, key, data, "application/octet-stream", new HashMap<>());+ S3Object stored = s3Service.putObject(bucket, key, data, "application/octet-stream", new HashMap<>());ObjectNode result = objectMapper.createObjectNode();if (stored != null && stored.getETag() != null) {result.put("ETag", stored.getETag());@@ -2024,7 +2025,7 @@ public class AslExecutor {Integer nonZeroExit = null;boolean hasNullExitCode = false;if (ranAContainer) {- for (var c : task.getContainers()) {+ for (Container c : task.getContainers()) {// Only essential containers decide the task outcome, like real Step Functions; a// non-essential sidecar (log shipper, metrics agent) exiting non-zero is ignored.// Anything not explicitly marked non-essential defaults to essential.@@ -2630,7 +2631,7 @@ public class AslExecutor {JsonNode effectiveInput = jsonata ? input : applyInputPath(stateDef, input, context);JsonNode branches = stateDef.path("Branches");chain.publish("ParallelStateStarted", null);- var branchChains = new ArrayList<HistoryChain>();+ ArrayList<HistoryChain> branchChains = new ArrayList<>();// The branches are joined in the order they complete, not the order they are declared, so// a failure in any branch ends the Parallel while the others are still running, as on AWS// (measured: the Parallel fails within about 0.1 s of the failing branch, whichever branch@@ -2647,8 +2648,8 @@ public class AslExecutor {ObjectNode branchVariables = variables.deepCopy();// Each branch also gets its own copy of the context object so State.RetryCount and// Task.Token writes cannot race across concurrent branches.- var branchContext = ((ObjectNode) context).deepCopy();- var branchChain = chain.fork();+ ObjectNode branchContext = ((ObjectNode) context).deepCopy();+ HistoryChain branchChain = chain.fork();branchChains.add(branchChain);// Run each branch on its own worker thread under the execution's account: the request@@ -2845,19 +2846,19 @@ public class AslExecutor {mapRunRecord.setToleratedFailurePercentage(tolerated.declaredPercentage());chain.publish("MapRunStarted", Map.of("mapRunArn", mapRun.arn()));}- var succeededItems = new AtomicInteger();- var failedItems = new AtomicInteger();+ AtomicInteger succeededItems = new AtomicInteger();+ AtomicInteger failedItems = new AtomicInteger();AtomicInteger succeededExecutions = new AtomicInteger();AtomicInteger failedExecutions = new AtomicInteger();List<Integer> succeededChildren = new ArrayList<>(childCount);FailedChild[] failedByIndex = hasResultWriter ? new FailedChild[childCount] : null;- var iterationChains = new ArrayList<HistoryChain>(childCount);- for (var i = 0; i < childCount; i++) {+ ArrayList<HistoryChain> iterationChains = new ArrayList<>(childCount);+ for (int i = 0; i < childCount; i++) {iterationChains.add(distributed ? HistoryChain.ofChildExecution() : chain.fork());}java.util.function.IntFunction<Callable<JsonNode>> makeTask = (i) -> () -> {- var iterationChain = iterationChains.get(i);+ HistoryChain iterationChain = iterationChains.get(i);boolean batchedChild = batches != null;JsonNode item = batchedChild ? batches.get(i) : items.get(i);int itemsInChild = batchedChild ? item.path("Items").size() : 1;@@ -3087,7 +3088,7 @@ public class AslExecutor {*/private static MapRun newMapRun(MapRunIdentity identity, JsonNode context, int itemCount,int executionCount, int requestedConcurrency) {- var mapRun = new MapRun();+ MapRun mapRun = new MapRun();mapRun.setMapRunArn(identity.arn());mapRun.setExecutionArn(context.path("Execution").path("Id").asText(null));mapRun.setStartDate(System.currentTimeMillis() / 1000.0);@@ -3290,14 +3291,14 @@ public class AslExecutor {}private MapRunIdentity newMapRunIdentity(JsonNode stateDef, StateMachine sm, JsonNode context) {- var region = extractRegionFromArn(sm.getStateMachineArn());- var account = AwsArnUtils.accountOrDefault(sm.getStateMachineArn(), null);- var smName = context.path("StateMachine").path("Name").asText(sm.getName());- var label = stateDef.path("Label").asText(null);+ String region = extractRegionFromArn(sm.getStateMachineArn());+ String account = AwsArnUtils.accountOrDefault(sm.getStateMachineArn(), null);+ String smName = context.path("StateMachine").path("Name").asText(sm.getName());+ String label = stateDef.path("Label").asText(null);if (label == null || label.isBlank()) {label = UUID.randomUUID().toString();}- var id = UUID.randomUUID().toString();+ String id = UUID.randomUUID().toString();return new MapRunIdentity(label, id, AwsArnUtils.Arn.of("states", region, account,"mapRun:" + smName + "/" + label + ":" + id).toString());}@@ -3380,8 +3381,8 @@ public class AslExecutor {}// The run id alone keys the exported result set under the user-supplied S3 prefix.- var mapRunId = mapRun.id();- var mapRunArn = mapRun.arn();+ String mapRunId = mapRun.id();+ String mapRunArn = mapRun.arn();String base = prefix.isEmpty()? mapRunId + "/": prefix + (prefix.endsWith("/") ? "" : "/") + mapRunId + "/";@@ -3829,7 +3830,7 @@ public class AslExecutor {// A Parallel or Map branch runs on its own thread and is not cut mid-state by the// execution's TimeoutSeconds: the state loop that resumes once the branch returns// is where the budget is enforced.- var result = runState(chain, currentState, stateDef, currentInput, sm, topLevelQueryLanguage,+ StateResult result = runState(chain, currentState, stateDef, currentInput, sm, topLevelQueryLanguage,context, variables, Long.MAX_VALUE);currentInput = result.output();currentState = result.nextState();@@ -4538,20 +4539,20 @@ public class AslExecutor {* TODO: Add HTTP Task coverage for unsupported binary/media response content types.*/private JsonNode invokeHttp(JsonNode input, String region) {- var rawUri = input.path("ApiEndpoint").asText(null);- var method = input.path("Method").asText(null);- var timeoutMillis = input.path("TimeoutSeconds").asLong(60) * 1_000;- var headers = input.path("Headers");- var queryParameters = input.path("QueryParameters");- var requestBody = input.path("RequestBody");- var requestBodyEncoding = input.path("Transform").path("RequestBodyEncoding").asText("NONE");+ String rawUri = input.path("ApiEndpoint").asText(null);+ String method = input.path("Method").asText(null);+ long timeoutMillis = input.path("TimeoutSeconds").asLong(60) * 1_000;+ JsonNode headers = input.path("Headers");+ JsonNode queryParameters = input.path("QueryParameters");+ JsonNode requestBody = input.path("RequestBody");+ String requestBodyEncoding = input.path("Transform").path("RequestBodyEncoding").asText("NONE");if (rawUri == null || rawUri.isBlank()) {throw new FailStateException("States.Runtime", "ApiEndpoint is required for HTTP task");}- var uri = URI.create(rawUri);- var isHttps = "https".equalsIgnoreCase(uri.getScheme());- var allowPlainHttp = config.services().stepfunctions().allowPlaintextHttp();+ URI uri = URI.create(rawUri);+ boolean isHttps = "https".equalsIgnoreCase(uri.getScheme());+ boolean allowPlainHttp = config.services().stepfunctions().allowPlaintextHttp();if (!allowPlainHttp && !isHttps) {throw new FailStateException("States.Runtime", "The value for the 'ApiEndpoint' field must have the scheme 'https'. " +"You can enable plaintext http via 'floci.services.stepfunctions.allow-plaintext-http=true'.");@@ -4561,18 +4562,18 @@ public class AslExecutor {validateConnectionArn(input);validateHttpHeaders(headers);- var requestPayload = requestPayload(requestBody, requestBodyEncoding);- var requestHeaders = requestHeaders(headers, requestPayload.contentType());- var requestQueryParameters = queryParameters(queryParameters);+ HttpRequestPayload requestPayload = requestPayload(requestBody, requestBodyEncoding);+ MultiMap requestHeaders = requestHeaders(headers, requestPayload.contentType());+ MultiMap requestQueryParameters = queryParameters(queryParameters);try {- var request = webClient.requestAbs(HttpMethod.valueOf(method), rawUri)+ HttpRequest<Buffer> request = webClient.requestAbs(HttpMethod.valueOf(method), rawUri).timeout(timeoutMillis).putHeaders(requestHeaders);request.queryParams().addAll(requestQueryParameters);LOG.infov("Step Functions HTTP task sending request: method={0}, uri={1}", method, uri);- var response = sendHttpRequest(request, requestPayload);+ HttpResponse<Buffer> response = sendHttpRequest(request, requestPayload);validateHttpStatus(response);validateHttpResponse(response);return httpResultJson(response);@@ -4630,7 +4631,7 @@ public class AslExecutor {}private JsonNode httpResultJson(HttpResponse<Buffer> response) {- var stepHttpResponse = new HttpTaskResponse(+ HttpTaskResponse stepHttpResponse = new HttpTaskResponse(response.statusCode(),response.statusMessage(),httpResponseHeaders(response),@@ -4965,7 +4966,7 @@ public class AslExecutor {"States.JsonMerge supports only shallow merge (third argument must be false)");}// Shallow merge: second object's top-level fields override the first's.- var merged = objectMapper.createObjectNode();+ ObjectNode merged = objectMapper.createObjectNode();a.fields().forEachRemaining(e -> merged.set(e.getKey(), e.getValue()));b.fields().forEachRemaining(e -> merged.set(e.getKey(), e.getValue()));yield merged;@@ -5394,7 +5395,7 @@ public class AslExecutor {*/private JsonNode resolveIntrinsicReference(String path, JsonNode searchRoot, JsonNode context,JsonNode input) {- var value = resolvePathNode(path, searchRoot, context);+ JsonNode value = resolvePathNode(path, searchRoot, context);if (value.isMissingNode()) {throw new MissingIntrinsicArgumentException(path, input);}@@ -5492,7 +5493,7 @@ public class AslExecutor {private void addTaskScheduledEvent(HistoryChain chain, TaskEventProfile profile, JsonNode stateDef,JsonNode effectiveInput, StateMachine sm) {- var details = new LinkedHashMap<String, Object>();+ LinkedHashMap<String, Object> details = new LinkedHashMap<>();if (profile.resourceType() != null) {details.put("resourceType", profile.resourceType());}@@ -5537,7 +5538,7 @@ public class AslExecutor {}private void addTaskSucceededEvent(HistoryChain chain, TaskEventProfile profile, JsonNode taskResult) {- var output = taskResult.toString();+ String output = taskResult.toString();if ("Task".equals(profile.prefix())) {chain.publish(profile.prefix() + "Succeeded",Map.of("resourceType", profile.resourceType(), "resource", profile.resource(),@@ -5549,7 +5550,7 @@ public class AslExecutor {}private void addTaskFailedEvent(HistoryChain chain, TaskEventProfile profile, String error, String cause) {- var details = new LinkedHashMap<String, Object>();+ LinkedHashMap<String, Object> details = new LinkedHashMap<>();if ("Task".equals(profile.prefix())) {details.put("resourceType", profile.resourceType());details.put("resource", profile.resource());@@ -5568,7 +5569,7 @@ public class AslExecutor {* both {@code TimeoutSeconds} and {@code HeartbeatSeconds}, and carries no cause.*/private void addTaskTimedOutEvent(HistoryChain chain, TaskEventProfile profile) {- var details = new LinkedHashMap<String, Object>();+ LinkedHashMap<String, Object> details = new LinkedHashMap<>();if ("Task".equals(profile.prefix())) {details.put("resourceType", profile.resourceType());details.put("resource", profile.resource());@@ -5614,7 +5615,7 @@ public class AslExecutor {}private static Map<String, Object> failureDetails(String error, String cause) {- var details = new LinkedHashMap<String, Object>();+ LinkedHashMap<String, Object> details = new LinkedHashMap<>();details.put("error", error);if (cause != null) {details.put("cause", cause);@@ -5725,18 +5726,18 @@ public class AslExecutor {}private boolean catchMatches(JsonNode catcher, FailStateException failure) {- var errors = catcher.path("ErrorEquals");+ JsonNode errors = catcher.path("ErrorEquals");if (!errors.isArray()) {return false;}- var error = failure.error != null ? failure.error : "States.Runtime";+ String error = failure.error != null ? failure.error : "States.Runtime";// States.Runtime is never retried or caught, even when named explicitly in// ErrorEquals. Verified against real AWS: the execution fails immediately.if ("States.Runtime".equals(error)) {return false;}for (JsonNode candidate : errors) {- var expected = candidate.asText();+ String expected = candidate.asText();if (failure.isNamedBy(expected)) {return true;}diff --git a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/ChoiceOperators.java b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/ChoiceOperators.javaindex 5dd63d40cb..3e8c4fae82 100644--- a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/ChoiceOperators.java+++ b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/ChoiceOperators.java@@ -6,6 +6,7 @@ import java.math.BigDecimal;import java.time.Instant;import java.time.OffsetDateTime;import java.time.format.DateTimeParseException;+import java.util.Iterator;import java.util.LinkedHashSet;import java.util.List;import java.util.Set;@@ -159,7 +160,7 @@ public final class ChoiceOperators {private static void assertRuntimeWellFormed(JsonNode rule) {int logical = 0;int dataTest = 0;- var it = rule.fieldNames();+ Iterator<String> it = rule.fieldNames();while (it.hasNext()) {String field = it.next();if (LOGICAL_OPERATORS.contains(field)) {@@ -265,7 +266,7 @@ public final class ChoiceOperators {}private static String dataTestOperatorOf(JsonNode rule) {- var it = rule.fieldNames();+ Iterator<String> it = rule.fieldNames();while (it.hasNext()) {String field = it.next();if (DATA_TEST_OPERATORS.contains(field)) {@@ -345,7 +346,7 @@ public final class ChoiceOperators {int logicalCount = 0;int dataTestCount = 0;- var names = rule.fieldNames();+ Iterator<String> names = rule.fieldNames();while (names.hasNext()) {String field = names.next();if (LOGICAL_OPERATORS.contains(field)) {diff --git a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/HistoryChain.java b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/HistoryChain.javaindex b499bd105a..31e4b99dc5 100644--- a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/HistoryChain.java+++ b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/HistoryChain.java@@ -64,7 +64,7 @@ final class HistoryChain {}void continueAfter(Collection<HistoryChain> chains) {- var last = lastEventId;+ long last = lastEventId;for (HistoryChain chain : chains) {last = Math.max(last, chain.lastEventId);}@@ -169,7 +169,7 @@ final class HistoryChain {}private boolean isAbandoned() {- for (var chain = this; chain != null; chain = chain.parent) {+ for (HistoryChain chain = this; chain != null; chain = chain.parent) {if (chain.abandoned) {return true;}@@ -245,7 +245,7 @@ final class HistoryChain {if (counted) {AslExecutor.countTowardsHistoryEventLimit(producedEventCount);}- var event = new HistoryEvent();+ HistoryEvent event = new HistoryEvent();event.setId(history.size() + 1L);event.setPreviousEventId(previousEventId);event.setType(type);diff --git a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/SfnMockLoader.java b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/SfnMockLoader.javaindex 078348ad21..4a4c261717 100644--- a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/SfnMockLoader.java+++ b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/SfnMockLoader.java@@ -54,33 +54,33 @@ public class SfnMockLoader {* mock configuration is configured or the test case cannot be resolved from it.*/public MockedTestCase requireTestCase(String stateMachineName, String testCaseName) {- var path = configuredPath.orElseThrow(() -> new AwsException("ValidationException",+ String path = configuredPath.orElseThrow(() -> new AwsException("ValidationException","Cannot run test case '" + testCaseName + "': no mock configuration file is configured. "+ "Set SFN_MOCK_CONFIG to the path of a mock configuration file.", 400));- var root = load(path);- var testCases = root.path("StateMachines").path(stateMachineName).path("TestCases");+ JsonNode root = load(path);+ JsonNode testCases = root.path("StateMachines").path(stateMachineName).path("TestCases");if (!testCases.isObject()) {throw new AwsException("ValidationException","State machine '" + stateMachineName + "' has no test cases in mock configuration file "+ path, 400);}- var testCase = testCases.path(testCaseName);+ JsonNode testCase = testCases.path(testCaseName);if (!testCase.isObject()) {throw new AwsException("ValidationException","Test case '" + testCaseName + "' is not defined for state machine '" + stateMachineName+ "' in mock configuration file " + path, 400);}- var mockedResponses = root.path("MockedResponses");- var stateResponses = new LinkedHashMap<String, List<MockedResponseStep>>();+ JsonNode mockedResponses = root.path("MockedResponses");+ LinkedHashMap<String, List<MockedResponseStep>> stateResponses = new LinkedHashMap<>();testCase.fields().forEachRemaining(entry -> {- var stateName = entry.getKey();- var responseKey = entry.getValue();+ String stateName = entry.getKey();+ JsonNode responseKey = entry.getValue();if (!responseKey.isTextual()) {throw new AwsException("ValidationException","Test case '" + testCaseName + "' state '" + stateName+ "' must reference a MockedResponses entry by name", 400);}- var responseNode = mockedResponses.path(responseKey.asText());+ JsonNode responseNode = mockedResponses.path(responseKey.asText());if (!responseNode.isObject()) {throw new AwsException("ValidationException","Mocked response '" + responseKey.asText() + "' referenced by test case '"@@ -94,7 +94,7 @@ public class SfnMockLoader {}private JsonNode load(String path) {- var file = Path.of(path);+ Path file = Path.of(path);long lastModified;try {lastModified = Files.getLastModifiedTime(file).toMillis();@@ -102,7 +102,7 @@ public class SfnMockLoader {throw new AwsException("ValidationException","Mock configuration file not found: " + path, 400);}- var cached = cache;+ CachedMockFile cached = cache;if (cached != null && cached.path().equals(path) && cached.lastModified() == lastModified) {return cached.root();}@@ -127,7 +127,7 @@ public class SfnMockLoader {* {@code States.Runtime} only if the state that names it is entered.*/private List<MockedResponseStep> parseSteps(String responseKey, JsonNode responseNode) {- var steps = new ArrayList<MockedResponseStep>();+ ArrayList<MockedResponseStep> steps = new ArrayList<>();responseNode.fields().forEachRemaining(entry -> steps.add(parseStep(responseKey, entry.getKey(), entry.getValue())));steps.sort(Comparator.comparingInt(MockedResponseStep::fromAttempt));@@ -135,9 +135,9 @@ public class SfnMockLoader {}private MockedResponseStep parseStep(String responseKey, String attemptRange, JsonNode step) {- var range = parseAttemptRange(responseKey, attemptRange);- var returnNode = step.get("Return");- var throwNode = step.get("Throw");+ int[] range = parseAttemptRange(responseKey, attemptRange);+ JsonNode returnNode = step.get("Return");+ JsonNode throwNode = step.get("Throw");if ((returnNode == null) == (throwNode == null)) {throw new AwsException("ValidationException","Mocked response '" + responseKey + "' attempt '" + attemptRange@@ -146,7 +146,7 @@ public class SfnMockLoader {if (returnNode != null) {return new MockedResponseStep(range[0], range[1], returnNode, null, null);}- var error = throwNode.path("Error").asText(null);+ String error = throwNode.path("Error").asText(null);if (error == null || error.isBlank()) {throw new AwsException("ValidationException","Mocked response '" + responseKey + "' attempt '" + attemptRange@@ -157,7 +157,7 @@ public class SfnMockLoader {private int[] parseAttemptRange(String responseKey, String attemptRange) {try {- var separator = attemptRange.indexOf('-');+ int separator = attemptRange.indexOf('-');int from;int to;if (separator < 0) {diff --git a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsJsonHandler.javaindex a5697d03dd..7a813e08d5 100644--- a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsJsonHandler.java@@ -15,6 +15,7 @@ import io.github.hectorvent.floci.services.stepfunctions.model.MapRun;import io.github.hectorvent.floci.services.stepfunctions.model.RoutingConfiguration;import io.github.hectorvent.floci.services.stepfunctions.model.StateMachine;import io.github.hectorvent.floci.services.stepfunctions.model.StateMachineAlias;+import io.github.hectorvent.floci.services.stepfunctions.model.StateMachineVersion;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;@@ -140,7 +141,7 @@ public class StepFunctionsJsonHandler {}private Response handlePublishStateMachineVersion(JsonNode request) {- var version = service.publishStateMachineVersion(+ StateMachineVersion version = service.publishStateMachineVersion(requiredText(request, "stateMachineArn"),optionalText(request, "revisionId"),optionalText(request, "description"));@@ -151,10 +152,10 @@ public class StepFunctionsJsonHandler {}private Response handleListStateMachineVersions(JsonNode request) {- var versions = service.listStateMachineVersions(request.path("stateMachineArn").asText());+ List<StateMachineVersion> versions = service.listStateMachineVersions(request.path("stateMachineArn").asText());ObjectNode response = objectMapper.createObjectNode();ArrayNode array = response.putArray("stateMachineVersions");- for (var v : versions) {+ for (StateMachineVersion v : versions) {ObjectNode item = array.addObject();item.put("stateMachineVersionArn", v.getStateMachineVersionArn());item.put("creationDate", v.getCreationDate());@@ -464,10 +465,10 @@ public class StepFunctionsJsonHandler {}private Response handleGetExecutionHistory(JsonNode request) {- var arn = request.path("executionArn").asText();- var includeExecutionData = request.path("includeExecutionData").asBoolean(true);+ String arn = request.path("executionArn").asText();+ boolean includeExecutionData = request.path("includeExecutionData").asBoolean(true);- var live = service.getExecutionHistory(arn);+ List<HistoryEvent> live = service.getExecutionHistory(arn);List<HistoryEvent> events;// Branch and iteration threads append under the history's own monitor while a client reads.synchronized (live) {@@ -482,9 +483,9 @@ public class StepFunctionsJsonHandler {item.put("type", e.getType());if (e.getPreviousEventId() != null) item.put("previousEventId", e.getPreviousEventId());if (e.getDetails() != null) {- var details = e.getDetails();+ Map<String, Object> details = e.getDetails();if (!includeExecutionData) {- var filtered = new LinkedHashMap<>(details);+ LinkedHashMap<String, Object> filtered = new LinkedHashMap<>(details);filtered.keySet().removeAll(EXECUTION_DATA_FIELDS);details = filtered;}diff --git a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsService.java b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsService.javaindex 58f4077a4d..b02f72565d 100644--- a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsService.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.stepfunctions;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsRegions;@@ -720,17 +721,17 @@ public class StepFunctionsService implements Resettable, ResourceProvider {// ──────────────────────────── Executions ────────────────────────────public Execution startExecution(String stateMachineArn, String name, String input, String region) {- var selection = splitTestCaseSuffix(stateMachineArn);- var resolved = resolveStateMachineForExecution(selection.stateMachineArn());- var sm = resolved.stateMachine();- var mockedTestCase = resolveMockedTestCase(sm, selection);- var execName = (name != null && !name.isBlank()) ? name : UUID.randomUUID().toString();+ TestCaseSelection selection = splitTestCaseSuffix(stateMachineArn);+ ResolvedStateMachine resolved = resolveStateMachineForExecution(selection.stateMachineArn());+ StateMachine sm = resolved.stateMachine();+ MockedTestCase mockedTestCase = resolveMockedTestCase(sm, selection);+ String execName = (name != null && !name.isBlank()) ? name : UUID.randomUUID().toString();boolean express = "EXPRESS".equals(sm.getType());// An EXPRESS name is not unique on AWS: every start is its own execution that runs alongside// the others, so the ARN (which is also the execution-store key) carries a per-start id after// the name, under the express: namespace startSyncExecution already uses. A STANDARD execution// keeps the name-derived ARN whose uniqueness AWS enforces.- var arn = express+ String arn = express? regionResolver.buildArn("states", region,"express:" + sm.getName() + ":" + execName + ":" + UUID.randomUUID()): regionResolver.buildArn("states", region, "execution:" + sm.getName() + ":" + execName);@@ -766,7 +767,7 @@ public class StepFunctionsService implements Resettable, ResourceProvider {executionStore.put(arn, exec);}});- var startEvent = new HistoryEvent();+ HistoryEvent startEvent = new HistoryEvent();startEvent.setId(1L);startEvent.setPreviousEventId(0L);startEvent.setType("ExecutionStarted");@@ -792,7 +793,7 @@ public class StepFunctionsService implements Resettable, ResourceProvider {}public Execution startSyncExecution(String stateMachineArn, String name, String input, String region) {- var selection = splitTestCaseSuffix(stateMachineArn);+ TestCaseSelection selection = splitTestCaseSuffix(stateMachineArn);if (selection.testCaseName() != null) {// Matches Step Functions Local, which rejects a test case suffix here.throw new AwsException("UnsupportedOperation",@@ -801,8 +802,8 @@ public class StepFunctionsService implements Resettable, ResourceProvider {}// A bare trailing '#' is not stripped on this operation: Step Functions Local looks up// the raw ARN and fails with StateMachineDoesNotExist, so Floci does the same.- var resolved = resolveStateMachineForExecution(stateMachineArn);- var sm = resolved.stateMachine();+ ResolvedStateMachine resolved = resolveStateMachineForExecution(stateMachineArn);+ StateMachine sm = resolved.stateMachine();if (!"EXPRESS".equals(sm.getType())) {throw new AwsException("StateMachineTypeNotSupported","StartSyncExecution is only supported for EXPRESS state machines", 400);@@ -817,7 +818,7 @@ public class StepFunctionsService implements Resettable, ResourceProvider {String arn = regionResolver.buildArn("states", region,"express:" + sm.getName() + ":" + startDate + ":" + execName);- var exec = new Execution();+ Execution exec = new Execution();exec.setExecutionArn(arn);exec.setStateMachineArn(resolved.baseArn());exec.setStateMachineVersionArn(resolved.versionArn());@@ -826,8 +827,8 @@ public class StepFunctionsService implements Resettable, ResourceProvider {exec.setInput(input);exec.setStatus("RUNNING");- var history = new ArrayList<HistoryEvent>();- var startEvent = new HistoryEvent();+ ArrayList<HistoryEvent> history = new ArrayList<>();+ HistoryEvent startEvent = new HistoryEvent();startEvent.setId(1L);startEvent.setPreviousEventId(0L);startEvent.setType("ExecutionStarted");@@ -887,11 +888,11 @@ public class StepFunctionsService implements Resettable, ResourceProvider {* no test case and the execution runs unmocked, matching Step Functions Local.*/private static TestCaseSelection splitTestCaseSuffix(String stateMachineArn) {- var separator = stateMachineArn != null ? stateMachineArn.indexOf('#') : -1;+ int separator = stateMachineArn != null ? stateMachineArn.indexOf('#') : -1;if (separator < 0) {return new TestCaseSelection(stateMachineArn, null);}- var testCaseName = stateMachineArn.substring(separator + 1);+ String testCaseName = stateMachineArn.substring(separator + 1);return new TestCaseSelection(stateMachineArn.substring(0, separator),testCaseName.isBlank() ? null : testCaseName);}@@ -900,16 +901,16 @@ public class StepFunctionsService implements Resettable, ResourceProvider {if (selection.testCaseName() == null) {return null;}- var mockedTestCase = mockLoader.requireTestCase(sm.getName(), selection.testCaseName());+ MockedTestCase mockedTestCase = mockLoader.requireTestCase(sm.getName(), selection.testCaseName());warnOnMockedStatesMissingFromDefinition(sm, mockedTestCase);return mockedTestCase;}private void warnOnMockedStatesMissingFromDefinition(StateMachine sm, MockedTestCase testCase) {try {- var stateNames = new HashSet<String>();+ HashSet<String> stateNames = new HashSet<>();collectStateNames(objectMapper.readTree(sm.getDefinition()), stateNames);- for (var stateName : testCase.stateResponses().keySet()) {+ for (String stateName : testCase.stateResponses().keySet()) {if (!stateNames.contains(stateName)) {LOG.warnv("Mock test case {0} references state {1} which does not exist in state machine {2}",testCase.testCaseName(), stateName, sm.getName());@@ -922,7 +923,7 @@ public class StepFunctionsService implements Resettable, ResourceProvider {private static void collectStateNames(JsonNode node, Set<String> names) {if (node.isObject()) {- var states = node.get("States");+ JsonNode states = node.get("States");if (states != null && states.isObject()) {states.fieldNames().forEachRemaining(names::add);}@@ -1628,7 +1629,7 @@ public class StepFunctionsService implements Resettable, ResourceProvider {}private JsonNode defaultLoggingConfiguration() {- var configuration = objectMapper.createObjectNode();+ ObjectNode configuration = objectMapper.createObjectNode();configuration.put("level", "OFF");configuration.put("includeExecutionData", false);configuration.putArray("destinations");@@ -2146,9 +2147,9 @@ public class StepFunctionsService implements Resettable, ResourceProvider {Set<String> topLevelStateNames = new HashSet<>();states.fieldNames().forEachRemaining(topLevelStateNames::add);- var fields = states.fields();+ Iterator<Map.Entry<String, JsonNode>> fields = states.fields();while (fields.hasNext()) {- var entry = fields.next();+ Map.Entry<String, JsonNode> entry = fields.next();validateState("/States/" + entry.getKey(), entry.getValue(), topLevelJsonata,topLevelStateNames, errors);}diff --git a/src/main/java/io/github/hectorvent/floci/services/verifiedpermissions/CedarAuthorizationEvaluator.java b/src/main/java/io/github/hectorvent/floci/services/verifiedpermissions/CedarAuthorizationEvaluator.javaindex 2537818604..7eb28779cf 100644--- a/src/main/java/io/github/hectorvent/floci/services/verifiedpermissions/CedarAuthorizationEvaluator.java+++ b/src/main/java/io/github/hectorvent/floci/services/verifiedpermissions/CedarAuthorizationEvaluator.java@@ -11,6 +11,7 @@ import io.github.hectorvent.floci.services.verifiedpermissions.model.PolicyTemplimport jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;+import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;@@ -97,7 +98,7 @@ public class CedarAuthorizationEvaluator {return true;}if (value.isObject()) {- var iterator = value.elements();+ Iterator<JsonNode> iterator = value.elements();while (iterator.hasNext()) {if (!claimCanBeCedar(iterator.next())) {return false;diff --git a/src/main/java/io/github/hectorvent/floci/services/verifiedpermissions/VerifiedPermissionsService.java b/src/main/java/io/github/hectorvent/floci/services/verifiedpermissions/VerifiedPermissionsService.javaindex e53470003b..ae99c5afce 100644--- a/src/main/java/io/github/hectorvent/floci/services/verifiedpermissions/VerifiedPermissionsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/verifiedpermissions/VerifiedPermissionsService.java@@ -755,7 +755,7 @@ public class VerifiedPermissionsService implements Resettable {node.fields().forEachRemaining(e -> sorted.put(e.getKey(), e.getValue()));StringBuilder b = new StringBuilder("{");boolean first = true;- for (var e : sorted.entrySet()) {+ for (Map.Entry<String, JsonNode> e : sorted.entrySet()) {if (!first) {b.append(',');}@@ -1106,7 +1106,7 @@ public class VerifiedPermissionsService implements Resettable {if (tags.size() > MAX_TAGS) {throw validation("A resource can have at most 200 tags.");}- for (var tag : tags.entrySet()) {+ for (Map.Entry<String, String> tag : tags.entrySet()) {if (tag.getKey() == null || tag.getKey().isEmpty() || tag.getKey().length() > 128 || tag.getValue().length() > 256) {throw validation("A tag doesn't satisfy the required length constraints.");}diff --git a/src/main/java/io/github/hectorvent/floci/services/verifiedpermissions/VerifiedPermissionsTokenService.java b/src/main/java/io/github/hectorvent/floci/services/verifiedpermissions/VerifiedPermissionsTokenService.javaindex 2a3b3eb2fa..42d39016b4 100644--- a/src/main/java/io/github/hectorvent/floci/services/verifiedpermissions/VerifiedPermissionsTokenService.java+++ b/src/main/java/io/github/hectorvent/floci/services/verifiedpermissions/VerifiedPermissionsTokenService.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.verifiedpermissions;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.verifiedpermissions.model.EntityIdentifier;import io.github.hectorvent.floci.services.verifiedpermissions.model.IdentitySource;@@ -13,6 +14,7 @@ import java.time.Instant;import java.util.ArrayList;import java.util.Base64;import java.util.List;+import java.util.Map;@ApplicationScopedpublic class VerifiedPermissionsTokenService {@@ -200,11 +202,11 @@ public class VerifiedPermissionsTokenService {if (!union.isObject() || union.size() != 1) {throw VerifiedPermissionsService.validation("Context attributes must contain one union member.");}- var entry = union.fields().next();+ Map.Entry<String, JsonNode> entry = union.fields().next();return switch (entry.getKey()) {case "boolean", "long", "string" -> entry.getValue().deepCopy();case "set" -> {- var array = objectMapper.createArrayNode();+ ArrayNode array = objectMapper.createArrayNode();entry.getValue().forEach(v -> array.add(rawAttribute(v)));yield array;}diff --git a/src/test/java/io/github/hectorvent/floci/config/ContainerCaBundleTest.java b/src/test/java/io/github/hectorvent/floci/config/ContainerCaBundleTest.javaindex ececc54f56..7d1cd9c539 100644--- a/src/test/java/io/github/hectorvent/floci/config/ContainerCaBundleTest.java+++ b/src/test/java/io/github/hectorvent/floci/config/ContainerCaBundleTest.java@@ -11,11 +11,13 @@ import org.junit.jupiter.api.io.TempDir;import java.io.ByteArrayInputStream;import java.nio.file.Files;import java.nio.file.Path;+import java.security.cert.Certificate;import java.security.cert.CertificateFactory;import java.security.cert.X509Certificate;import java.util.ArrayList;import java.util.List;import java.util.Optional;+import java.util.stream.Stream;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;@@ -67,7 +69,7 @@ class ContainerCaBundleTest {byte[] second = Files.readAllBytes(ContainerCaBundle.write(tlsDir, ca.certificatePath()));assertTrue(java.util.Arrays.equals(first, second));- try (var files = Files.list(tlsDir)) {+ try (Stream<Path> files = Files.list(tlsDir)) {assertTrue(files.noneMatch(file -> file.getFileName().toString().endsWith(".tmp")), "no temp file left behind");}}@@ -208,7 +210,7 @@ class ContainerCaBundleTest {private static List<X509Certificate> parseAll(byte[] pem) throws Exception {List<X509Certificate> certificates = new ArrayList<>();- for (var certificate : CertificateFactory.getInstance("X.509").generateCertificates(new ByteArrayInputStream(pem))) {+ for (Certificate certificate : CertificateFactory.getInstance("X.509").generateCertificates(new ByteArrayInputStream(pem))) {certificates.add((X509Certificate) certificate);}return certificates;diff --git a/src/test/java/io/github/hectorvent/floci/config/CustomDomainTlsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/config/CustomDomainTlsIntegrationTest.javaindex 56401c48af..ebbad5f0bf 100644--- a/src/test/java/io/github/hectorvent/floci/config/CustomDomainTlsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/config/CustomDomainTlsIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.config;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;+import io.github.hectorvent.floci.services.acm.CertificateGenerator;import io.github.hectorvent.floci.services.acm.model.KeyAlgorithm;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;@@ -167,7 +168,7 @@ class CustomDomainTlsIntegrationTest {}FlociCertificateAuthority ca = FlociCertificateAuthority.loadOrCreate(TLS_DIR);List<String> sans = List.of("localhost", "*.localhost.floci.io");- var leaf = ca.issueServerCertificate("localhost", sans, KeyAlgorithm.RSA_2048, null);+ CertificateGenerator.GeneratedCertificate leaf = ca.issueServerCertificate("localhost", sans, KeyAlgorithm.RSA_2048, null);Files.writeString(TLS_DIR.resolve("floci-server.crt"), leaf.certificatePem());Files.writeString(TLS_DIR.resolve("floci-server.key"), leaf.privateKeyPem());Files.writeString(TLS_DIR.resolve("floci-server.metadata.json"),diff --git a/src/test/java/io/github/hectorvent/floci/config/FlociCertificateAuthorityTest.java b/src/test/java/io/github/hectorvent/floci/config/FlociCertificateAuthorityTest.javaindex dcd90c8ae5..2b95475e2f 100644--- a/src/test/java/io/github/hectorvent/floci/config/FlociCertificateAuthorityTest.java+++ b/src/test/java/io/github/hectorvent/floci/config/FlociCertificateAuthorityTest.java@@ -11,6 +11,7 @@ import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;import org.bouncycastle.openssl.jcajce.JcaPEMWriter;import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;+import org.bouncycastle.pkcs.PKCS10CertificationRequest;import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;@@ -134,7 +135,7 @@ class FlociCertificateAuthorityTest {@Testvoid keyThatDoesNotMatchTheCertificateIsRegenerated() throws Exception {FlociCertificateAuthority first = FlociCertificateAuthority.loadOrCreate(tempDir);- var stranger = new CertificateGenerator().generateCaCertificate("Other CA");+ CertificateGenerator.GeneratedCertificate stranger = new CertificateGenerator().generateCaCertificate("Other CA");Files.writeString(tempDir.resolve("floci-root-ca.key"), stranger.privateKeyPem());FlociCertificateAuthority second = FlociCertificateAuthority.loadOrCreate(tempDir);@@ -173,7 +174,7 @@ class FlociCertificateAuthorityTest {@Testvoid aLeafInPlaceOfTheCaIsRegenerated() throws Exception {- var leaf = FlociCertificateAuthority.loadOrCreate(tempDir.resolve("another-ca"))+ CertificateGenerator.GeneratedCertificate leaf = FlociCertificateAuthority.loadOrCreate(tempDir.resolve("another-ca")).issueServerCertificate("localhost", List.of(), KeyAlgorithm.RSA_2048, null);Files.writeString(tempDir.resolve("floci-root-ca.crt"), leaf.certificatePem());Files.writeString(tempDir.resolve("floci-root-ca.key"), leaf.privateKeyPem());@@ -239,7 +240,7 @@ class FlociCertificateAuthorityTest {@Testvoid deviceCertificateNeverOutlivesAShortLivedCa() throws Exception {CertificateGenerator gen = new CertificateGenerator();- var shortLived = gen.generateCaCertificate(FlociCertificateAuthority.COMMON_NAME,+ CertificateGenerator.GeneratedCertificate shortLived = gen.generateCaCertificate(FlociCertificateAuthority.COMMON_NAME,java.time.Instant.now().plus(30, java.time.temporal.ChronoUnit.DAYS));Files.writeString(tempDir.resolve("floci-root-ca.crt"), shortLived.certificatePem());Files.writeString(tempDir.resolve("floci-root-ca.key"), shortLived.privateKeyPem());@@ -256,7 +257,7 @@ class FlociCertificateAuthorityTest {@Testvoid aSelfSignedLeafIsNotOurs() {FlociCertificateAuthority ca = FlociCertificateAuthority.loadOrCreate(tempDir);- var stranger = new CertificateGenerator().generateSelfSignedCertificate(+ CertificateGenerator.GeneratedCertificate stranger = new CertificateGenerator().generateSelfSignedCertificate("localhost", List.of("localhost"), KeyAlgorithm.RSA_2048);assertFalse(ca.isIssuedByUs(parse(stranger.certificatePem())));@@ -265,9 +266,9 @@ class FlociCertificateAuthorityTest {@Testvoid aLeafNamingOurCaButSignedByAnotherKeyIsNotOurs() {FlociCertificateAuthority ca = FlociCertificateAuthority.loadOrCreate(tempDir);- var impostor = new CertificateGenerator().generateCaCertificate(FlociCertificateAuthority.COMMON_NAME);- var generator = new CertificateGenerator();- var forged = generator.generateIssuedCertificate("localhost", List.of(), KeyAlgorithm.RSA_2048, null,+ CertificateGenerator.GeneratedCertificate impostor = new CertificateGenerator().generateCaCertificate(FlociCertificateAuthority.COMMON_NAME);+ CertificateGenerator generator = new CertificateGenerator();+ CertificateGenerator.GeneratedCertificate forged = generator.generateIssuedCertificate("localhost", List.of(), KeyAlgorithm.RSA_2048, null,new CertificateGenerator.Issuer(parse(impostor.certificatePem()),Pem.parsePrivateKey(impostor.privateKeyPem())),CertificateGenerator.LeafUsage.SERVER);@@ -322,11 +323,11 @@ class FlociCertificateAuthorityTest {}private static String csrPem(String subject, KeyPair keyPair) throws Exception {- var csr = new JcaPKCS10CertificationRequestBuilder(+ PKCS10CertificationRequest csr = new JcaPKCS10CertificationRequestBuilder(new X500Name(subject), keyPair.getPublic()).build(new JcaContentSignerBuilder("SHA256withRSA").build(keyPair.getPrivate()));StringWriter out = new StringWriter();- try (var writer = new JcaPEMWriter(out)) {+ try (JcaPEMWriter writer = new JcaPEMWriter(out)) {writer.writeObject(csr);}return out.toString();diff --git a/src/test/java/io/github/hectorvent/floci/config/FlociConfigRelocationsInterceptorTest.java b/src/test/java/io/github/hectorvent/floci/config/FlociConfigRelocationsInterceptorTest.javaindex 9b502b3d2b..3aa1c500b4 100644--- a/src/test/java/io/github/hectorvent/floci/config/FlociConfigRelocationsInterceptorTest.java+++ b/src/test/java/io/github/hectorvent/floci/config/FlociConfigRelocationsInterceptorTest.java@@ -5,6 +5,7 @@ import io.smallrye.config.SmallRyeConfig;import io.smallrye.config.SmallRyeConfigBuilder;import org.junit.jupiter.api.Test;+import java.util.List;import java.util.Map;import static java.util.stream.StreamSupport.stream;@@ -59,7 +60,7 @@ class FlociConfigRelocationsInterceptorTest {void nameIterationPresentsOnlyTheRelocatedKey() {SmallRyeConfig config = config(Map.of("floci.max-request-size", "4096"));- var names = stream(config.getPropertyNames().spliterator(), false).toList();+ List<String> names = stream(config.getPropertyNames().spliterator(), false).toList();assertTrue(names.contains("floci.protocols.max-request-size"));assertFalse(names.contains("floci.max-request-size"));}diff --git a/src/test/java/io/github/hectorvent/floci/config/TlsCertificateHostnameTest.java b/src/test/java/io/github/hectorvent/floci/config/TlsCertificateHostnameTest.javaindex 92ad6cbad7..e399befbe8 100644--- a/src/test/java/io/github/hectorvent/floci/config/TlsCertificateHostnameTest.java+++ b/src/test/java/io/github/hectorvent/floci/config/TlsCertificateHostnameTest.java@@ -390,7 +390,7 @@ class TlsCertificateHostnameTest {Path userCert = tempDir.resolve("user.crt");Path userKey = tempDir.resolve("user.key");- var user = new CertificateGenerator().generateSelfSignedCertificate("localhost", List.of("localhost"), KeyAlgorithm.RSA_2048);+ CertificateGenerator.GeneratedCertificate user = new CertificateGenerator().generateSelfSignedCertificate("localhost", List.of("localhost"), KeyAlgorithm.RSA_2048);Files.writeString(userCert, user.certificatePem());Files.writeString(userKey, user.privateKeyPem());System.setProperty("floci.tls.enabled", "true");@@ -411,7 +411,7 @@ class TlsCertificateHostnameTest {// The exact SAN list TlsConfigSource would compute for this configuration, so only the// issuer check can trigger regeneration here.List<String> sans = TlsConfigSource.DEFAULT_SAN_HOSTNAMES;- var legacy = gen.generateSelfSignedCertificate("localhost", sans, KeyAlgorithm.RSA_2048);+ CertificateGenerator.GeneratedCertificate legacy = gen.generateSelfSignedCertificate("localhost", sans, KeyAlgorithm.RSA_2048);Files.writeString(tlsDir.resolve("floci-server.crt"), legacy.certificatePem());Files.writeString(tlsDir.resolve("floci-server.key"), legacy.privateKeyPem());Files.writeString(tlsDir.resolve("floci-server.metadata.json"),diff --git a/src/test/java/io/github/hectorvent/floci/config/TlsCertificateManagerFixture.java b/src/test/java/io/github/hectorvent/floci/config/TlsCertificateManagerFixture.javaindex 93b61e93f5..b3b351d5b3 100644--- a/src/test/java/io/github/hectorvent/floci/config/TlsCertificateManagerFixture.java+++ b/src/test/java/io/github/hectorvent/floci/config/TlsCertificateManagerFixture.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.config;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.common.Pem;+import io.github.hectorvent.floci.services.acm.CertificateGenerator;import io.github.hectorvent.floci.services.acm.model.KeyAlgorithm;import io.quarkus.tls.CertificateUpdatedEvent;import io.quarkus.tls.TlsConfiguration;@@ -58,7 +59,7 @@ abstract class TlsCertificateManagerFixture {forgetBootstrapTlsDir();tlsDir = Files.createDirectories(tempDir.resolve("tls"));ca = FlociCertificateAuthority.loadOrCreate(tlsDir);- var leaf = ca.issueServerCertificate("localhost", CONFIGURED, KeyAlgorithm.RSA_2048, null);+ CertificateGenerator.GeneratedCertificate leaf = ca.issueServerCertificate("localhost", CONFIGURED, KeyAlgorithm.RSA_2048, null);Files.writeString(tlsDir.resolve("floci-server.crt"), leaf.certificatePem());Files.writeString(tlsDir.resolve("floci-server.key"), leaf.privateKeyPem());Files.writeString(tlsDir.resolve("floci-server.metadata.json"),diff --git a/src/test/java/io/github/hectorvent/floci/config/TlsEnsureHostIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/config/TlsEnsureHostIntegrationTest.javaindex be7e3556ec..4d2b303455 100644--- a/src/test/java/io/github/hectorvent/floci/config/TlsEnsureHostIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/config/TlsEnsureHostIntegrationTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.config;import com.fasterxml.jackson.databind.ObjectMapper;+import io.github.hectorvent.floci.services.acm.CertificateGenerator;import io.github.hectorvent.floci.services.acm.model.KeyAlgorithm;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.QuarkusTestProfile;@@ -158,7 +159,7 @@ class TlsEnsureHostIntegrationTest {}FlociCertificateAuthority ca = FlociCertificateAuthority.loadOrCreate(TLS_DIR);List<String> sans = List.of("localhost", "*.localhost.floci.io");- var leaf = ca.issueServerCertificate("localhost", sans, KeyAlgorithm.RSA_2048, null);+ CertificateGenerator.GeneratedCertificate leaf = ca.issueServerCertificate("localhost", sans, KeyAlgorithm.RSA_2048, null);Files.writeString(TLS_DIR.resolve("floci-server.crt"), leaf.certificatePem());Files.writeString(TLS_DIR.resolve("floci-server.key"), leaf.privateKeyPem());Files.writeString(TLS_DIR.resolve("floci-server.metadata.json"),diff --git a/src/test/java/io/github/hectorvent/floci/config/TlsHttp2HostRoutingIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/config/TlsHttp2HostRoutingIntegrationTest.javaindex 2ff8ab06f1..53522cdc26 100644--- a/src/test/java/io/github/hectorvent/floci/config/TlsHttp2HostRoutingIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/config/TlsHttp2HostRoutingIntegrationTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.config;+import io.github.hectorvent.floci.services.acm.CertificateGenerator;import io.github.hectorvent.floci.services.acm.model.KeyAlgorithm;import io.github.hectorvent.floci.services.cloudfront.CloudFrontService;import io.github.hectorvent.floci.services.cloudfront.model.DefaultCacheBehavior;@@ -216,7 +217,7 @@ class TlsHttp2HostRoutingIntegrationTest {FlociCertificateAuthority ca = FlociCertificateAuthority.loadOrCreate(TLS_DIR);List<String> sans = new ArrayList<>(TlsConfigSource.DEFAULT_SAN_HOSTNAMES);sans.add(API_DOMAIN);- var leaf = ca.issueServerCertificate("localhost", sans, KeyAlgorithm.RSA_2048, null);+ CertificateGenerator.GeneratedCertificate leaf = ca.issueServerCertificate("localhost", sans, KeyAlgorithm.RSA_2048, null);Files.writeString(TLS_DIR.resolve("floci-server.crt"), leaf.certificatePem());Files.writeString(TLS_DIR.resolve("floci-server.key"), leaf.privateKeyPem());} catch (IOException e) {diff --git a/src/test/java/io/github/hectorvent/floci/config/TlsLocalCaIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/config/TlsLocalCaIntegrationTest.javaindex a2acfd56dc..e633528fa8 100644--- a/src/test/java/io/github/hectorvent/floci/config/TlsLocalCaIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/config/TlsLocalCaIntegrationTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.config;+import io.github.hectorvent.floci.services.acm.CertificateGenerator;import io.github.hectorvent.floci.services.acm.model.KeyAlgorithm;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.QuarkusTestProfile;@@ -109,7 +110,7 @@ class TlsLocalCaIntegrationTest {static {try {FlociCertificateAuthority ca = FlociCertificateAuthority.loadOrCreate(TLS_DIR);- var leaf = ca.issueServerCertificate("localhost", List.of("localhost", "127.0.0.1"),+ CertificateGenerator.GeneratedCertificate leaf = ca.issueServerCertificate("localhost", List.of("localhost", "127.0.0.1"),KeyAlgorithm.RSA_2048, null);Files.writeString(CERT_FILE, leaf.certificatePem());Files.writeString(KEY_FILE, leaf.privateKeyPem());diff --git a/src/test/java/io/github/hectorvent/floci/core/common/AiMockConfigLoaderTest.java b/src/test/java/io/github/hectorvent/floci/core/common/AiMockConfigLoaderTest.javaindex a984299ca9..22496de587 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/AiMockConfigLoaderTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/AiMockConfigLoaderTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.core.common;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;@@ -27,53 +28,53 @@ class AiMockConfigLoaderTest {Path tempDir;private AiMockConfigLoader loader(String content) throws IOException {- var file = tempDir.resolve("ai-mock-config.json");+ Path file = tempDir.resolve("ai-mock-config.json");Files.writeString(file, content);return new AiMockConfigLoader(Optional.of(file.toString()), new ObjectMapper());}@Testvoid resolvesMatchingEntry() throws IOException {- var loader = loader(CONFIG);- var result = loader.lookup("comprehend", "I love this", "DetectSentiment");+ AiMockConfigLoader loader = loader(CONFIG);+ Optional<JsonNode> result = loader.lookup("comprehend", "I love this", "DetectSentiment");assertTrue(result.isPresent());assertEquals("POSITIVE", result.get().path("Sentiment").asText());}@Testvoid fallsBackWhenServiceKeyUnmatched() throws IOException {- var loader = loader(CONFIG);+ AiMockConfigLoader loader = loader(CONFIG);assertTrue(loader.lookup("rekognition", "I love this", "DetectSentiment").isEmpty());}@Testvoid fallsBackWhenLookupKeyUnmatched() throws IOException {- var loader = loader(CONFIG);+ AiMockConfigLoader loader = loader(CONFIG);assertTrue(loader.lookup("comprehend", "I hate this", "DetectSentiment").isEmpty());}@Testvoid fallsBackWhenActionUnmatched() throws IOException {- var loader = loader(CONFIG);+ AiMockConfigLoader loader = loader(CONFIG);assertTrue(loader.lookup("comprehend", "I love this", "DetectKeyPhrases").isEmpty());}@Testvoid fallsBackWhenLookupKeyIsNull() throws IOException {// Bytes-backed images/documents have no natural lookup key.- var loader = loader(CONFIG);+ AiMockConfigLoader loader = loader(CONFIG);assertTrue(loader.lookup("comprehend", null, "DetectSentiment").isEmpty());}@Testvoid fallsBackWhenNoConfigConfigured() {- var loader = new AiMockConfigLoader(Optional.empty(), new ObjectMapper());+ AiMockConfigLoader loader = new AiMockConfigLoader(Optional.empty(), new ObjectMapper());assertTrue(loader.lookup("comprehend", "I love this", "DetectSentiment").isEmpty());}@Testvoid fallsBackWhenFileMissing() {- var loader = new AiMockConfigLoader(+ AiMockConfigLoader loader = new AiMockConfigLoader(Optional.of(tempDir.resolve("absent.json").toString()), new ObjectMapper());assertTrue(loader.lookup("comprehend", "I love this", "DetectSentiment").isEmpty());}@@ -82,33 +83,33 @@ class AiMockConfigLoaderTest {void fallsBackWhenConfiguredPathIsUnparseable() {// An embedded NUL byte makes Path.of() throw InvalidPathException, an unchecked// exception that a plain "catch (IOException)" does not cover.- var loader = new AiMockConfigLoader(Optional.of("bad\0path.json"), new ObjectMapper());+ AiMockConfigLoader loader = new AiMockConfigLoader(Optional.of("bad\0path.json"), new ObjectMapper());assertTrue(loader.lookup("comprehend", "I love this", "DetectSentiment").isEmpty());}@Testvoid fallsBackWhenFileIsNotAJsonObject() throws IOException {- var loader = loader("[1, 2, 3]");+ AiMockConfigLoader loader = loader("[1, 2, 3]");assertTrue(loader.lookup("comprehend", "I love this", "DetectSentiment").isEmpty());}@Testvoid fallsBackWhenFileIsMalformedJson() throws IOException {- var loader = loader("{not valid json");+ AiMockConfigLoader loader = loader("{not valid json");assertTrue(loader.lookup("comprehend", "I love this", "DetectSentiment").isEmpty());}@Testvoid treatsBlankConfiguredPathAsUnconfigured() {- var loader = new AiMockConfigLoader(Optional.of(" "), new ObjectMapper());+ AiMockConfigLoader loader = new AiMockConfigLoader(Optional.of(" "), new ObjectMapper());assertTrue(loader.lookup("comprehend", "I love this", "DetectSentiment").isEmpty());}@Testvoid reloadsFileWhenModified() throws IOException, InterruptedException {- var file = tempDir.resolve("ai-mock-config.json");+ Path file = tempDir.resolve("ai-mock-config.json");Files.writeString(file, CONFIG);- var loader = new AiMockConfigLoader(Optional.of(file.toString()), new ObjectMapper());+ AiMockConfigLoader loader = new AiMockConfigLoader(Optional.of(file.toString()), new ObjectMapper());assertTrue(loader.lookup("comprehend", "I love this", "DetectSentiment").isPresent());assertFalse(loader.lookup("comprehend", "I hate this", "DetectSentiment").isPresent());diff --git a/src/test/java/io/github/hectorvent/floci/core/common/XmlParserTest.java b/src/test/java/io/github/hectorvent/floci/core/common/XmlParserTest.javaindex df13be48a3..1c9c1fc5d4 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/XmlParserTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/XmlParserTest.java@@ -180,7 +180,7 @@ class XmlParserTest {@Testvoid extractElementTreePreservesNestedNamespaceQualifiedBlocks() {- var root = XmlParser.extractElementTree("""+ XmlParser.XmlElement root = XmlParser.extractElementTree("""<Envelope xmlns:cf="https://cloudfront.amazonaws.com/doc/2020-05-31/"><cf:Config><cf:First><cf:Value>one</cf:Value></cf:First>@@ -386,8 +386,8 @@ class XmlParserTest {</Conf>""";- var groups = XmlParser.extractGroupsMulti(xml, "QueueConfiguration");- var filters = XmlParser.extractPairsPerGroup(xml, "QueueConfiguration",+ List<Map<String, List<String>>> groups = XmlParser.extractGroupsMulti(xml, "QueueConfiguration");+ List<Map<String, String>> filters = XmlParser.extractPairsPerGroup(xml, "QueueConfiguration","FilterRule", "Name", "Value");assertEquals(2, groups.size());diff --git a/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerCaBundleDockerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerCaBundleDockerIntegrationTest.javaindex 252e7f8d42..8bd55f58bc 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerCaBundleDockerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerCaBundleDockerIntegrationTest.java@@ -6,6 +6,7 @@ import com.github.dockerjava.api.model.Frame;import com.github.dockerjava.core.command.WaitContainerResultCallback;import io.github.hectorvent.floci.config.ContainerCaBundle;import io.github.hectorvent.floci.config.FlociCertificateAuthority;+import io.github.hectorvent.floci.services.acm.CertificateGenerator;import io.github.hectorvent.floci.services.acm.model.KeyAlgorithm;import io.github.hectorvent.floci.testing.TestImages;import io.quarkus.test.junit.QuarkusTest;@@ -141,7 +142,7 @@ class ContainerCaBundleDockerIntegrationTest {static {try {FlociCertificateAuthority ca = FlociCertificateAuthority.loadOrCreate(TLS_DIR);- var leaf = ca.issueServerCertificate("localhost",+ CertificateGenerator.GeneratedCertificate leaf = ca.issueServerCertificate("localhost",List.of("localhost", "127.0.0.1", "host.docker.internal"), KeyAlgorithm.RSA_2048, null);Files.writeString(CERT_FILE, leaf.certificatePem());Files.writeString(KEY_FILE, leaf.privateKeyPem());diff --git a/src/test/java/io/github/hectorvent/floci/core/storage/HybridStorageTest.java b/src/test/java/io/github/hectorvent/floci/core/storage/HybridStorageTest.javaindex 7ab47e38f6..169ba125a8 100644--- a/src/test/java/io/github/hectorvent/floci/core/storage/HybridStorageTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/storage/HybridStorageTest.java@@ -45,12 +45,12 @@ class HybridStorageTest {@Testvoid explicitFlushPersistsData() {Path filePath = tempDir.resolve("flush-test.json");- var store1 = new HybridStorage<>(filePath, new TypeReference<Map<String, String>>() {}, 60000);+ HybridStorage<String, String> store1 = new HybridStorage<>(filePath, new TypeReference<Map<String, String>>() {}, 60000);store1.put("key1", "value1");store1.flush();store1.shutdown();- var store2 = new HybridStorage<>(filePath, new TypeReference<Map<String, String>>() {}, 60000);+ HybridStorage<String, String> store2 = new HybridStorage<>(filePath, new TypeReference<Map<String, String>>() {}, 60000);store2.load();assertEquals("value1", store2.get("key1").orElseThrow());store2.shutdown();@@ -63,7 +63,7 @@ class HybridStorageTest {Path quarantinePath = filePath.resolveSibling("corrupt-hybrid-store.json.corrupt");Files.writeString(filePath, unreadableContents);Files.writeString(quarantinePath, "previous unreadable contents");- var loadedStorage = new HybridStorage<>(filePath, new TypeReference<Map<String, String>>() {}, 60000);+ HybridStorage<String, String> loadedStorage = new HybridStorage<>(filePath, new TypeReference<Map<String, String>>() {}, 60000);try {loadedStorage.load();@@ -80,7 +80,7 @@ class HybridStorageTest {void dynamoTableWithLocalSecondaryIndexSurvivesRestart() {Path filePath = tempDir.resolve("dynamodb-tables.json");TypeReference<Map<String, TableDefinition>> type = new TypeReference<>() {};- var table = new TableDefinition(+ TableDefinition table = new TableDefinition("ConfigTable",List.of(new KeySchemaElement("pk", "HASH"), new KeySchemaElement("sk", "RANGE")),List.of(new AttributeDefinition("pk", "S"), new AttributeDefinition("sk", "S"),@@ -89,11 +89,11 @@ class HybridStorageTest {"lsi", List.of(new KeySchemaElement("pk", "HASH"),new KeySchemaElement("lsiSk", "RANGE")), null, "ALL")));- var store1 = new HybridStorage<String, TableDefinition>(filePath, type, 60000);+ HybridStorage<String, TableDefinition> store1 = new HybridStorage<>(filePath, type, 60000);store1.put("000000000000/us-east-1::ConfigTable", table);store1.shutdown();- var store2 = new HybridStorage<String, TableDefinition>(filePath, type, 60000);+ HybridStorage<String, TableDefinition> store2 = new HybridStorage<>(filePath, type, 60000);store2.load();TableDefinition restored = store2.get("000000000000/us-east-1::ConfigTable").orElseThrow();assertEquals("lsiSk", restored.getLocalSecondaryIndexes().getFirst().getSortKeyName());@@ -113,7 +113,7 @@ class HybridStorageTest {storage.put("a.2", "v2");storage.put("b.1", "v3");- var results = storage.scan(key -> key.startsWith("a."));+ List<String> results = storage.scan(key -> key.startsWith("a."));assertEquals(2, results.size());}@@ -121,7 +121,7 @@ class HybridStorageTest {void scanReturnsMutableList() {storage.put("a", "1");storage.put("b", "2");- var result = storage.scan(key -> true);+ List<String> result = storage.scan(key -> true);assertDoesNotThrow(() -> result.sort(String::compareTo));assertDoesNotThrow(() -> result.add("3"));}diff --git a/src/test/java/io/github/hectorvent/floci/core/storage/PersistedModelReflectionTest.java b/src/test/java/io/github/hectorvent/floci/core/storage/PersistedModelReflectionTest.javaindex d0772fc3ed..bdd4019894 100644--- a/src/test/java/io/github/hectorvent/floci/core/storage/PersistedModelReflectionTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/storage/PersistedModelReflectionTest.java@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.type.TypeReference;import io.quarkus.runtime.annotations.RegisterForReflection;import org.junit.jupiter.api.Test;+import java.lang.reflect.Constructor;import java.lang.reflect.Field;import java.lang.reflect.GenericArrayType;import java.lang.reflect.Modifier;@@ -132,7 +133,7 @@ class PersistedModelReflectionTest {return true;}}- for (var constructor : c.getDeclaredConstructors()) {+ for (Constructor<?> constructor : c.getDeclaredConstructors()) {for (Class<?> param : constructor.getParameterTypes()) {if (param == StorageFactory.class) {return true;diff --git a/src/test/java/io/github/hectorvent/floci/core/storage/PersistentPathValidatorTest.java b/src/test/java/io/github/hectorvent/floci/core/storage/PersistentPathValidatorTest.javaindex af24d42e44..9fd206bd35 100644--- a/src/test/java/io/github/hectorvent/floci/core/storage/PersistentPathValidatorTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/storage/PersistentPathValidatorTest.java@@ -20,6 +20,7 @@ import java.nio.file.Path;import java.util.List;import java.util.Set;import java.util.logging.LogRecord;+import java.util.stream.Stream;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertThrows;@@ -67,7 +68,7 @@ class PersistentPathValidatorTest {validator().validateAtBoot();assertTrue(Files.isDirectory(root));- try (var entries = Files.list(root)) {+ try (Stream<Path> entries = Files.list(root)) {assertEquals(0, entries.count(), "write probe must not be left behind");}}diff --git a/src/test/java/io/github/hectorvent/floci/core/storage/PersistentStorageTest.java b/src/test/java/io/github/hectorvent/floci/core/storage/PersistentStorageTest.javaindex 860a4b181f..3255ad05cd 100644--- a/src/test/java/io/github/hectorvent/floci/core/storage/PersistentStorageTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/storage/PersistentStorageTest.java@@ -33,11 +33,11 @@ class PersistentStorageTest {@Testvoid persistsAcrossInstances() {Path filePath = tempDir.resolve("persist-test.json");- var store1 = new PersistentStorage<>(filePath, new TypeReference<Map<String, String>>() {});+ PersistentStorage<String, String> store1 = new PersistentStorage<>(filePath, new TypeReference<Map<String, String>>() {});store1.put("key1", "value1");store1.put("key2", "value2");- var store2 = new PersistentStorage<>(filePath, new TypeReference<Map<String, String>>() {});+ PersistentStorage<String, String> store2 = new PersistentStorage<>(filePath, new TypeReference<Map<String, String>>() {});store2.load();assertEquals("value1", store2.get("key1").orElseThrow());assertEquals("value2", store2.get("key2").orElseThrow());diff --git a/src/test/java/io/github/hectorvent/floci/core/storage/StorageBackedMapTest.java b/src/test/java/io/github/hectorvent/floci/core/storage/StorageBackedMapTest.javaindex 627f36c7e7..459625870f 100644--- a/src/test/java/io/github/hectorvent/floci/core/storage/StorageBackedMapTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/storage/StorageBackedMapTest.java@@ -2,9 +2,11 @@ package io.github.hectorvent.floci.core.storage;import org.junit.jupiter.api.Test;+import java.util.Iterator;import java.util.Map;import java.util.concurrent.CountDownLatch;import java.util.concurrent.ExecutionException;+import java.util.concurrent.ExecutorService;import java.util.concurrent.Executors;import java.util.concurrent.Future;import java.util.concurrent.TimeUnit;@@ -77,8 +79,8 @@ class StorageBackedMapTestCountDownLatch releaseFirstMapping = new CountDownLatch(1);CountDownLatch secondCallStarted = new CountDownLatch(1);- try (var executor = Executors.newFixedThreadPool(2)) {- var first = executor.submit(() -> map.computeIfAbsent("us-west-2", key -> {+ try (ExecutorService executor = Executors.newFixedThreadPool(2)) {+ Future<Map<String, String>> first = executor.submit(() -> map.computeIfAbsent("us-west-2", key -> {calls.incrementAndGet();firstMappingEntered.countDown();await(releaseFirstMapping);@@ -86,7 +88,7 @@ class StorageBackedMapTest}));await(firstMappingEntered);- var second = executor.submit(() -> {+ Future<Map<String, String>> second = executor.submit(() -> {secondCallStarted.countDown();return map.computeIfAbsent("us-west-2", key -> {calls.incrementAndGet();@@ -127,7 +129,7 @@ class StorageBackedMapTestStorageBackedMap<String> map = new StorageBackedMap<>(storage);map.put("alpha", "one");- var entry = map.entrySet().iterator().next();+ Map.Entry<String, String> entry = map.entrySet().iterator().next();assertEquals("one", entry.setValue("two"));assertEquals("two", storage.get("alpha").orElseThrow());@@ -141,7 +143,7 @@ class StorageBackedMapTestStorageBackedMap<String> map = new StorageBackedMap<>(storage);map.put("alpha", "one");- var iterator = map.entrySet().iterator();+ Iterator<Map.Entry<String, String>> iterator = map.entrySet().iterator();assertTrue(iterator.hasNext());iterator.next();iterator.remove();diff --git a/src/test/java/io/github/hectorvent/floci/core/storage/WalStorageTest.java b/src/test/java/io/github/hectorvent/floci/core/storage/WalStorageTest.javaindex 520c1d65b2..73e8e07cb6 100644--- a/src/test/java/io/github/hectorvent/floci/core/storage/WalStorageTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/storage/WalStorageTest.java@@ -14,6 +14,7 @@ import java.io.IOException;import java.io.RandomAccessFile;import java.nio.file.Files;import java.nio.file.Path;+import java.util.List;import java.util.Map;import static org.junit.jupiter.api.Assertions.*;@@ -62,7 +63,7 @@ class WalStorageTest {storage.put("a.2", "v2");storage.put("b.1", "v3");- var results = storage.scan(key -> key.startsWith("a."));+ List<String> results = storage.scan(key -> key.startsWith("a."));assertEquals(2, results.size());}@@ -70,7 +71,7 @@ class WalStorageTest {void scanReturnsMutableList() {storage.put("a", "1");storage.put("b", "2");- var result = storage.scan(key -> true);+ List<String> result = storage.scan(key -> true);assertDoesNotThrow(() -> result.sort(String::compareTo));assertDoesNotThrow(() -> result.add("3"));}@@ -89,7 +90,7 @@ class WalStorageTest {Path snapshotPath = tempDir.resolve("persist-snapshot.json");Path walPath = tempDir.resolve("persist-data.wal");- var store1 = new WalStorage<>(snapshotPath, walPath,+ WalStorage<String, String> store1 = new WalStorage<>(snapshotPath, walPath,new TypeReference<Map<String, String>>() {}, 60000);store1.load();store1.put("key1", "value1");@@ -97,7 +98,7 @@ class WalStorageTest {store1.flush();store1.shutdown();- var store2 = new WalStorage<>(snapshotPath, walPath,+ WalStorage<String, String> store2 = new WalStorage<>(snapshotPath, walPath,new TypeReference<Map<String, String>>() {}, 60000);store2.load();assertEquals("value1", store2.get("key1").orElseThrow());@@ -110,7 +111,7 @@ class WalStorageTest {Path snapshotPath = tempDir.resolve("replay-snapshot.json");Path walPath = tempDir.resolve("replay-data.wal");- var store1 = new WalStorage<>(snapshotPath, walPath,+ WalStorage<String, String> store1 = new WalStorage<>(snapshotPath, walPath,new TypeReference<Map<String, String>>() {}, 600000);store1.load();store1.put("key1", "value1");@@ -118,7 +119,7 @@ class WalStorageTest {store1.delete("key1");// Load a second instance from the same WAL (before compaction)- var store2 = new WalStorage<>(snapshotPath, walPath,+ WalStorage<String, String> store2 = new WalStorage<>(snapshotPath, walPath,new TypeReference<Map<String, String>>() {}, 600000);store2.load();assertTrue(store2.get("key1").isEmpty());@@ -133,7 +134,7 @@ class WalStorageTest {Path walPath = tempDir.resolve("binary-check.wal");Path snapshotPath = tempDir.resolve("binary-check-snapshot.json");- var store = new WalStorage<>(snapshotPath, walPath,+ WalStorage<String, String> store = new WalStorage<>(snapshotPath, walPath,new TypeReference<Map<String, String>>() {}, 600000);store.load();store.put("k", "v");@@ -175,7 +176,7 @@ class WalStorageTest {Path walPath = tempDir.resolve("truncated.wal");Path snapshotPath = tempDir.resolve("truncated-snapshot.json");- var store1 = new WalStorage<>(snapshotPath, walPath,+ WalStorage<String, String> store1 = new WalStorage<>(snapshotPath, walPath,new TypeReference<Map<String, String>>() {}, 600000);store1.load();store1.put("good", "data");@@ -188,7 +189,7 @@ class WalStorageTest {}// Load a new instance — should recover the first complete entry- var store2 = new WalStorage<>(snapshotPath, walPath,+ WalStorage<String, String> store2 = new WalStorage<>(snapshotPath, walPath,new TypeReference<Map<String, String>>() {}, 600000);store2.load();assertEquals("data", store2.get("good").orElseThrow());diff --git a/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoControllerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoControllerIntegrationTest.javaindex 08d35da364..5776099ea4 100644--- a/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoControllerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoControllerIntegrationTest.java@@ -10,6 +10,8 @@ import org.junit.jupiter.api.Test;import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.ValueSource;+import java.security.cert.CertificateFactory;+import java.security.cert.X509Certificate;import java.util.List;import java.util.UUID;@@ -118,7 +120,7 @@ class EmulatorInfoControllerIntegrationTest {.contentType(startsWith("text/plain")).extract().body().asString();- var cert = (java.security.cert.X509Certificate) java.security.cert.CertificateFactory.getInstance("X.509")+ X509Certificate cert = (X509Certificate) CertificateFactory.getInstance("X.509").generateCertificate(new java.io.ByteArrayInputStream(pem.getBytes(java.nio.charset.StandardCharsets.US_ASCII)));assertTrue(cert.getBasicConstraints() >= 0, "must be a CA certificate");assertEquals(cert.getSubjectX500Principal(), cert.getIssuerX500Principal());diff --git a/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java b/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.javaindex e72d8475dd..94c6fc2db2 100644--- a/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java+++ b/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java@@ -179,7 +179,7 @@ class EmulatorLifecycleTest {emulatorLifecycle.onStart(Mockito.mock(StartupEvent.class));- var inOrder = Mockito.inOrder(initializationHooksRunner, storageFactory, initLifecycleState,+ InOrder inOrder = Mockito.inOrder(initializationHooksRunner, storageFactory, initLifecycleState,iamService, rdsService);inOrder.verify(initializationHooksRunner).run(InitializationHook.BOOT);inOrder.verify(initLifecycleState).markBootCompleted();@@ -242,7 +242,7 @@ class EmulatorLifecycleTest {emulatorLifecycle.onStart(Mockito.mock(StartupEvent.class));- var inOrder = Mockito.inOrder(storageFactory, elbV2Service);+ InOrder inOrder = Mockito.inOrder(storageFactory, elbV2Service);inOrder.verify(storageFactory).loadAll();inOrder.verify(elbV2Service).restorePersistedRuntime();}@@ -331,7 +331,7 @@ class EmulatorLifecycleTest {emulatorLifecycle.onStart(Mockito.mock(StartupEvent.class));- var inOrder = Mockito.inOrder(storageFactory, schemaCreationWorker);+ InOrder inOrder = Mockito.inOrder(storageFactory, schemaCreationWorker);inOrder.verify(storageFactory).loadAll();inOrder.verify(schemaCreationWorker).recoverOrphans();inOrder.verify(schemaCreationWorker).rehydrateSchemas();@@ -346,7 +346,7 @@ class EmulatorLifecycleTest {emulatorLifecycle.onStart(Mockito.mock(StartupEvent.class));- var inOrder = Mockito.inOrder(storageFactory, stepFunctionsService);+ InOrder inOrder = Mockito.inOrder(storageFactory, stepFunctionsService);inOrder.verify(storageFactory).loadAll();inOrder.verify(stepFunctionsService).abortAbandonedExecutions();}@@ -360,7 +360,7 @@ class EmulatorLifecycleTest {emulatorLifecycle.onStart(Mockito.mock(StartupEvent.class));- var inOrder = Mockito.inOrder(initLifecycleState, persistentPathValidator, storageFactory);+ InOrder inOrder = Mockito.inOrder(initLifecycleState, persistentPathValidator, storageFactory);inOrder.verify(initLifecycleState).markBootCompleted();inOrder.verify(persistentPathValidator).validateAtBoot();inOrder.verify(storageFactory).loadAll();@@ -572,7 +572,7 @@ class EmulatorLifecycleTest {// shutdown can't be cut off by the SIGTERM grace window before data is persisted// (regression guard for issue #1521). shutdownAll() still runs last to stop the flush// schedulers and capture any shutdown-time writes.- var inOrder = Mockito.inOrder(storageFactory, rdsContainerManager, elastiCacheContainerManager);+ InOrder inOrder = Mockito.inOrder(storageFactory, rdsContainerManager, elastiCacheContainerManager);inOrder.verify(storageFactory).flushAll();inOrder.verify(elastiCacheContainerManager).stopAll();inOrder.verify(rdsContainerManager).stopAll();diff --git a/src/test/java/io/github/hectorvent/floci/lifecycle/inithook/InitializationHooksRunnerTest.java b/src/test/java/io/github/hectorvent/floci/lifecycle/inithook/InitializationHooksRunnerTest.javaindex cc2c424b24..d124634f7e 100644--- a/src/test/java/io/github/hectorvent/floci/lifecycle/inithook/InitializationHooksRunnerTest.java+++ b/src/test/java/io/github/hectorvent/floci/lifecycle/inithook/InitializationHooksRunnerTest.java@@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test;import org.junit.jupiter.api.extension.ExtendWith;import org.junit.jupiter.api.io.TempDir;import org.mockito.ArgumentMatchers;+import org.mockito.InOrder;import org.mockito.InjectMocks;import org.mockito.Mock;import org.mockito.Mockito;@@ -41,7 +42,7 @@ class InitializationHooksRunnerTest {initializationHooksRunner.run("startup", hookDirectory);- var inOrder = Mockito.inOrder(hookScriptExecutorMock);+ InOrder inOrder = Mockito.inOrder(hookScriptExecutorMock);inOrder.verify(hookScriptExecutorMock).run(hookDirectory, "10-first.sh");inOrder.verify(hookScriptExecutorMock).run(hookDirectory, "15-second.sh");inOrder.verify(hookScriptExecutorMock).run(hookDirectory, "20-third.sh");@@ -118,7 +119,7 @@ class InitializationHooksRunnerTest {IllegalStateException exception = Assertions.assertThrows(IllegalStateException.class, () -> initializationHooksRunner.run("startup", hookDirectory));Assertions.assertSame(illegalStateException, exception);- var inOrder = Mockito.inOrder(hookScriptExecutorMock);+ InOrder inOrder = Mockito.inOrder(hookScriptExecutorMock);inOrder.verify(hookScriptExecutorMock).run(hookDirectory, "10-first.sh");inOrder.verify(hookScriptExecutorMock).run(hookDirectory, "20-failing.sh");inOrder.verifyNoMoreInteractions();@@ -222,7 +223,7 @@ class InitializationHooksRunnerTest {initializationHooksRunner.run(hook);// 01-seed.sh from primaryDir wins; 02-extra.sh from compatDir is included- var inOrder = Mockito.inOrder(hookScriptExecutorMock);+ InOrder inOrder = Mockito.inOrder(hookScriptExecutorMock);inOrder.verify(hookScriptExecutorMock).run(primaryDir.resolve("01-seed.sh").toFile());inOrder.verify(hookScriptExecutorMock).run(compatDir.resolve("02-extra.sh").toFile());inOrder.verifyNoMoreInteractions();diff --git a/src/test/java/io/github/hectorvent/floci/services/amazonmq/AmazonMqEngineTypeCaseTest.java b/src/test/java/io/github/hectorvent/floci/services/amazonmq/AmazonMqEngineTypeCaseTest.javaindex cee003d0dc..9e454358d9 100644--- a/src/test/java/io/github/hectorvent/floci/services/amazonmq/AmazonMqEngineTypeCaseTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/amazonmq/AmazonMqEngineTypeCaseTest.java@@ -38,8 +38,8 @@ class AmazonMqEngineTypeCaseTest {.thenReturn(AccountAwareStorageBackend.inMemory("000000000000"));EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var mqConfig = Mockito.mock(EmulatorConfig.AmazonMqServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.AmazonMqServiceConfig mqConfig = Mockito.mock(EmulatorConfig.AmazonMqServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.amazonmq()).thenReturn(mqConfig);when(mqConfig.mock()).thenReturn(true);diff --git a/src/test/java/io/github/hectorvent/floci/services/amazonmq/AmazonMqServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/amazonmq/AmazonMqServiceTest.javaindex f79837d9c7..bb1fbba286 100644--- a/src/test/java/io/github/hectorvent/floci/services/amazonmq/AmazonMqServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/amazonmq/AmazonMqServiceTest.java@@ -30,8 +30,8 @@ class AmazonMqServiceTest {.thenReturn(AccountAwareStorageBackend.inMemory("000000000000"));EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var mqConfig = Mockito.mock(EmulatorConfig.AmazonMqServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.AmazonMqServiceConfig mqConfig = Mockito.mock(EmulatorConfig.AmazonMqServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.amazonmq()).thenReturn(mqConfig);when(mqConfig.mock()).thenReturn(true);@@ -191,8 +191,8 @@ class AmazonMqServiceTest {.thenReturn(AccountAwareStorageBackend.inMemory("000000000000"));EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var mqConfig = Mockito.mock(EmulatorConfig.AmazonMqServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.AmazonMqServiceConfig mqConfig = Mockito.mock(EmulatorConfig.AmazonMqServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.amazonmq()).thenReturn(mqConfig);when(mqConfig.mock()).thenReturn(false);diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayAwsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayAwsIntegrationTest.javaindex 9afb33708a..0c59509136 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayAwsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayAwsIntegrationTest.java@@ -2,9 +2,11 @@ package io.github.hectorvent.floci.services.apigateway;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import io.restassured.http.ContentType;+import io.restassured.response.Response;import org.junit.jupiter.api.*;import java.util.Map;@@ -141,11 +143,11 @@ class ApiGatewayAwsIntegrationTest {// PUT integration — AWS type targeting SFN StartExecution// Build the integration body programmatically to avoid escaping hell.// The VTL template wraps the input with DynamoDB typed attributes.- var integrationNode = mapper.createObjectNode();+ ObjectNode integrationNode = mapper.createObjectNode();integrationNode.put("type", "AWS");integrationNode.put("httpMethod", "POST");integrationNode.put("uri", "arn:aws:apigateway:us-east-1:states:action/StartExecution");- var reqTemplates = mapper.createObjectNode();+ ObjectNode reqTemplates = mapper.createObjectNode();// VTL template that builds the SFN StartExecution request.// Passes the incoming body as the SFN execution input.String vtl = "{\"stateMachineArn\": \"" + stateMachineArn + "\", "@@ -709,7 +711,7 @@ class ApiGatewayAwsIntegrationTest {redeploy();- var response = given()+ Response response = given().contentType(ContentType.JSON).body("{}").when().post("/execute-api/" + apiId + "/test/header-static")@@ -747,7 +749,7 @@ class ApiGatewayAwsIntegrationTest {redeploy();- var response = given()+ Response response = given().contentType(ContentType.JSON).body("""{@@ -783,11 +785,11 @@ class ApiGatewayAwsIntegrationTest {.then().statusCode(201);// Two templates: application/json writes "json-item", application/xml writes "xml-item"- var integrationNode = mapper.createObjectNode();+ ObjectNode integrationNode = mapper.createObjectNode();integrationNode.put("type", "AWS");integrationNode.put("httpMethod", "POST");integrationNode.put("uri", "arn:aws:apigateway:us-east-1:dynamodb:action/PutItem");- var rt = mapper.createObjectNode();+ ObjectNode rt = mapper.createObjectNode();rt.put("application/json","{\"TableName\": \"" + TABLE_NAME + "\", \"Item\": {\"id\": {\"S\": \"ct-json\"}, \"source\": {\"S\": \"json-template\"}}}");rt.put("application/xml",@@ -848,7 +850,7 @@ class ApiGatewayAwsIntegrationTest {.when().put("/restapis/" + apiId + "/resources/" + resId + "/methods/POST").then().statusCode(201);- var integrationNode = mapper.createObjectNode();+ ObjectNode integrationNode = mapper.createObjectNode();integrationNode.put("type", "AWS");integrationNode.put("httpMethod", "POST");integrationNode.put("uri", "arn:aws:apigateway:us-east-1:dynamodb:action/ListTables");@@ -892,12 +894,12 @@ class ApiGatewayAwsIntegrationTest {.when().put("/restapis/" + apiId + "/resources/" + resId + "/methods/POST").then().statusCode(201);- var integrationNode = mapper.createObjectNode();+ ObjectNode integrationNode = mapper.createObjectNode();integrationNode.put("type", "AWS");integrationNode.put("httpMethod", "POST");integrationNode.put("uri", "arn:aws:apigateway:us-east-1:dynamodb:action/ListTables");integrationNode.put("passthroughBehavior", "WHEN_NO_TEMPLATES");- var rt = mapper.createObjectNode();+ ObjectNode rt = mapper.createObjectNode();rt.put("text/plain", "{}");integrationNode.set("requestTemplates", rt);@@ -941,12 +943,12 @@ class ApiGatewayAwsIntegrationTest {.when().put("/restapis/" + apiId + "/resources/" + resId + "/methods/POST").then().statusCode(201);- var integrationNode = mapper.createObjectNode();+ ObjectNode integrationNode = mapper.createObjectNode();integrationNode.put("type", "AWS");integrationNode.put("httpMethod", "POST");integrationNode.put("uri", "arn:aws:apigateway:us-east-1:dynamodb:action/ListTables");integrationNode.put("passthroughBehavior", "WHEN_NO_MATCH");- var rt = mapper.createObjectNode();+ ObjectNode rt = mapper.createObjectNode();rt.put("text/plain", "{\"bad\":true}");integrationNode.set("requestTemplates", rt);@@ -994,14 +996,14 @@ class ApiGatewayAwsIntegrationTest {// Map method.request.querystring.itemId → integration.request.querystring.itemId// and use it in the template- var integrationNode = mapper.createObjectNode();+ ObjectNode integrationNode = mapper.createObjectNode();integrationNode.put("type", "AWS");integrationNode.put("httpMethod", "POST");integrationNode.put("uri", "arn:aws:apigateway:us-east-1:dynamodb:action/PutItem");- var reqParams = mapper.createObjectNode();+ ObjectNode reqParams = mapper.createObjectNode();reqParams.put("integration.request.querystring.itemId", "method.request.querystring.itemId");integrationNode.set("requestParameters", reqParams);- var rt = mapper.createObjectNode();+ ObjectNode rt = mapper.createObjectNode();rt.put("application/json","{\"TableName\": \"" + TABLE_NAME + "\", \"Item\": {\"id\": {\"S\": \"$input.params('itemId')\"}, \"source\": {\"S\": \"req-param-mapped\"}}}");integrationNode.set("requestTemplates", rt);@@ -1072,7 +1074,7 @@ class ApiGatewayAwsIntegrationTest {redeploy();- var response = given()+ Response response = given().contentType(ContentType.JSON).body("""{@@ -1109,12 +1111,12 @@ class ApiGatewayAwsIntegrationTest {.when().put("/restapis/" + apiId + "/resources/" + resourceId + "/methods/POST").then().statusCode(201);- var integrationNode = mapper.createObjectNode();+ ObjectNode integrationNode = mapper.createObjectNode();integrationNode.put("type", "AWS");integrationNode.put("httpMethod", "POST");integrationNode.put("uri", uri);if (requestTemplate != null) {- var rt = mapper.createObjectNode();+ ObjectNode rt = mapper.createObjectNode();rt.put("application/json", requestTemplate);integrationNode.set("requestTemplates", rt);}@@ -1125,17 +1127,17 @@ class ApiGatewayAwsIntegrationTest {.when().put("/restapis/" + apiId + "/resources/" + resourceId + "/methods/POST/integration").then().statusCode(201);- for (var entry : responses.entrySet()) {- var irNode = mapper.createObjectNode();+ for (Map.Entry<String, IntegrationResponseConfig> entry : responses.entrySet()) {+ ObjectNode irNode = mapper.createObjectNode();irNode.put("selectionPattern", entry.getValue().selectionPattern());- var respTemplates = mapper.createObjectNode();+ ObjectNode respTemplates = mapper.createObjectNode();respTemplates.put("application/json", entry.getValue().responseTemplate());irNode.set("responseTemplates", respTemplates);// Add response parameters if providedMap<String, String> params = responseParams != null ? responseParams.get(entry.getKey()) : null;if (params != null && !params.isEmpty()) {- var paramsNode = mapper.createObjectNode();+ ObjectNode paramsNode = mapper.createObjectNode();params.forEach(paramsNode::put);irNode.set("responseParameters", paramsNode);}@@ -1167,12 +1169,12 @@ class ApiGatewayAwsIntegrationTest {.when().put("/restapis/" + apiId + "/resources/" + resourceId + "/methods/POST").then().statusCode(201);- var integrationNode = mapper.createObjectNode();+ ObjectNode integrationNode = mapper.createObjectNode();integrationNode.put("type", "AWS");integrationNode.put("httpMethod", "POST");integrationNode.put("uri", uri);if (requestTemplate != null) {- var rt = mapper.createObjectNode();+ ObjectNode rt = mapper.createObjectNode();rt.put("application/json", requestTemplate);integrationNode.set("requestTemplates", rt);}@@ -1183,10 +1185,10 @@ class ApiGatewayAwsIntegrationTest {.when().put("/restapis/" + apiId + "/resources/" + resourceId + "/methods/POST/integration").then().statusCode(201);- for (var entry : responses.entrySet()) {- var irNode = mapper.createObjectNode();+ for (Map.Entry<String, IntegrationResponseConfig> entry : responses.entrySet()) {+ ObjectNode irNode = mapper.createObjectNode();irNode.put("selectionPattern", entry.getValue().selectionPattern());- var respTemplates = mapper.createObjectNode();+ ObjectNode respTemplates = mapper.createObjectNode();respTemplates.put("application/json", entry.getValue().responseTemplate());irNode.set("responseTemplates", respTemplates);diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewaySqsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewaySqsIntegrationTest.javaindex 2cf54ddb80..aa694caf1a 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewaySqsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewaySqsIntegrationTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.apigateway;import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.quarkus.test.junit.QuarkusTest;import io.restassured.http.ContentType;import org.junit.jupiter.api.BeforeEach;@@ -196,17 +197,17 @@ class ApiGatewaySqsIntegrationTest {.when().put("/restapis/" + apiId + "/resources/" + resourceId + "/methods/POST").then().statusCode(201);- var integrationNode = mapper.createObjectNode();+ ObjectNode integrationNode = mapper.createObjectNode();integrationNode.put("type", "AWS");integrationNode.put("httpMethod", "POST");integrationNode.put("uri", "arn:aws:apigateway:us-east-1:sqs:path/" + URI_ACCOUNT_ID + "/" + uriQueueName);integrationNode.put("passthroughBehavior", "NEVER");- var reqParams = mapper.createObjectNode();+ ObjectNode reqParams = mapper.createObjectNode();reqParams.put("integration.request.header.Content-Type", "'application/x-www-form-urlencoded'");integrationNode.set("requestParameters", reqParams);- var reqTemplates = mapper.createObjectNode();+ ObjectNode reqTemplates = mapper.createObjectNode();reqTemplates.put("application/json", vtl);integrationNode.set("requestTemplates", reqTemplates);diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewaySqsPathIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewaySqsPathIntegrationTest.javaindex aaa3be0bcf..1b38c5b70b 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewaySqsPathIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewaySqsPathIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.apigateway;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import io.restassured.http.ContentType;@@ -83,16 +84,16 @@ class ApiGatewaySqsPathIntegrationTest {.then().statusCode(201);// PUT integration- var integrationNode = mapper.createObjectNode();+ ObjectNode integrationNode = mapper.createObjectNode();integrationNode.put("type", "AWS");integrationNode.put("httpMethod", "POST");integrationNode.put("uri", "arn:aws:apigateway:eu-west-1:sqs:path/" + ACCOUNT_ID + "/" + QUEUE_NAME);- var requestParameters = mapper.createObjectNode();+ ObjectNode requestParameters = mapper.createObjectNode();requestParameters.put("integration.request.header.Content-Type", "'application/x-www-form-urlencoded'");integrationNode.set("requestParameters", requestParameters);- var reqTemplates = mapper.createObjectNode();+ ObjectNode reqTemplates = mapper.createObjectNode();String vtl = "Action=SendMessage&QueueUrl=$util.urlEncode(\"http://localhost:4566/" + ACCOUNT_ID + "/" + QUEUE_NAME + "\")&MessageBody=$util.urlEncode($input.body)";reqTemplates.put("application/json", vtl);integrationNode.set("requestTemplates", reqTemplates);diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/VtlTemplateEngineTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/VtlTemplateEngineTest.javaindex 38600ba0b9..9444f3bef5 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/VtlTemplateEngineTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/VtlTemplateEngineTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.apigateway;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.quarkus.test.junit.QuarkusTest;import jakarta.inject.Inject;@@ -111,28 +112,28 @@ class VtlTemplateEngineTest {@Testvoid utilEscapeJavaScript_controlChars() {// Test backspace, form feed- var util = new VtlTemplateEngine.UtilVariable(new ObjectMapper());+ VtlTemplateEngine.UtilVariable util = new VtlTemplateEngine.UtilVariable(new ObjectMapper());String result = util.escapeJavaScript("a\bb\fc");assertEquals("a\\bb\\fc", result);}@Testvoid utilEscapeJavaScript_unicode() {- var util = new VtlTemplateEngine.UtilVariable(new ObjectMapper());+ VtlTemplateEngine.UtilVariable util = new VtlTemplateEngine.UtilVariable(new ObjectMapper());String result = util.escapeJavaScript("café");assertEquals("caf\\u00e9", result);}@Testvoid utilEscapeJavaScript_backslash() {- var util = new VtlTemplateEngine.UtilVariable(new ObjectMapper());+ VtlTemplateEngine.UtilVariable util = new VtlTemplateEngine.UtilVariable(new ObjectMapper());String result = util.escapeJavaScript("a\\b");assertEquals("a\\\\b", result);}@Testvoid utilEscapeJavaScript_newlineTabCr() {- var util = new VtlTemplateEngine.UtilVariable(new ObjectMapper());+ VtlTemplateEngine.UtilVariable util = new VtlTemplateEngine.UtilVariable(new ObjectMapper());String result = util.escapeJavaScript("a\nb\tc\rd");assertEquals("a\\nb\\tc\\rd", result);}@@ -291,7 +292,7 @@ class VtlTemplateEngineTest {+ "#end]}";String result = engine.evaluate(template, ctx(body)).body().trim();assertDoesNotThrow(() -> new ObjectMapper().readTree(result));- var node = assertDoesNotThrow(() -> new ObjectMapper().readTree(result));+ JsonNode node = assertDoesNotThrow(() -> new ObjectMapper().readTree(result));assertEquals(2, node.path("results").size());assertEquals("1", node.path("results").get(0).path("key").asText());}@@ -336,7 +337,7 @@ class VtlTemplateEngineTest {{"QueueUrl": "http://localhost:4566/000000000000/my-queue", "MessageBody": "$util.escapeJavaScript($input.json('$'))"}""";String result = engine.evaluate(template, ctx(body)).body();assertDoesNotThrow(() -> new ObjectMapper().readTree(result));- var node = assertDoesNotThrow(() -> new ObjectMapper().readTree(result));+ JsonNode node = assertDoesNotThrow(() -> new ObjectMapper().readTree(result));assertEquals("http://localhost:4566/000000000000/my-queue", node.path("QueueUrl").asText());// MessageBody should be the escaped JSON stringassertTrue(node.path("MessageBody").asText().contains("orderId"));@@ -345,14 +346,14 @@ class VtlTemplateEngineTest {@Testvoid realWorld_dynamoDbQueryWithParams() {// Pattern: use query string params in a DynamoDB query- var queryCtx = new VtlTemplateEngine.VtlContext(+ VtlTemplateEngine.VtlContext queryCtx = new VtlTemplateEngine.VtlContext("{}", Map.of(), Map.of("userId", "user-42", "status", "active"),Map.of(), "prod", "GET", "/items","req-456", "000000000000", Map.of("tableName", "orders"), Map.of());String template = """{"TableName": "$stageVariables.tableName", "KeyConditionExpression": "pk = :pk", "ExpressionAttributeValues": {":pk": {"S": "$input.params().querystring.userId"}}}""";String result = engine.evaluate(template, queryCtx).body();- var node = assertDoesNotThrow(() -> new ObjectMapper().readTree(result));+ JsonNode node = assertDoesNotThrow(() -> new ObjectMapper().readTree(result));assertEquals("orders", node.path("TableName").asText());assertEquals("user-42", node.path("ExpressionAttributeValues").path(":pk").path("S").asText());}diff --git a/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/ContextValueResolverTest.java b/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/ContextValueResolverTest.javaindex 27eff7a17c..7b770699d6 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/ContextValueResolverTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/ContextValueResolverTest.java@@ -22,15 +22,15 @@ class ContextValueResolverTest {@Testvoid literalValuePassesThrough() {- var r = new ContextValueResolver();+ ContextValueResolver r = new ContextValueResolver();assertEquals("wallet.internal",r.resolve("wallet.internal", ctx(Map.of(), Map.of(), Map.of(), Map.of(), Map.of())));}@Testvoid contextAuthorizerClaimsResolves() {- var r = new ContextValueResolver();- var c = ctx(Map.of("userId", "u-123", "email", "[email protected]"),+ ContextValueResolver r = new ContextValueResolver();+ RequestContext c = ctx(Map.of("userId", "u-123", "email", "[email protected]"),Map.of(), Map.of(), Map.of(), Map.of());assertEquals("u-123", r.resolve("$context.authorizer.claims.userId", c));assertEquals("[email protected]", r.resolve("$context.authorizer.claims.email", c));@@ -38,51 +38,51 @@ class ContextValueResolverTest {@Testvoid contextAuthorizerClaimsMissingReturnsNull() {- var r = new ContextValueResolver();+ ContextValueResolver r = new ContextValueResolver();assertNull(r.resolve("$context.authorizer.claims.missing",ctx(Map.of(), Map.of(), Map.of(), Map.of(), Map.of())));}@Testvoid contextAuthorizerArbitraryKeyResolves() {- var r = new ContextValueResolver();- var c = ctx(Map.of(), Map.of("principalId", "p-1"), Map.of(), Map.of(), Map.of());+ ContextValueResolver r = new ContextValueResolver();+ RequestContext c = ctx(Map.of(), Map.of("principalId", "p-1"), Map.of(), Map.of(), Map.of());assertEquals("p-1", r.resolve("$context.authorizer.principalId", c));}@Testvoid contextRequestIdResolves() {- var r = new ContextValueResolver();+ ContextValueResolver r = new ContextValueResolver();assertEquals("req-1",r.resolve("$context.requestId", ctx(Map.of(), Map.of(), Map.of(), Map.of(), Map.of())));}@Testvoid contextSourceIpResolves() {- var r = new ContextValueResolver();+ ContextValueResolver r = new ContextValueResolver();assertEquals("1.2.3.4",r.resolve("$context.identity.sourceIp", ctx(Map.of(), Map.of(), Map.of(), Map.of(), Map.of())));}@Testvoid requestHeaderResolvesCaseInsensitive() {- var r = new ContextValueResolver();- var c = ctx(Map.of(), Map.of(), Map.of("X-Forwarded-For", "5.6.7.8"), Map.of(), Map.of());+ ContextValueResolver r = new ContextValueResolver();+ RequestContext c = ctx(Map.of(), Map.of(), Map.of("X-Forwarded-For", "5.6.7.8"), Map.of(), Map.of());assertEquals("5.6.7.8", r.resolve("$request.header.X-Forwarded-For", c));assertEquals("5.6.7.8", r.resolve("$request.header.x-forwarded-for", c));}@Testvoid requestQuerystringResolves() {- var r = new ContextValueResolver();- var c = ctx(Map.of(), Map.of(), Map.of(), Map.of("page", "2"), Map.of());+ ContextValueResolver r = new ContextValueResolver();+ RequestContext c = ctx(Map.of(), Map.of(), Map.of(), Map.of("page", "2"), Map.of());assertEquals("2", r.resolve("$request.querystring.page", c));}@Testvoid requestPathResolves() {- var r = new ContextValueResolver();- var c = ctx(Map.of(), Map.of(), Map.of(), Map.of(),+ ContextValueResolver r = new ContextValueResolver();+ RequestContext c = ctx(Map.of(), Map.of(), Map.of(), Map.of(),Map.of("proxy", "users/123", "id", "42"));assertEquals("users/123", r.resolve("$request.path.proxy", c));assertEquals("42", r.resolve("$request.path.id", c));@@ -90,14 +90,14 @@ class ContextValueResolverTest {@Testvoid unknownExpressionReturnsNull() {- var r = new ContextValueResolver();+ ContextValueResolver r = new ContextValueResolver();assertNull(r.resolve("$context.unknown",ctx(Map.of(), Map.of(), Map.of(), Map.of(), Map.of())));}@Testvoid nullExpressionReturnsNull() {- var r = new ContextValueResolver();+ ContextValueResolver r = new ContextValueResolver();assertNull(r.resolve(null, ctx(Map.of(), Map.of(), Map.of(), Map.of(), Map.of())));}}diff --git a/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/HttpProxyInvokerTest.java b/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/HttpProxyInvokerTest.javaindex 814cc22f46..109762ddfe 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/HttpProxyInvokerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/HttpProxyInvokerTest.java@@ -358,7 +358,7 @@ class HttpProxyInvokerTest {backend.createContext("/", exchange -> {exchange.sendResponseHeaders(200, chunked ? 0 : size);byte[] block = new byte[64 * 1024];- try (var out = exchange.getResponseBody()) {+ try (OutputStream out = exchange.getResponseBody()) {for (int written = 0; written < size; written += block.length) {out.write(block, 0, Math.min(block.length, size - written));}diff --git a/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/RequestParameterMapperTest.java b/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/RequestParameterMapperTest.javaindex e539ef7348..49361c4175 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/RequestParameterMapperTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/RequestParameterMapperTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.apigatewayv2.proxy;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;+import java.util.LinkedHashMap;import java.util.Map;import static org.junit.jupiter.api.Assertions.assertEquals;@@ -104,7 +105,7 @@ class RequestParameterMapperTest {@Testvoid multipleParametersAppliedInOrder() {- var params = new java.util.LinkedHashMap<String, String>();+ LinkedHashMap<String, String> params = new LinkedHashMap<>();params.put("overwrite:header.Host", "wallet.internal");params.put("append:header.x-user-id", "$context.authorizer.claims.userId");params.put("overwrite:path", "/public/$request.path.proxy");diff --git a/src/test/java/io/github/hectorvent/floci/services/appintegrations/AppIntegrationsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/appintegrations/AppIntegrationsIntegrationTest.javaindex ac869b25bb..6f6eb49c0c 100644--- a/src/test/java/io/github/hectorvent/floci/services/appintegrations/AppIntegrationsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appintegrations/AppIntegrationsIntegrationTest.java@@ -1,6 +1,8 @@package io.github.hectorvent.floci.services.appintegrations;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.ExtractableResponse;+import io.restassured.response.Response;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;@@ -220,7 +222,7 @@ class AppIntegrationsIntegrationTest {@Test@Order(11)void createDataIntegration() {- var response = given()+ ExtractableResponse<Response> response = given().contentType("application/json").body("""{diff --git a/src/test/java/io/github/hectorvent/floci/services/appsync/AppSyncServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/appsync/AppSyncServiceTest.javaindex 05c8584fa4..0a78f4347c 100644--- a/src/test/java/io/github/hectorvent/floci/services/appsync/AppSyncServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appsync/AppSyncServiceTest.java@@ -14,6 +14,7 @@ import io.github.hectorvent.floci.services.appsync.graphql.auth.LambdaAuthorizerimport io.github.hectorvent.floci.services.appsync.graphql.auth.LambdaAuthorizerResult;import io.github.hectorvent.floci.services.appsync.model.ApiKey;import io.github.hectorvent.floci.services.appsync.model.AuthenticationType;+import io.github.hectorvent.floci.services.appsync.model.FunctionConfiguration;import io.github.hectorvent.floci.services.appsync.model.GraphqlApi;import io.github.hectorvent.floci.services.appsync.model.SchemaCreationStatus;import jakarta.enterprise.inject.Instance;@@ -57,7 +58,7 @@ class AppSyncServiceTest {GraphqlApi api = service.createGraphqlApi(Map.of("name", "rename", "authenticationType", "API_KEY"), "us-east-1");service.createDataSource(api.getApiId(), Map.of("name", "ds", "type", "NONE"), "us-east-1");- var created = service.createFunction(api.getApiId(),+ FunctionConfiguration created = service.createFunction(api.getApiId(),Map.of("name", "Query_getMessages_0", "dataSourceName", "ds"), "us-east-1");service.updateFunction(api.getApiId(), created.getFunctionId(),diff --git a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/AppSyncVtlEngineTest.java b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/AppSyncVtlEngineTest.javaindex 516e63925c..fa0fee3124 100644--- a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/AppSyncVtlEngineTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/AppSyncVtlEngineTest.java@@ -40,27 +40,27 @@ class AppSyncVtlEngineTest {@Testvoid a1_nullTemplate() {- var result = engine.evaluate(null, defaultCtx());+ AppSyncVtlResult result = engine.evaluate(null, defaultCtx());assertEquals("", result.output());assertNull(result.error());}@Testvoid a2_emptyTemplate() {- var result = engine.evaluate("", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("", defaultCtx());assertEquals("", result.output());assertNull(result.error());}@Testvoid a3_plainText() {- var result = engine.evaluate("hello", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("hello", defaultCtx());assertEquals("hello", result.output());}@Testvoid a4_jsonTemplate() {- var result = engine.evaluate("{\"key\": \"value\"}", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("{\"key\": \"value\"}", defaultCtx());assertEquals("{\"key\": \"value\"}", result.output());}}@@ -70,15 +70,15 @@ class AppSyncVtlEngineTest {@Testvoid b1_contextArguments() {- var ctx = ctxWith(b -> b.arguments(Map.of("id", "123")));- var result = engine.evaluate("$context.arguments.id", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.arguments(Map.of("id", "123")));+ AppSyncVtlResult result = engine.evaluate("$context.arguments.id", ctx);assertEquals("123", result.output());}@Testvoid b2_ctxArgumentsAlias() {- var ctx = ctxWith(b -> b.arguments(Map.of("id", "123")));- var result = engine.evaluate("$ctx.arguments.id", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.arguments(Map.of("id", "123")));+ AppSyncVtlResult result = engine.evaluate("$ctx.arguments.id", ctx);assertEquals("123", result.output());}@@ -91,100 +91,100 @@ class AppSyncVtlEngineTest {@Testvoid b3_argsShortcut() {- var ctx = ctxWith(b -> b.arguments(Map.of("id", "123")));- var result = engine.evaluate("$args.id", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.arguments(Map.of("id", "123")));+ AppSyncVtlResult result = engine.evaluate("$args.id", ctx);assertEquals("123", result.output());}@Testvoid b4_contextSource() {- var ctx = ctxWith(b -> b.source(Map.of("name", "Alice")));- var result = engine.evaluate("$context.source.name", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.source(Map.of("name", "Alice")));+ AppSyncVtlResult result = engine.evaluate("$context.source.name", ctx);assertEquals("Alice", result.output());}@Testvoid b5_sourceAlias() {- var ctx = ctxWith(b -> b.source(Map.of("name", "Alice")));- var result = engine.evaluate("$source.name", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.source(Map.of("name", "Alice")));+ AppSyncVtlResult result = engine.evaluate("$source.name", ctx);assertEquals("Alice", result.output());}@Testvoid b6_contextSourceNullForTopLevel() {- var ctx = ctxWith(b -> b.source(null));- var result = engine.evaluate("$util.toJson($context.source)", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.source(null));+ AppSyncVtlResult result = engine.evaluate("$util.toJson($context.source)", ctx);assertEquals("null", result.output());}@Testvoid b7_contextResult() {- var ctx = ctxWith(b -> b.result(Map.of("id", 1)));- var result = engine.evaluate("$util.toJson($context.result)", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.result(Map.of("id", 1)));+ AppSyncVtlResult result = engine.evaluate("$util.toJson($context.result)", ctx);assertEquals("{\"id\":1}", result.output());}@Testvoid b8_contextStash() {- var stash = new HashMap<String, Object>();- var ctx = ctxWith(b -> b.stash(stash));- var result = engine.evaluate("$util.qr($stash.put(\"x\",\"y\"))$stash.get(\"x\")", ctx);+ HashMap<String, Object> stash = new HashMap<>();+ AppSyncVtlContext ctx = ctxWith(b -> b.stash(stash));+ AppSyncVtlResult result = engine.evaluate("$util.qr($stash.put(\"x\",\"y\"))$stash.get(\"x\")", ctx);assertEquals("y", result.output());}@Testvoid b9_contextPrevResult() {- var ctx = ctxWith(b -> b.prev(Map.of("result", Map.of("id", 1))));- var result = engine.evaluate("$util.toJson($ctx.prev.result)", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.prev(Map.of("result", Map.of("id", 1))));+ AppSyncVtlResult result = engine.evaluate("$util.toJson($ctx.prev.result)", ctx);assertEquals("{\"id\":1}", result.output());}@Testvoid b10_contextInfoFieldName() {- var ctx = ctxWith(b -> b.info(Map.of("fieldName", "getUser")));- var result = engine.evaluate("$context.info.fieldName", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.info(Map.of("fieldName", "getUser")));+ AppSyncVtlResult result = engine.evaluate("$context.info.fieldName", ctx);assertEquals("getUser", result.output());}@Testvoid b11_contextInfoParentTypeName() {- var ctx = ctxWith(b -> b.info(Map.of("parentTypeName", "Query")));- var result = engine.evaluate("$context.info.parentTypeName", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.info(Map.of("parentTypeName", "Query")));+ AppSyncVtlResult result = engine.evaluate("$context.info.parentTypeName", ctx);assertEquals("Query", result.output());}@Testvoid b12_contextInfoSelectionSetList() {- var ctx = ctxWith(b -> b.info(Map.of("selectionSetList", List.of("id", "name"))));- var result = engine.evaluate("$util.toJson($context.info.selectionSetList)", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.info(Map.of("selectionSetList", List.of("id", "name"))));+ AppSyncVtlResult result = engine.evaluate("$util.toJson($context.info.selectionSetList)", ctx);assertEquals("[\"id\",\"name\"]", result.output());}@Testvoid b13_contextInfoVariables() {- var ctx = ctxWith(b -> b.info(Map.of("variables", Map.of("id", "1"))));- var result = engine.evaluate("$util.toJson($context.info.variables)", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.info(Map.of("variables", Map.of("id", "1"))));+ AppSyncVtlResult result = engine.evaluate("$util.toJson($context.info.variables)", ctx);assertEquals("{\"id\":\"1\"}", result.output());}@Testvoid b14_contextIdentity() {- var ctx = ctxWith(b -> b.identity(Map.of("username", "alice")));- var result = engine.evaluate("$context.identity.username", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.identity(Map.of("username", "alice")));+ AppSyncVtlResult result = engine.evaluate("$context.identity.username", ctx);assertEquals("alice", result.output());}@Testvoid b15_contextRequestHeaders() {- var ctx = ctxWith(b -> b.request(Map.of("headers", Map.of("custom", "val"))));- var result = engine.evaluate("$context.request.headers.custom", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.request(Map.of("headers", Map.of("custom", "val"))));+ AppSyncVtlResult result = engine.evaluate("$context.request.headers.custom", ctx);assertEquals("val", result.output());}@Testvoid b16_contextRequestDomainName() {- var ctx = ctxWith(b -> b.request(Map.of("domainName", "api.example.com")));- var result = engine.evaluate("$context.request.domainName", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.request(Map.of("domainName", "api.example.com")));+ AppSyncVtlResult result = engine.evaluate("$context.request.domainName", ctx);assertEquals("api.example.com", result.output());}}@@ -194,124 +194,124 @@ class AppSyncVtlEngineTest {@Testvoid c1_utilTimeNowISO8601() {- var result = engine.evaluate("$util.time.nowISO8601()", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.time.nowISO8601()", defaultCtx());assertNotNull(result.output());assertTrue(result.output().toString().contains("T"));}@Testvoid c2_utilDynamoDBJson() {- var result = engine.evaluate("$util.dynamodb.toDynamoDBJson(\"hello\")", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.dynamodb.toDynamoDBJson(\"hello\")", defaultCtx());assertEquals("{\"S\":\"hello\"}", result.output());}@Testvoid c3_utilDynamoDBWithArgs() {- var ctx = ctxWith(b -> b.arguments(Map.of("id", "1")));- var result = engine.evaluate("$util.dynamodb.toDynamoDBJson($args.id)", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.arguments(Map.of("id", "1")));+ AppSyncVtlResult result = engine.evaluate("$util.dynamodb.toDynamoDBJson($args.id)", ctx);assertEquals("{\"S\":\"1\"}", result.output());}@Testvoid c4_utilAutoId() {- var result = engine.evaluate("$util.autoId()", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.autoId()", defaultCtx());assertNotNull(result.output());assertTrue(result.output().toString().length() > 0);}@Testvoid c5_utilToJson() {- var ctx = ctxWith(b -> b.arguments(Map.of("id", "1")));- var result = engine.evaluate("$util.toJson($args)", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.arguments(Map.of("id", "1")));+ AppSyncVtlResult result = engine.evaluate("$util.toJson($args)", ctx);assertEquals("{\"id\":\"1\"}", result.output());}@Testvoid c6_utilParseJson() {- var result = engine.evaluate("#set($m=$util.parseJson('{\"a\":1}'))$m.a", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("#set($m=$util.parseJson('{\"a\":1}'))$m.a", defaultCtx());assertEquals("1", result.output());}@Testvoid c7_utilMatches() {- var result = engine.evaluate("#if($util.matches(\"a*b\",\"aaab\"))yes#end", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("#if($util.matches(\"a*b\",\"aaab\"))yes#end", defaultCtx());assertEquals("yes", result.output());}@Testvoid c8_utilIsNull() {- var result = engine.evaluate("#if($util.isNull(null))yes#end", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("#if($util.isNull(null))yes#end", defaultCtx());assertEquals("yes", result.output());}@Testvoid c9_utilIsNullOrEmpty() {- var result = engine.evaluate("#if($util.isNullOrEmpty(\"\"))yes#end", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("#if($util.isNullOrEmpty(\"\"))yes#end", defaultCtx());assertEquals("yes", result.output());}@Testvoid c10_utilTypeOf() {- var result = engine.evaluate("$util.typeOf(\"hello\")", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.typeOf(\"hello\")", defaultCtx());assertEquals("String", result.output());}@Testvoid c11_utilEscapeJavaScript() {- var result = engine.evaluate("$util.escapeJavaScript(\"it's\")", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.escapeJavaScript(\"it's\")", defaultCtx());assertEquals("it\\'s", result.output());}@Testvoid c12_utilUrlEncode() {- var result = engine.evaluate("$util.urlEncode(\"hello world\")", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.urlEncode(\"hello world\")", defaultCtx());assertEquals("hello+world", result.output());}@Testvoid c13_utilBase64Encode() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("#set($s = \"hello\")$util.base64Encode($s.getBytes())", defaultCtx());assertEquals("aGVsbG8=", result.output());}@Testvoid c14_utilStrToUpper() {- var result = engine.evaluate("$util.str.toUpper(\"hello\")", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.str.toUpper(\"hello\")", defaultCtx());assertEquals("HELLO", result.output());}@Testvoid c15_utilMathRoundNum() {- var result = engine.evaluate("$util.math.roundNum(3.7)", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.math.roundNum(3.7)", defaultCtx());assertEquals("4", result.output());}@Testvoid c18_utilQrSuppressesOutput() {- var stash = new HashMap<String, Object>();- var ctx = ctxWith(b -> b.stash(stash));- var result = engine.evaluate("$util.qr($stash.put(\"k\",\"v\"))", ctx);+ HashMap<String, Object> stash = new HashMap<>();+ AppSyncVtlContext ctx = ctxWith(b -> b.stash(stash));+ AppSyncVtlResult result = engine.evaluate("$util.qr($stash.put(\"k\",\"v\"))", ctx);assertEquals("", result.output());}@Testvoid c19_utilQuietSuppressesOutput() {- var stash = new HashMap<String, Object>();- var ctx = ctxWith(b -> b.stash(stash));- var result = engine.evaluate("$util.quiet($stash.put(\"k\",\"v\"))", ctx);+ HashMap<String, Object> stash = new HashMap<>();+ AppSyncVtlContext ctx = ctxWith(b -> b.stash(stash));+ AppSyncVtlResult result = engine.evaluate("$util.quiet($stash.put(\"k\",\"v\"))", ctx);assertEquals("", result.output());}@Testvoid c20_utilDefaultIfNull() {- var result = engine.evaluate("$util.defaultIfNull(null, \"default\")", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.defaultIfNull(null, \"default\")", defaultCtx());assertEquals("default", result.output());}@Testvoid c16_utilListCopyAndRetainAll() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("#set($list = [\"a\",\"b\",\"c\",\"d\"])" +"#set($keep = [\"a\",\"c\"])" +"$util.toJson($util.list.copyAndRetainAll($list, $keep))",@@ -321,7 +321,7 @@ class AppSyncVtlEngineTest {@Testvoid c17_utilMapCopyAndRemoveAllKeys() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("#set($map = {})" +"$util.qr($map.put(\"a\", 1))" +"$util.qr($map.put(\"b\", 2))" +@@ -334,7 +334,7 @@ class AppSyncVtlEngineTest {@Testvoid c21_utilTransformAccessible() {- var result = engine.evaluate("#set($t = $util.transform)$util.typeOf($t)", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("#set($t = $util.transform)$util.typeOf($t)", defaultCtx());assertEquals("Object", result.output());}}@@ -344,7 +344,7 @@ class AppSyncVtlEngineTest {@Testvoid d1_utilErrorWithMessage() {- var result = engine.evaluate("$util.error(\"fail\")", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.error(\"fail\")", defaultCtx());assertTrue(result.hasError());assertEquals("fail", result.error().getMessage());assertEquals("Unknown", result.error().getErrorType());@@ -352,21 +352,21 @@ class AppSyncVtlEngineTest {@Testvoid d2_utilErrorWithType() {- var result = engine.evaluate("$util.error(\"fail\", \"CustomError\")", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.error(\"fail\", \"CustomError\")", defaultCtx());assertTrue(result.hasError());assertEquals("CustomError", result.error().getErrorType());}@Testvoid d3_utilErrorWithData() {- var result = engine.evaluate("$util.error(\"fail\", \"E\", {\"key\":\"val\"})", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.error(\"fail\", \"E\", {\"key\":\"val\"})", defaultCtx());assertTrue(result.hasError());assertNotNull(result.error().getData());}@Testvoid d4_utilErrorFullForm() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("$util.error(\"fail\", \"E\", {\"key\":\"val\"}, {\"info\":\"data\"})",defaultCtx());assertTrue(result.hasError());@@ -375,7 +375,7 @@ class AppSyncVtlEngineTest {@Testvoid d5_utilUnauthorized() {- var result = engine.evaluate("$util.unauthorized()", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.unauthorized()", defaultCtx());assertTrue(result.hasError());assertEquals("Not Authorized", result.error().getMessage());assertEquals("Unauthorized", result.error().getErrorType());@@ -383,27 +383,27 @@ class AppSyncVtlEngineTest {@Testvoid d6_utilValidateTrue() {- var result = engine.evaluate("$util.validate(true, \"msg\")", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.validate(true, \"msg\")", defaultCtx());assertFalse(result.hasError());}@Testvoid d7_utilValidateFalse() {- var result = engine.evaluate("$util.validate(false, \"msg\")", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.validate(false, \"msg\")", defaultCtx());assertTrue(result.hasError());assertEquals("CustomTemplateException", result.error().getErrorType());}@Testvoid d8_errorHaltsEvaluation() {- var result = engine.evaluate("$util.error(\"stop\")#set($x=\"after\")", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.error(\"stop\")#set($x=\"after\")", defaultCtx());assertTrue(result.hasError());assertEquals("", result.output());}@Testvoid d9_errorInConditional() {- var result = engine.evaluate("#if(true)$util.error(\"fail\")#end", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("#if(true)$util.error(\"fail\")#end", defaultCtx());assertTrue(result.hasError());}}@@ -413,7 +413,7 @@ class AppSyncVtlEngineTest {@Testvoid e1_appendErrorDoesNotHalt() {- var result = engine.evaluate("$util.appendError(\"warn\")after", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.appendError(\"warn\")after", defaultCtx());assertFalse(result.hasError());assertTrue(result.output().toString().contains("after"));assertEquals(1, result.appendedErrors().size());@@ -422,29 +422,29 @@ class AppSyncVtlEngineTest {@Testvoid e1_appendErrorDoesNotPopulateContextError() {- var ctx = defaultCtx();- var result = engine.evaluate("$util.appendError(\"warn\")$context.error", ctx);+ AppSyncVtlContext ctx = defaultCtx();+ AppSyncVtlResult result = engine.evaluate("$util.appendError(\"warn\")$context.error", ctx);assertFalse(result.hasError());assertNull(ctx.getContextMap().get("error"));}@Testvoid e2_appendErrorWithType() {- var result = engine.evaluate("$util.appendError(\"warn\", \"Type\")", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.appendError(\"warn\", \"Type\")", defaultCtx());assertEquals(1, result.appendedErrors().size());assertEquals("Type", result.appendedErrors().get(0).get("type"));}@Testvoid e3_appendErrorWithData() {- var result = engine.evaluate("$util.appendError(\"w\", \"T\", {\"k\":\"v\"})", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.appendError(\"w\", \"T\", {\"k\":\"v\"})", defaultCtx());assertEquals(1, result.appendedErrors().size());assertNotNull(result.appendedErrors().get(0).get("data"));}@Testvoid e4_multipleAppendError() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("$util.appendError(\"e1\")$util.appendError(\"e2\")", defaultCtx());assertEquals(2, result.appendedErrors().size());assertEquals("e1", result.appendedErrors().get(0).get("message"));@@ -453,7 +453,7 @@ class AppSyncVtlEngineTest {@Testvoid e5_appendErrorPlusError() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("$util.appendError(\"warn\")$util.error(\"fatal\")", defaultCtx());assertTrue(result.hasError());assertEquals(1, result.appendedErrors().size());@@ -463,7 +463,7 @@ class AppSyncVtlEngineTest {@Testvoid e6_appendErrorWithErrorInfo() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("$util.appendError(\"w\", \"T\", {\"k\":\"v\"}, {\"info\":\"data\"})",defaultCtx());assertEquals(1, result.appendedErrors().size());@@ -477,35 +477,35 @@ class AppSyncVtlEngineTest {@Testvoid f1_returnWithValue() {- var result = engine.evaluate("#return({\"id\":\"123\"})", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("#return({\"id\":\"123\"})", defaultCtx());assertFalse(result.hasError());assertNotNull(result.output());}@Testvoid f2_returnWithoutValue() {- var result = engine.evaluate("#return", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("#return", defaultCtx());assertFalse(result.hasError());assertNull(result.output());}@Testvoid f3_returnHaltsEvaluation() {- var result = engine.evaluate("before#return(\"mid\")after", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("before#return(\"mid\")after", defaultCtx());assertFalse(result.hasError());assertEquals("mid", result.output().toString());}@Testvoid f4_returnInIf() {- var result = engine.evaluate("#if(true)#return(\"early\")#end", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("#if(true)#return(\"early\")#end", defaultCtx());assertFalse(result.hasError());assertEquals("early", result.output());}@Testvoid f5_returnInForeach() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("#foreach($i in [1,2,3])#if($i==2)#return(\"stop\")#end$i#end",defaultCtx());assertFalse(result.hasError());@@ -518,35 +518,35 @@ class AppSyncVtlEngineTest {@Testvoid g1_apiKeyAuth() {- var ctx = ctxWith(b -> b.authType("API Key Authorization"));- var result = engine.evaluate("$util.authType()", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.authType("API Key Authorization"));+ AppSyncVtlResult result = engine.evaluate("$util.authType()", ctx);assertEquals("API Key Authorization", result.output());}@Testvoid g2_iamAuth() {- var ctx = ctxWith(b -> b.authType("IAM Authorization"));- var result = engine.evaluate("$util.authType()", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.authType("IAM Authorization"));+ AppSyncVtlResult result = engine.evaluate("$util.authType()", ctx);assertEquals("IAM Authorization", result.output());}@Testvoid g3_cognitoAuth() {- var ctx = ctxWith(b -> b.authType("User Pool Authorization"));- var result = engine.evaluate("$util.authType()", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.authType("User Pool Authorization"));+ AppSyncVtlResult result = engine.evaluate("$util.authType()", ctx);assertEquals("User Pool Authorization", result.output());}@Testvoid g4_oidcAuth() {- var ctx = ctxWith(b -> b.authType("Open ID Connect Authorization"));- var result = engine.evaluate("$util.authType()", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.authType("Open ID Connect Authorization"));+ AppSyncVtlResult result = engine.evaluate("$util.authType()", ctx);assertEquals("Open ID Connect Authorization", result.output());}@Testvoid g5_noAuthType() {- var result = engine.evaluate("$util.authType()", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.authType()", defaultCtx());assertEquals("$util.authType()", result.output());}}@@ -556,57 +556,57 @@ class AppSyncVtlEngineTest {@Testvoid h1_setDirective() {- var result = engine.evaluate("#set($x = \"hello\")$x", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("#set($x = \"hello\")$x", defaultCtx());assertEquals("hello", result.output());}@Testvoid h2_ifElse() {- var result = engine.evaluate("#if(true)yes#{else}no#end", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("#if(true)yes#{else}no#end", defaultCtx());assertEquals("yes", result.output());}@Testvoid h3_foreach() {- var result = engine.evaluate("#foreach($i in [1,2,3])$i #end", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("#foreach($i in [1,2,3])$i #end", defaultCtx());assertEquals("1 2 3 ", result.output());}@Testvoid h4_foreachHasNext() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("#foreach($i in [1,2])$i$foreach.hasNext#end", defaultCtx());assertEquals("1true2false", result.output());}@Testvoid h5_nullReference() {- var result = engine.evaluate("$context.nonexistent", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$context.nonexistent", defaultCtx());assertEquals("$context.nonexistent", result.output());}@Testvoid h5b_silentReferenceOnNull() {- var result = engine.evaluate("$!context.error", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$!context.error", defaultCtx());assertEquals("", result.output());}@Testvoid h5c_silentReferenceOnNonexistent() {- var result = engine.evaluate("$!context.nonexistent", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$!context.nonexistent", defaultCtx());assertEquals("", result.output());}@Testvoid h6_mapPut() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("#set($m={})$util.qr($m.put(\"k\",\"v\"))$m.k", defaultCtx());assertEquals("v", result.output());}@Testvoid h7_nestedMaps() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("#set($m={\"a\":{\"b\":\"c\"}})$m.a.b", defaultCtx());assertEquals("c", result.output());}@@ -617,34 +617,34 @@ class AppSyncVtlEngineTest {@Testvoid i1_stashPersistsAcrossEvaluations() {- var stash = new HashMap<String, Object>();- var ctx1 = ctxWith(b -> b.stash(stash));+ HashMap<String, Object> stash = new HashMap<>();+ AppSyncVtlContext ctx1 = ctxWith(b -> b.stash(stash));engine.evaluate("$util.qr($stash.put(\"x\",\"y\"))", ctx1);- var ctx2 = ctxWith(b -> b.stash(stash));- var result = engine.evaluate("$stash.get(\"x\")", ctx2);+ AppSyncVtlContext ctx2 = ctxWith(b -> b.stash(stash));+ AppSyncVtlResult result = engine.evaluate("$stash.get(\"x\")", ctx2);assertEquals("y", result.output());}@Testvoid i2_prevResultCarriesBetweenEvaluations() {- var ctx1 = ctxWith(b -> b.result("output1"));- var result1 = engine.evaluate("$util.toJson($context.result)", ctx1);+ AppSyncVtlContext ctx1 = ctxWith(b -> b.result("output1"));+ AppSyncVtlResult result1 = engine.evaluate("$util.toJson($context.result)", ctx1);- var ctx2 = ctxWith(b -> b.prev(Map.of("result", "output1")));- var result2 = engine.evaluate("$ctx.prev.result", ctx2);+ AppSyncVtlContext ctx2 = ctxWith(b -> b.prev(Map.of("result", "output1")));+ AppSyncVtlResult result2 = engine.evaluate("$ctx.prev.result", ctx2);assertEquals("output1", result2.output());}@Testvoid i3_stashIsolationBetweenPipelines() {- var stash1 = new HashMap<String, Object>();- var stash2 = new HashMap<String, Object>();+ HashMap<String, Object> stash1 = new HashMap<>();+ HashMap<String, Object> stash2 = new HashMap<>();- var ctx1 = ctxWith(b -> b.stash(stash1));+ AppSyncVtlContext ctx1 = ctxWith(b -> b.stash(stash1));engine.evaluate("$util.qr($stash.put(\"key\",\"val1\"))", ctx1);- var ctx2 = ctxWith(b -> b.stash(stash2));+ AppSyncVtlContext ctx2 = ctxWith(b -> b.stash(stash2));engine.evaluate("$util.qr($stash.put(\"key\",\"val2\"))", ctx2);assertEquals("val1", stash1.get("key"));@@ -654,13 +654,13 @@ class AppSyncVtlEngineTest {@Testvoid i4_stashPersistsBetweenRequestResponse() {- var stash = new HashMap<String, Object>();+ HashMap<String, Object> stash = new HashMap<>();- var reqCtx = ctxWith(b -> b.stash(stash));+ AppSyncVtlContext reqCtx = ctxWith(b -> b.stash(stash));engine.evaluate("$util.qr($stash.put(\"key\",\"val\"))", reqCtx);- var resCtx = ctxWith(b -> b.stash(stash).result("data"));- var result = engine.evaluate("$stash.get(\"key\")", resCtx);+ AppSyncVtlContext resCtx = ctxWith(b -> b.stash(stash).result("data"));+ AppSyncVtlResult result = engine.evaluate("$stash.get(\"key\")", resCtx);assertEquals("val", result.output());}}@@ -670,94 +670,94 @@ class AppSyncVtlEngineTest {@Testvoid j1_unicodeInTemplate() {- var result = engine.evaluate("{\"name\": \"日本語\"}", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("{\"name\": \"日本語\"}", defaultCtx());assertEquals("{\"name\": \"日本語\"}", result.output());}@Testvoid j3_specialCharactersInArgs() {- var ctx = ctxWith(b -> b.arguments(Map.of("name", "O'Brien")));- var result = engine.evaluate("$args.name", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.arguments(Map.of("name", "O'Brien")));+ AppSyncVtlResult result = engine.evaluate("$args.name", ctx);assertEquals("O'Brien", result.output());}@Testvoid j4_deeplyNestedContext() {- var ctx = ctxWith(b -> b.arguments(Map.of("a", Map.of("b", Map.of("c", Map.of("d", "deep"))))));- var result = engine.evaluate("$context.arguments.a.b.c.d", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.arguments(Map.of("a", Map.of("b", Map.of("c", Map.of("d", "deep"))))));+ AppSyncVtlResult result = engine.evaluate("$context.arguments.a.b.c.d", ctx);assertEquals("deep", result.output());}@Testvoid j7_contextErrorInitiallyNull() {- var result = engine.evaluate("$context.error", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$context.error", defaultCtx());assertEquals("$context.error", result.output());}@Testvoid j8_contextErrorNotPopulatedByAppendError() {- var ctx = defaultCtx();- var result = engine.evaluate(+ AppSyncVtlContext ctx = defaultCtx();+ AppSyncVtlResult result = engine.evaluate("$util.appendError(\"msg\", \"Type\")$context.error", ctx);assertNull(ctx.getContextMap().get("error"));}@Testvoid j9_multiValueHeaders() {- var ctx = ctxWith(b -> b.request(+ AppSyncVtlContext ctx = ctxWith(b -> b.request(Map.of("headers", Map.of("custom", List.of("val1", "val2")))));- var result = engine.evaluate("$context.request.headers.custom[0]", ctx);+ AppSyncVtlResult result = engine.evaluate("$context.request.headers.custom[0]", ctx);assertEquals("val1", result.output());}@Testvoid j10_contextResultNullInRequestTemplate() {- var ctx = defaultCtx();- var result = engine.evaluate("$context.result", ctx);+ AppSyncVtlContext ctx = defaultCtx();+ AppSyncVtlResult result = engine.evaluate("$context.result", ctx);assertEquals("$context.result", result.output());}@Testvoid j11_prevDefaultIsNull() {- var result = engine.evaluate("$util.toJson($ctx.prev)", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.toJson($ctx.prev)", defaultCtx());assertEquals("null", result.output());}@Testvoid j11b_prevUndefinedRendersAsLiteral() {- var result = engine.evaluate("$ctx.prev", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$ctx.prev", defaultCtx());assertEquals("$ctx.prev", result.output());}@Testvoid j11c_prevResultUndefinedRendersAsLiteral() {- var result = engine.evaluate("$ctx.prev.result", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$ctx.prev.result", defaultCtx());assertEquals("$ctx.prev.result", result.output());}@Testvoid j2_largeTemplateWithLoops() {- var sb = new StringBuilder();+ StringBuilder sb = new StringBuilder();sb.append("#set($total = 0)");sb.append("#foreach($i in [1,2,3,4,5])");sb.append("#set($total = $total + $i)");sb.append("#end");sb.append("$total");- var result = engine.evaluate(sb.toString(), defaultCtx());+ AppSyncVtlResult result = engine.evaluate(sb.toString(), defaultCtx());assertEquals("15", result.output());}@Testvoid j5_toJsonExcludesSelectionSetFields() {- var info = Map.<String, Object>of(+ Map<String, Object> info = Map.of("fieldName", "getPost","parentTypeName", "Query","variables", Map.of("id", "1"),"selectionSetList", List.of("id", "title"),"selectionSetGraphQL", "{ id title }");- var ctx = ctxWith(b -> b.info(info));- var result = engine.evaluate("$util.toJson($context.info)", ctx);+ AppSyncVtlContext ctx = ctxWith(b -> b.info(info));+ AppSyncVtlResult result = engine.evaluate("$util.toJson($context.info)", ctx);String output = result.output().toString();assertTrue(output.contains("fieldName"));assertTrue(output.contains("parentTypeName"));@@ -785,7 +785,7 @@ class AppSyncVtlEngineTest {// evaluating it. Getting the raw template text back verbatim (rather than an actual// ClassLoader instance's toString) proves the call was blocked.String template = "$util.getClass().getClassLoader()";- var result = engine.evaluate(template, defaultCtx());+ AppSyncVtlResult result = engine.evaluate(template, defaultCtx());assertEquals(template, result.output(),"expected getClassLoader() to be blocked by SecureUberspector and rendered as "+ "an unresolved literal reference, but got: " + result.output());@@ -793,7 +793,7 @@ class AppSyncVtlEngineTest {@Testvoid k2_classForNameIsNotReachable() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("$util.getClass().forName('java.lang.System').getName()", defaultCtx());assertNotEquals("java.lang.System", result.output(),"expected Class.forName(...) to be blocked by SecureUberspector, but it resolved: "@@ -802,7 +802,7 @@ class AppSyncVtlEngineTest {@Testvoid k3_runtimeClassIsNotLoadableByName() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("$util.getClass().forName('java.lang.Runtime').getName()", defaultCtx());assertNotEquals("java.lang.Runtime", result.output(),"expected Class.forName('java.lang.Runtime') to be blocked, but it resolved: "@@ -811,7 +811,7 @@ class AppSyncVtlEngineTest {@Testvoid k4_processBuilderClassIsNotLoadableByName() {- var result = engine.evaluate(+ AppSyncVtlResult result = engine.evaluate("$util.getClass().forName('java.lang.ProcessBuilder').getName()", defaultCtx());assertNotEquals("java.lang.ProcessBuilder", result.output(),"expected Class.forName('java.lang.ProcessBuilder') to be blocked, but it resolved: "@@ -822,7 +822,7 @@ class AppSyncVtlEngineTest {void k5_getClassStillPermitsGetName() {// getName() on a Class receiver must remain permitted (SecureUberspector's one// exception), so ordinary reflection-free VTL idioms relying on it keep working.- var result = engine.evaluate("$util.getClass().getName()", defaultCtx());+ AppSyncVtlResult result = engine.evaluate("$util.getClass().getName()", defaultCtx());assertTrue(result.output().toString().contains("AppSyncUtil"),"expected getName() on Class to still work, got: " + result.output());}@@ -833,7 +833,7 @@ class AppSyncVtlEngineTest {// renders 50,000 characters; the configured default// (AppSyncServiceConfig.vtlMaxLoops = 10000) must cap the loop well before that.String template = "#foreach($i in [1..50000])x#end";- var result = engine.evaluate(template, defaultCtx());+ AppSyncVtlResult result = engine.evaluate(template, defaultCtx());assertEquals(10000, result.output().toString().length(),"expected #foreach to be capped at the configured vtlMaxLoops, but rendered "+ result.output().toString().length() + " characters");diff --git a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/resolver/AppSyncResolverExecutorTest.java b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/resolver/AppSyncResolverExecutorTest.javaindex b0e2391a23..900e14916c 100644--- a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/resolver/AppSyncResolverExecutorTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/resolver/AppSyncResolverExecutorTest.java@@ -88,7 +88,7 @@ class AppSyncResolverExecutorTest {public JsEvaluation evaluate(String code, String handler, Map<String, Object> context) {calls.add(code + "#" + handler);contexts.add(context);- var script = scripts.get(code + "#" + handler);+ BiFunction<String, Map<String, Object>, JsEvaluation> script = scripts.get(code + "#" + handler);if (script == null) {// Nothing scripted stands for a module that does not export this handler, which is// how a request-only function behaves.diff --git a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/util/ListUtilTest.java b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/util/ListUtilTest.javaindex 9cec8a8a3d..9b6852005c 100644--- a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/util/ListUtilTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/util/ListUtilTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.appsync.graphql.util;import org.junit.jupiter.api.Test;import java.util.ArrayList;+import java.util.HashMap;import java.util.List;import java.util.Map;@@ -100,11 +101,11 @@ class ListUtilTest {@Testvoid sortList_withFieldName() {- var map1 = new java.util.HashMap<String, Object>();+ HashMap<String, Object> map1 = new HashMap<>();map1.put("name", "Charlie");- var map2 = new java.util.HashMap<String, Object>();+ HashMap<String, Object> map2 = new HashMap<>();map2.put("name", "Alice");- var map3 = new java.util.HashMap<String, Object>();+ HashMap<String, Object> map3 = new HashMap<>();map3.put("name", "Bob");List<Object> input = List.of(map1, map2, map3);List<Object> result = listUtil.sortList(input, false, "name");diff --git a/src/test/java/io/github/hectorvent/floci/services/athena/AthenaCreateWorkGroupPersistenceIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/athena/AthenaCreateWorkGroupPersistenceIntegrationTest.javaindex 1a73a6b7a5..ddcb9110b9 100644--- a/src/test/java/io/github/hectorvent/floci/services/athena/AthenaCreateWorkGroupPersistenceIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/athena/AthenaCreateWorkGroupPersistenceIntegrationTest.java@@ -70,7 +70,7 @@ class AthenaCreateWorkGroupPersistenceIntegrationTest {assertTrue(Files.exists(WORKGROUPS_FILE), "CreateWorkGroup should create workgroups.json");- var store = new PersistentStorage<String, Map<String, Object>>(+ PersistentStorage<String, Map<String, Object>> store = new PersistentStorage<>(WORKGROUPS_FILE,new TypeReference<Map<String, Map<String, Object>>>() {});store.load();@@ -121,7 +121,7 @@ class AthenaCreateWorkGroupPersistenceIntegrationTest {.then().statusCode(200);- var store = new PersistentStorage<String, Map<String, Object>>(+ PersistentStorage<String, Map<String, Object>> store = new PersistentStorage<>(WORKGROUPS_FILE,new TypeReference<Map<String, Map<String, Object>>>() {});store.load();@@ -167,7 +167,7 @@ class AthenaCreateWorkGroupPersistenceIntegrationTest {.then().statusCode(200);- var store = new PersistentStorage<String, Map<String, Object>>(+ PersistentStorage<String, Map<String, Object>> store = new PersistentStorage<>(WORKGROUPS_FILE,new TypeReference<Map<String, Map<String, Object>>>() {});store.load();@@ -205,7 +205,7 @@ class AthenaCreateWorkGroupPersistenceIntegrationTest {.then().statusCode(200);- var store = new PersistentStorage<String, Map<String, Object>>(+ PersistentStorage<String, Map<String, Object>> store = new PersistentStorage<>(WORKGROUPS_FILE,new TypeReference<Map<String, Map<String, Object>>>() {});store.load();@@ -240,7 +240,7 @@ class AthenaCreateWorkGroupPersistenceIntegrationTest {.then().statusCode(200);- var store = new PersistentStorage<String, Map<String, Object>>(+ PersistentStorage<String, Map<String, Object>> store = new PersistentStorage<>(WORKGROUPS_FILE,new TypeReference<Map<String, Map<String, Object>>>() {});store.load();@@ -277,7 +277,7 @@ class AthenaCreateWorkGroupPersistenceIntegrationTest {.then().statusCode(200);- var store = new PersistentStorage<String, Map<String, Object>>(+ PersistentStorage<String, Map<String, Object>> store = new PersistentStorage<>(WORKGROUPS_FILE,new TypeReference<Map<String, Map<String, Object>>>() {});store.load();diff --git a/src/test/java/io/github/hectorvent/floci/services/athena/AthenaGetWorkGroupIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/athena/AthenaGetWorkGroupIntegrationTest.javaindex 7a82bc33f2..de52a2c14b 100644--- a/src/test/java/io/github/hectorvent/floci/services/athena/AthenaGetWorkGroupIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/athena/AthenaGetWorkGroupIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.athena;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.ValidatableResponse;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;@@ -92,7 +93,7 @@ class AthenaGetWorkGroupIntegrationTest {.then().statusCode(200);- var response = given()+ ValidatableResponse response = given().header("X-Amz-Target", "AmazonAthena.GetWorkGroup").contentType(CONTENT_TYPE).body("{ \"WorkGroup\": \"timestamp-format-bug-wg\" }")diff --git a/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingReconcilerTest.java b/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingReconcilerTest.javaindex a0a9688742..45626d18ac 100644--- a/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingReconcilerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingReconcilerTest.java@@ -54,14 +54,14 @@ class AutoScalingReconcilerTest {@Testvoid stopTerminatesReconcilerThread() throws Exception {- var asgService = mock(AutoScalingService.class);- var ec2Service = mock(Ec2Service.class);- var elbV2Service = mock(ElbV2Service.class);- var reconciler = new AutoScalingReconciler(asgService, ec2Service, elbV2Service);- var preexisting = Thread.getAllStackTraces().keySet();+ AutoScalingService asgService = mock(AutoScalingService.class);+ Ec2Service ec2Service = mock(Ec2Service.class);+ ElbV2Service elbV2Service = mock(ElbV2Service.class);+ AutoScalingReconciler reconciler = new AutoScalingReconciler(asgService, ec2Service, elbV2Service);+ Set<Thread> preexisting = Thread.getAllStackTraces().keySet();reconciler.start();- var reconcilerThread = Thread.getAllStackTraces().keySet().stream()+ Thread reconcilerThread = Thread.getAllStackTraces().keySet().stream().filter(t -> "asg-reconciler".equals(t.getName()) && !preexisting.contains(t)).findFirst().orElseThrow();diff --git a/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingServiceTest.javaindex d32b4afe24..80b8ef5698 100644--- a/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingServiceTest.java@@ -6,8 +6,11 @@ import io.github.hectorvent.floci.services.autoscaling.model.AsgInstance;import io.github.hectorvent.floci.services.autoscaling.model.AsgOptionalFields;import io.github.hectorvent.floci.services.autoscaling.model.AutoScalingGroup;import io.github.hectorvent.floci.services.autoscaling.model.InstanceRefresh;+import io.github.hectorvent.floci.services.autoscaling.model.LaunchConfiguration;import io.github.hectorvent.floci.services.autoscaling.model.LaunchConfigurationBlockDeviceMapping;import io.github.hectorvent.floci.services.autoscaling.model.MixedInstancesPolicy;+import io.github.hectorvent.floci.services.autoscaling.model.ScheduledAction;+import io.github.hectorvent.floci.services.autoscaling.model.WarmPoolConfiguration;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.model.GroupIdentifier;import io.github.hectorvent.floci.services.ec2.model.Instance;@@ -91,7 +94,7 @@ class AutoScalingServiceTest {assertEquals(refresh.getInstanceRefreshId(), page.instanceRefreshes().getFirst().getInstanceRefreshId());assertNull(page.nextToken());- var group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();assertEquals("lt-updated", group.getLaunchTemplateId());assertEquals("2", group.getLaunchTemplateVersion());assertNull(group.getLaunchConfigurationName());@@ -186,7 +189,7 @@ class AutoScalingServiceTest {when(ec2Service.describeInstances(REGION, List.of("i-1234567890abcdef0"), java.util.Map.of())).thenReturn(List.of(reservation));- var launchConfiguration = service.createLaunchConfiguration(REGION,+ LaunchConfiguration launchConfiguration = service.createLaunchConfiguration(REGION,"lc-from-instance","i-1234567890abcdef0",null,@@ -210,7 +213,7 @@ class AutoScalingServiceTest {@Testvoid createLaunchConfigurationDefaultsInstanceMonitoringToEnabled() {- var lc = service.createLaunchConfiguration(REGION, "lc-default-monitoring", null,+ LaunchConfiguration lc = service.createLaunchConfiguration(REGION, "lc-default-monitoring", null,"ami-12345678", "t3.micro", null, List.of(), null, null, null);assertEquals(Boolean.TRUE, lc.getInstanceMonitoringEnabled());@@ -222,7 +225,7 @@ class AutoScalingServiceTest {@Testvoid createLaunchConfigurationKeepsAnExplicitInstanceMonitoringOverride() {- var lc = service.createLaunchConfiguration(REGION, "lc-monitoring-off", null,+ LaunchConfiguration lc = service.createLaunchConfiguration(REGION, "lc-monitoring-off", null,"ami-12345678", "t3.micro", null, List.of(), null, null, null, Boolean.FALSE, List.of());assertEquals(Boolean.FALSE, lc.getInstanceMonitoringEnabled());@@ -233,20 +236,20 @@ class AutoScalingServiceTest {@Testvoid createLaunchConfigurationRoundTripsBlockDeviceMappings() {- var ebs = new LaunchConfigurationBlockDeviceMapping.Ebs();+ LaunchConfigurationBlockDeviceMapping.Ebs ebs = new LaunchConfigurationBlockDeviceMapping.Ebs();ebs.setVolumeSize(100);ebs.setVolumeType("gp3");ebs.setIops(3000);ebs.setThroughput(125);ebs.setDeleteOnTermination(true);- var mapping = new LaunchConfigurationBlockDeviceMapping();+ LaunchConfigurationBlockDeviceMapping mapping = new LaunchConfigurationBlockDeviceMapping();mapping.setDeviceName("/dev/xvda");mapping.setEbs(ebs);service.createLaunchConfiguration(REGION, "lc-with-root-device", null,"ami-12345678", "t3.micro", null, List.of(), null, null, null, null, List.of(mapping));- var stored = service.describeLaunchConfigurations(REGION, List.of("lc-with-root-device"))+ List<LaunchConfigurationBlockDeviceMapping> stored = service.describeLaunchConfigurations(REGION, List.of("lc-with-root-device")).getFirst().getBlockDeviceMappings();assertEquals(1, stored.size());assertEquals("/dev/xvda", stored.getFirst().getDeviceName());@@ -319,7 +322,7 @@ class AutoScalingServiceTest {assertEquals("ValidationError", error.getErrorCode());assertEquals(AutoScalingService.MISSING_LAUNCH_TEMPLATE_IMAGE_ID_MESSAGE, error.getMessage());- var group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();assertEquals("lt-original", group.getLaunchTemplateId());assertEquals(3, group.getMaxSize());}@@ -346,7 +349,7 @@ class AutoScalingServiceTest {assertEquals("ValidationError", error.getErrorCode());assertEquals("LaunchTemplateVersion requires a LaunchTemplateId or LaunchTemplateName.", error.getMessage());- var group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();assertEquals("1", group.getLaunchTemplateVersion());assertEquals(3, group.getMaxSize());}@@ -380,7 +383,7 @@ class AutoScalingServiceTest {assertEquals("ValidationError", error.getErrorCode());assertEquals(AutoScalingService.ACTIVE_INSTANCE_REFRESH_DESIRED_CONFIGURATION_MESSAGE, error.getMessage());assertEquals(400, error.getHttpStatus());- var group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();assertEquals("lt-refresh", group.getLaunchTemplateId());assertEquals("2", group.getLaunchTemplateVersion());assertEquals(3, group.getMaxSize());@@ -452,7 +455,7 @@ class AutoScalingServiceTest {@Testvoid startInstanceRefreshWithLaunchTemplateAliasDoesNotSkipExistingInstances() {- var group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();group.setLaunchTemplateVersion("$Latest");AutoScalingGroupFixture.addInstance(service, REGION, "test-asg", "i-original", "InService", "lt-original", "1");InstanceRefresh request = new InstanceRefresh();@@ -479,7 +482,7 @@ class AutoScalingServiceTest {@Testvoid startInstanceRefreshWithDefaultLaunchTemplateAliasDoesNotSkipExistingInstances() {- var group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();group.setLaunchTemplateVersion("$Default");AutoScalingGroupFixture.addInstance(service, REGION, "test-asg", "i-original", "InService", "lt-original", "1");InstanceRefresh request = new InstanceRefresh();@@ -506,7 +509,7 @@ class AutoScalingServiceTest {@Testvoid startInstanceRefreshWithDefaultLaunchTemplateVersionDoesNotSkipExistingInstances() {- var group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();group.setLaunchTemplateVersion(null);AutoScalingGroupFixture.addInstance(service, REGION, "test-asg", "i-original", "InService", "lt-original", "1");InstanceRefresh request = new InstanceRefresh();@@ -522,7 +525,7 @@ class AutoScalingServiceTest {@Testvoid startInstanceRefreshWithBlankLaunchTemplateVersionDoesNotSkipExistingInstances() {- var group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();group.setLaunchTemplateVersion("");AutoScalingGroupFixture.addInstance(service, REGION, "test-asg", "i-original", "InService", "lt-original", "1");InstanceRefresh request = new InstanceRefresh();@@ -543,7 +546,7 @@ class AutoScalingServiceTest {request.setDesiredLaunchTemplateId("lt-updated");request.setDesiredLaunchTemplateVersion("2");InstanceRefresh refresh = service.startInstanceRefresh(REGION, "test-asg", request);- var group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();group.getInstances().clear();AutoScalingGroupFixture.addInstance(service, REGION, "test-asg", "i-replacement", "InService", "lt-updated", "2");@@ -563,7 +566,7 @@ class AutoScalingServiceTest {void completeInstanceRefreshWaitsForReplacementCapacity() {AutoScalingGroupFixture.addInstance(service, REGION, "test-asg", "i-original", "InService", "lt-original", "1");InstanceRefresh refresh = service.startInstanceRefresh(REGION, "test-asg", new InstanceRefresh());- var group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();group.getInstances().clear();service.completeInstanceRefreshIfSettled(REGION, "test-asg");@@ -671,7 +674,7 @@ class AutoScalingServiceTest {createWithMixedInstancesPolicy("mixed-with-lt", policy);- var group = service.describeAutoScalingGroups(REGION, List.of("mixed-with-lt")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("mixed-with-lt")).getFirst();assertEquals("lt-mixed",group.getMixedInstancesPolicy().getLaunchTemplate().getLaunchTemplateSpecification().getLaunchTemplateId());@@ -809,7 +812,7 @@ class AutoScalingServiceTest {dup2.setInstanceId("i-dup");dup2.setLifecycleState("InService");dup2.setHealthStatus("Healthy");- var instances = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst().getInstances();+ List<AsgInstance> instances = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst().getInstances();instances.add(dup1);instances.add(dup2);@@ -854,7 +857,7 @@ class AutoScalingServiceTest {void suspendProcessesRecordsNamedProcessesAndResumeClearsThem() {service.suspendProcesses(REGION, "test-asg", List.of("Launch", "Terminate"));- var group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();assertEquals(List.of("Launch", "Terminate"), group.getSuspendedProcesses());service.resumeProcesses(REGION, "test-asg", List.of("Launch"));@@ -870,7 +873,7 @@ class AutoScalingServiceTest {void suspendProcessesWithNoNamesSuspendsEveryScalingProcess() {service.suspendProcesses(REGION, "test-asg", List.of());- var group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();+ AutoScalingGroup group = service.describeAutoScalingGroups(REGION, List.of("test-asg")).getFirst();assertTrue(group.getSuspendedProcesses().contains("Launch"));assertTrue(group.getSuspendedProcesses().contains("Terminate"));assertTrue(group.getSuspendedProcesses().contains("HealthCheck"));@@ -905,7 +908,7 @@ class AutoScalingServiceTest {service.putScheduledUpdateGroupAction(REGION, "test-asg", "morning",null, null, "0 7 * * 1-5", "Europe/Rome", 0, 1, 1);- var actions = service.describeScheduledActions(REGION, "test-asg", List.of());+ List<ScheduledAction> actions = service.describeScheduledActions(REGION, "test-asg", List.of());assertEquals(1, actions.size());assertEquals("morning", actions.getFirst().getScheduledActionName());assertEquals("0 7 * * 1-5", actions.getFirst().getRecurrence());@@ -923,7 +926,7 @@ class AutoScalingServiceTest {void putWarmPoolReplacesConfigurationAndMapsTheClearSentinel() {service.putWarmPool(REGION, "test-asg", 2, 1, "Running", true);- var pool = service.describeWarmPool(REGION, "test-asg");+ WarmPoolConfiguration pool = service.describeWarmPool(REGION, "test-asg");assertEquals(2, pool.getMaxGroupPreparedCapacity());assertEquals(1, pool.getMinSize());assertEquals("Running", pool.getPoolState());diff --git a/src/test/java/io/github/hectorvent/floci/services/bedrock/BedrockIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/bedrock/BedrockIntegrationTest.javaindex 72ad2c58b0..2acba68d8e 100644--- a/src/test/java/io/github/hectorvent/floci/services/bedrock/BedrockIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/bedrock/BedrockIntegrationTest.java@@ -2,6 +2,8 @@ package io.github.hectorvent.floci.services.bedrock;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.ExtractableResponse;+import io.restassured.response.Response;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;@@ -31,7 +33,7 @@ class BedrockIntegrationTest {@Test@Order(1)void createGuardrail() {- var response = given()+ ExtractableResponse<Response> response = given().contentType("application/json").body("""{diff --git a/src/test/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCorePaginationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCorePaginationIntegrationTest.javaindex 4e9eb7182e..6b19d55088 100644--- a/src/test/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCorePaginationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCorePaginationIntegrationTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.bedrockagentcorecontrol;import io.quarkus.test.junit.QuarkusTest;import io.restassured.response.ExtractableResponse;import io.restassured.response.Response;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.Test;import java.util.ArrayList;@@ -42,7 +43,7 @@ class BedrockAgentCorePaginationIntegrationTest {String token = null;int pages = 0;do {- var req = given().contentType("application/json").queryParam("maxResults", 2);+ RequestSpecification req = given().contentType("application/json").queryParam("maxResults", 2);if (token != null) {req = req.queryParam("nextToken", token);}diff --git a/src/test/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreTaggingIdentityIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreTaggingIdentityIntegrationTest.javaindex a5cfc8bccb..f1914a2efa 100644--- a/src/test/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreTaggingIdentityIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreTaggingIdentityIntegrationTest.java@@ -1,6 +1,8 @@package io.github.hectorvent.floci.services.bedrockagentcorecontrol;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.ExtractableResponse;+import io.restassured.response.Response;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;@@ -30,7 +32,7 @@ class BedrockAgentCoreTaggingIdentityIntegrationTest {@Test@Order(1)void createRuntimeCapturesArns() {- var resp = given().contentType("application/json").body(CREATE_RUNTIME)+ ExtractableResponse<Response> resp = given().contentType("application/json").body(CREATE_RUNTIME).when().put("/runtimes/").then().statusCode(202).body("workloadIdentityDetails.workloadIdentityArn", notNullValue())diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/ApiGatewayCfnMockCorsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/ApiGatewayCfnMockCorsIntegrationTest.javaindex d1a598ec67..d2c9640c58 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/ApiGatewayCfnMockCorsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/ApiGatewayCfnMockCorsIntegrationTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.cloudformation;import io.github.hectorvent.floci.core.common.XmlParser;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.Response;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;@@ -77,7 +78,7 @@ class ApiGatewayCfnMockCorsIntegrationTest {for (String path : new String[]{"/execute-api/" + apiId + "/dev/items","/restapis/" + apiId + "/dev/_user_request_/items"}) {- var response = given().header("Origin", "https://example.com")+ Response response = given().header("Origin", "https://example.com").header("Access-Control-Request-Method", "GET").when().options(path).then().statusCode(200).header("Access-Control-Allow-Origin", equalTo("*"))diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CfnProvisionerFixtureTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CfnProvisionerFixtureTest.javaindex 3b9698a056..d34adf9952 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CfnProvisionerFixtureTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CfnProvisionerFixtureTest.java@@ -17,6 +17,7 @@ import java.nio.file.Path;import java.util.Set;import java.util.TreeSet;import java.util.stream.Collectors;+import java.util.stream.Stream;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;@@ -106,7 +107,7 @@ class CfnProvisionerFixtureTest {Path provisioners = Path.of("src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners");Set<String> onDisk;- try (var files = Files.list(provisioners)) {+ try (Stream<Path> files = Files.list(provisioners)) {onDisk = files.map(f -> f.getFileName().toString()).filter(n -> n.endsWith("CfnProvisioner.java")).map(n -> n.replace(".java", ""))diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CfnSchemaCoverageTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CfnSchemaCoverageTest.javaindex d66224eae0..101646132c 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CfnSchemaCoverageTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CfnSchemaCoverageTest.java@@ -22,6 +22,7 @@ import java.util.TreeMap;import java.util.regex.Matcher;import java.util.regex.Pattern;import java.util.stream.Collectors;+import java.util.stream.Stream;/*** Pins which {@code Fn::GetAtt} attributes declared by the CloudFormation registry schemas Floci@@ -183,7 +184,7 @@ class CfnSchemaCoverageTest {private static Map<String, ProvisionerScan> scanProvisioners() {Map<String, ProvisionerScan> scans = new TreeMap<>();- try (var files = Files.list(PROVISIONERS)) {+ try (Stream<Path> files = Files.list(PROVISIONERS)) {for (Path file : files.filter(f -> f.getFileName().toString().endsWith("CfnProvisioner.java")).sorted().toList()) {diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationEc2NetworkingIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationEc2NetworkingIntegrationTest.javaindex 8978db44c6..09d9e1d806 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationEc2NetworkingIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationEc2NetworkingIntegrationTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.cloudformation;import io.github.hectorvent.floci.core.common.XmlParser;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;@@ -225,7 +226,7 @@ class CloudFormationEc2NetworkingIntegrationTest {}private static void cloudFormation(String stack, String action, String templateBody) {- var request = given()+ RequestSpecification request = given().contentType("application/x-www-form-urlencoded").header("Authorization", CFN_AUTH).formParam("Action", action)@@ -256,7 +257,7 @@ class CloudFormationEc2NetworkingIntegrationTest {}private static String ec2(String action, Map<String, String> params) {- var request = given()+ RequestSpecification request = given().contentType("application/x-www-form-urlencoded").header("Authorization", EC2_AUTH).formParam("Action", action)diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationIamUserIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationIamUserIntegrationTest.javaindex 5e0644c56f..fcbb68eac2 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationIamUserIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationIamUserIntegrationTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.cloudformation;import io.github.hectorvent.floci.core.common.XmlParser;import io.quarkus.test.junit.QuarkusTest;import io.restassured.response.Response;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;@@ -469,7 +470,7 @@ class CloudFormationIamUserIntegrationTest {}private static Response cfnQuery(String action, String stackName, String template) {- var req = given()+ RequestSpecification req = given().contentType("application/x-www-form-urlencoded").header("Authorization", CFN_AUTH).formParam("Action", action)diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationManagedPolicyUpdateIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationManagedPolicyUpdateIntegrationTest.javaindex 805fd6b559..3c11e26eab 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationManagedPolicyUpdateIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationManagedPolicyUpdateIntegrationTest.java@@ -3,8 +3,10 @@ package io.github.hectorvent.floci.services.cloudformation;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.cloudformation.model.Stack;import io.github.hectorvent.floci.services.iam.IamService;+import io.github.hectorvent.floci.services.iam.model.IamRole;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.mockito.InjectSpy;+import io.restassured.specification.RequestSpecification;import jakarta.inject.Inject;import org.junit.jupiter.api.Test;@@ -41,7 +43,7 @@ class CloudFormationManagedPolicyUpdateIntegrationTest {IamService iamService;private String iam(String action, String... kv) {- var req = given()+ RequestSpecification req = given().contentType("application/x-www-form-urlencoded").header("Authorization", IAM_AUTH).formParam("Action", action);@@ -77,7 +79,7 @@ class CloudFormationManagedPolicyUpdateIntegrationTest {io.github.hectorvent.floci.services.iam.model.IamRole> roles =(io.github.hectorvent.floci.core.storage.StorageBackend<String,io.github.hectorvent.floci.services.iam.model.IamRole>) rolesField.get(target);- var role = roles.get(roleName).orElseThrow();+ IamRole role = roles.get(roleName).orElseThrow();// isServiceLinkedRole() alone triggers the guard; the path must also look like a real// service-linked path since the guard's error message parses the principal back out of it.role.setPath("/aws-service-role/example.amazonaws.com/");diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationPersistenceIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationPersistenceIntegrationTest.javaindex 411f2a6a80..e634b76277 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationPersistenceIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationPersistenceIntegrationTest.java@@ -72,7 +72,7 @@ class CloudFormationPersistenceIntegrationTest {.body(containsString("<StackStatus>CREATE_COMPLETE</StackStatus>"));// Read the on-disk file the way a fresh Floci process would on the next boot.- var store = new PersistentStorage<String, Stack>(+ PersistentStorage<String, Stack> store = new PersistentStorage<>(STACKS_FILE, new TypeReference<Map<String, Stack>>() {});store.load();diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationStackPersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationStackPersistenceTest.javaindex ff42f5c82f..46f1db085b 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationStackPersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationStackPersistenceTest.java@@ -64,12 +64,12 @@ class CloudFormationStackPersistenceTest {changeSet.setStatus("CREATE_COMPLETE");stack.getChangeSets().put("initial-create", changeSet);- var writer = new PersistentStorage<String, Stack>(+ PersistentStorage<String, Stack> writer = new PersistentStorage<>(filePath, new TypeReference<Map<String, Stack>>() {});writer.put(KEY, stack);// Fresh instance + load() simulates a Floci restart reading the same file- var reader = new PersistentStorage<String, Stack>(+ PersistentStorage<String, Stack> reader = new PersistentStorage<>(filePath, new TypeReference<Map<String, Stack>>() {});reader.load();@@ -117,7 +117,7 @@ class CloudFormationStackPersistenceTest {""".formatted(KEY);Files.writeString(filePath, legacyJson);- var store = new PersistentStorage<String, Stack>(+ PersistentStorage<String, Stack> store = new PersistentStorage<>(filePath, new TypeReference<Map<String, Stack>>() {});store.load();diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/EventBusProvisionOwnershipTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/EventBusProvisionOwnershipTest.javaindex 4bafd252a8..f5017e38b3 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/EventBusProvisionOwnershipTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/EventBusProvisionOwnershipTest.java@@ -195,7 +195,7 @@ class EventBusProvisionOwnershipTest {}private JsonNode props(boolean withPolicy) {- var node = MAPPER.createObjectNode();+ ObjectNode node = MAPPER.createObjectNode();node.put("Name", BUS);if (withPolicy) {node.set("Policy", MAPPER.createObjectNode().put("Version", "2012-10-17"));diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/InlineZipPackagerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/InlineZipPackagerTest.javaindex 9cd9560744..877a064595 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/InlineZipPackagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/InlineZipPackagerTest.java@@ -30,11 +30,11 @@ class InlineZipPackagerTest {private static String readZipEntry(String zipBase64, String entryName) throws Exception {byte[] zipBytes = Base64.getDecoder().decode(zipBase64);- try (var zis = new ZipInputStream(new ByteArrayInputStream(zipBytes))) {+ try (ZipInputStream zis = new ZipInputStream(new ByteArrayInputStream(zipBytes))) {ZipEntry entry;while ((entry = zis.getNextEntry()) != null) {if (entry.getName().equals(entryName)) {- var out = new ByteArrayOutputStream();+ ByteArrayOutputStream out = new ByteArrayOutputStream();zis.transferTo(out);return out.toString(java.nio.charset.StandardCharsets.UTF_8);}diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/OrganizationsCfnIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/OrganizationsCfnIntegrationTest.javaindex 683bbc9bdd..102fee3fb3 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/OrganizationsCfnIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/OrganizationsCfnIntegrationTest.java@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;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.MethodOrderer;import org.junit.jupiter.api.Order;@@ -144,7 +145,7 @@ class OrganizationsCfnIntegrationTest {}private static Response cloudFormation(String action, String... formParams) {- var request = given()+ RequestSpecification request = given().header("Authorization", "AWS4-HMAC-SHA256 Credential=" + MANAGEMENT_ACCOUNT+ "/20260823/us-east-1/cloudformation/aws4_request, SignedHeaders=host, Signature=abc").contentType("application/x-www-form-urlencoded")diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/OrganizationsCfnRollbackIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/OrganizationsCfnRollbackIntegrationTest.javaindex 16a2340dcc..7f9dc896b8 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/OrganizationsCfnRollbackIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/OrganizationsCfnRollbackIntegrationTest.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;import org.junit.jupiter.api.TestInstance;@@ -67,7 +68,7 @@ class OrganizationsCfnRollbackIntegrationTest {}private static Response cloudFormation(String action, String... formParams) {- var request = given()+ RequestSpecification request = given().header("Authorization", "AWS4-HMAC-SHA256 Credential=" + MANAGEMENT_ACCOUNT+ "/20260823/us-east-1/cloudformation/aws4_request, SignedHeaders=host, Signature=abc").contentType("application/x-www-form-urlencoded")diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/SamTransformIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/SamTransformIntegrationTest.javaindex e45e4ddf3b..43b95af360 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/SamTransformIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/SamTransformIntegrationTest.java@@ -6,8 +6,10 @@ import org.junit.jupiter.api.AfterEach;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;+import java.io.ByteArrayOutputStream;import java.util.ArrayList;import java.util.List;+import java.util.zip.ZipOutputStream;import static io.restassured.RestAssured.given;import static org.hamcrest.MatcherAssert.assertThat;@@ -1665,8 +1667,8 @@ class SamTransformIntegrationTest {private static byte[] buildHandlerZip() {try {- var baos = new java.io.ByteArrayOutputStream();- try (var zos = new java.util.zip.ZipOutputStream(baos)) {+ ByteArrayOutputStream baos = new ByteArrayOutputStream();+ try (ZipOutputStream zos = new ZipOutputStream(baos)) {zos.putNextEntry(new java.util.zip.ZipEntry("index.js"));zos.write("exports.handler=async(e)=>({statusCode:200})".getBytes(java.nio.charset.StandardCharsets.UTF_8));zos.closeEntry();diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnStableNameUpdatePathTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnStableNameUpdatePathTest.javaindex 35a592ab8e..1ee4520ff6 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnStableNameUpdatePathTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnStableNameUpdatePathTest.java@@ -2,6 +2,8 @@ package io.github.hectorvent.floci.services.cloudformation.provisioners;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.AwsException;import io.github.hectorvent.floci.services.cloudformation.CloudFormationTemplateEngine;import io.github.hectorvent.floci.services.ecr.EcrService;@@ -83,10 +85,10 @@ class CfnStableNameUpdatePathTest {.thenReturn("arn:aws:firehose:us-east-1:000000000000:deliverystream/created");FirehoseCfnProvisioner provisioner = new FirehoseCfnProvisioner(firehose);- var props = mapper.createObjectNode();+ ObjectNode props = mapper.createObjectNode();props.set("S3DestinationConfiguration",mapper.createObjectNode().put("BucketARN", "arn:aws:s3:::bucket"));- var createTags = props.putArray("Tags");+ ArrayNode createTags = props.putArray("Tags");createTags.addObject().put("Key", "env").put("Value", "dev");createTags.addObject().put("Key", "team").put("Value", "a");@@ -101,7 +103,7 @@ class CfnStableNameUpdatePathTest {existing.getTags().add(new DeliveryStreamDescription.Tag("team", "a"));when(firehose.describeDeliveryStream(generatedName)).thenReturn(existing);- var updateProps = mapper.createObjectNode();+ ObjectNode updateProps = mapper.createObjectNode();updateProps.set("S3DestinationConfiguration",mapper.createObjectNode().put("BucketARN", "arn:aws:s3:::bucket"));updateProps.putArray("Tags").addObject().put("Key", "env").put("Value", "prod");@@ -137,7 +139,7 @@ class CfnStableNameUpdatePathTest {anyString())).thenReturn(updatedPipe);PipesCfnProvisioner provisioner = new PipesCfnProvisioner(pipes, mapper);- var props = mapper.createObjectNode()+ ObjectNode props = mapper.createObjectNode().put("Source", "arn:aws:sqs:us-east-1:000000000000:src").put("Target", "arn:aws:sqs:us-east-1:000000000000:dst").put("RoleArn", "arn:aws:iam::000000000000:role/r");@@ -325,7 +327,7 @@ class CfnStableNameUpdatePathTest {.thenReturn(existingRepo);EcrCfnProvisioner provisioner = new EcrCfnProvisioner(ecr);- var createProps = mapper.createObjectNode().put("ImageTagMutability", "MUTABLE");+ ObjectNode createProps = mapper.createObjectNode().put("ImageTagMutability", "MUTABLE");createProps.set("LifecyclePolicy", mapper.createObjectNode().put("LifecyclePolicyText", "{}"));createProps.put("RepositoryPolicyText", "{}");StackResource created = resource("AWS::ECR::Repository", "Repo");@@ -335,7 +337,7 @@ class CfnStableNameUpdatePathTest {.thenReturn(Map.of("env", "dev", "team", "a"));// The update changes mutability and one tag, drops the other tag and both policies.- var updateProps = mapper.createObjectNode().put("ImageTagMutability", "IMMUTABLE");+ ObjectNode updateProps = mapper.createObjectNode().put("ImageTagMutability", "IMMUTABLE");updateProps.putArray("Tags").addObject().put("Key", "env").put("Value", "prod");StackResource updated = resource("AWS::ECR::Repository", "Repo");provisioner.provision(updated, updateProps, ctx(generatedName));diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CodeBuildCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CodeBuildCfnProvisionerTest.javaindex 87d65fa26a..9f7eff5113 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CodeBuildCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CodeBuildCfnProvisionerTest.java@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.services.cloudformation.CloudFormationTemplateEngine;import io.github.hectorvent.floci.services.cloudformation.model.StackResource;import io.github.hectorvent.floci.services.codebuild.CodeBuildJsonHandler;import jakarta.ws.rs.core.Response;@@ -28,7 +29,7 @@ class CodeBuildCfnProvisionerTest {new CodeBuildCfnProvisioner(handler, mock(RegionResolver.class), mapper);private ProvisionContext ctx() {- var engine = mock(io.github.hectorvent.floci.services.cloudformation.CloudFormationTemplateEngine.class);+ CloudFormationTemplateEngine engine = mock(CloudFormationTemplateEngine.class);when(engine.resolveNode(any())).thenAnswer(inv -> inv.getArgument(0));return new ProvisionContext(engine, "us-east-1", "000000000000", "cfn-stack");}diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CodePipelineCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CodePipelineCfnProvisionerTest.javaindex c4271acdf3..764d579827 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CodePipelineCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CodePipelineCfnProvisionerTest.java@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.services.cloudformation.CloudFormationTemplateEngine;import io.github.hectorvent.floci.services.cloudformation.model.StackResource;import io.github.hectorvent.floci.services.codepipeline.CodePipelineService;import org.junit.jupiter.api.Test;@@ -30,7 +31,7 @@ class CodePipelineCfnProvisionerTest {new CodePipelineCfnProvisioner(service, mock(RegionResolver.class), mapper);private ProvisionContext ctx() {- var engine = mock(io.github.hectorvent.floci.services.cloudformation.CloudFormationTemplateEngine.class);+ CloudFormationTemplateEngine engine = mock(CloudFormationTemplateEngine.class);when(engine.resolveNode(any())).thenAnswer(inv -> inv.getArgument(0));return new ProvisionContext(engine, "us-east-1", "000000000000", "cfn-stack");}@@ -219,7 +220,7 @@ class CodePipelineCfnProvisionerTest {// raw props must never be consulted directly for this boolean.props.putObject("RegisterWithThirdParty").put("Fn::If", "SomeCondition");StackResource r = resource("AWS::CodePipeline::Webhook");- var engine = mock(io.github.hectorvent.floci.services.cloudformation.CloudFormationTemplateEngine.class);+ CloudFormationTemplateEngine engine = mock(CloudFormationTemplateEngine.class);when(engine.resolveNode(any())).thenAnswer(inv -> {ObjectNode resolved = ((ObjectNode) inv.getArgument(0)).deepCopy();resolved.put("RegisterWithThirdParty", true);diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkCfnProvisionerTest.javaindex f2c60997c1..ffa425cd2c 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkCfnProvisionerTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.cloudformation.provisioners;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.cloudformation.CloudFormationTemplateEngine;import io.github.hectorvent.floci.services.cloudformation.model.StackResource;@@ -478,7 +479,7 @@ class Ec2NetworkCfnProvisionerTest {}private static ObjectNode withTags(ObjectNode props, String... keyValues) {- var tags = props.putArray("Tags");+ ArrayNode tags = props.putArray("Tags");for (int i = 0; i + 1 < keyValues.length; i += 2) {tags.addObject().put("Key", keyValues[i]).put("Value", keyValues[i + 1]);}@@ -714,7 +715,7 @@ class Ec2NetworkCfnProvisionerTest {when(ec2.allocateAddress(REGION)).thenReturn(addr);doThrow(new AwsException("TagLimitExceeded", "too many tags", 400)).when(ec2).createTags(any(), any(), any());- for (var attempt : List.of(+ for (Map.Entry<String, ObjectNode> attempt : List.of(Map.entry("AWS::EC2::Subnet", withTags(mapper.createObjectNode().put("VpcId", VPC_ID).put("CidrBlock", "10.0.1.0/24"), "k", "v")),Map.entry("AWS::EC2::RouteTable", withTags(mapper.createObjectNode().put("VpcId", VPC_ID), "k", "v")),Map.entry("AWS::EC2::InternetGateway", withTags(mapper.createObjectNode(), "k", "v")),diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupRuleCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupRuleCfnProvisionerTest.javaindex dfa0e5be74..2dfbeba725 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupRuleCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupRuleCfnProvisionerTest.java@@ -13,6 +13,7 @@ import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;import io.github.hectorvent.floci.services.ec2.model.SecurityGroupRule;import org.junit.jupiter.api.Test;import org.mockito.ArgumentCaptor;+import org.mockito.InOrder;import java.util.HashMap;import java.util.List;@@ -238,7 +239,7 @@ class Ec2SecurityGroupRuleCfnProvisionerTest {provisioner.provision(r, props, ctx());- var order = inOrder(ec2);+ InOrder order = inOrder(ec2);order.verify(ec2).authorizeSecurityGroupIngress(eq("us-east-1"), eq("sg-123"), anyList());order.verify(ec2).deleteSecurityGroupRule("us-east-1", "sgr-old");assertEquals("sgr-new", r.getPhysicalId());diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2VpcGatewayAttachmentCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2VpcGatewayAttachmentCfnProvisionerTest.javaindex b95a344e31..c3d666e26d 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2VpcGatewayAttachmentCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2VpcGatewayAttachmentCfnProvisionerTest.java@@ -8,6 +8,7 @@ import io.github.hectorvent.floci.services.cloudformation.CloudFormationTemplateimport io.github.hectorvent.floci.services.cloudformation.model.StackResource;import io.github.hectorvent.floci.services.ec2.Ec2Service;import org.junit.jupiter.api.Test;+import org.mockito.InOrder;import java.util.HashMap;@@ -98,7 +99,7 @@ class Ec2VpcGatewayAttachmentCfnProvisionerTest {provisioner.provision(r, props("vpc-new", "igw-new", null), ctx());// Order matters: a failed attach must leave the previous attachment alone.- var order = inOrder(ec2);+ InOrder order = inOrder(ec2);order.verify(ec2).attachInternetGateway(REGION, "igw-new", "vpc-new");order.verify(ec2).detachInternetGateway(REGION, "igw-old", "vpc-old");assertEquals("igw|vpc-new|igw-new", r.getPhysicalId());diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EcsCapacityCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EcsCapacityCfnProvisionerTest.javaindex 08f786117f..765660bca3 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EcsCapacityCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EcsCapacityCfnProvisionerTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.cloudformation.provisioners;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.AwsException;import io.github.hectorvent.floci.services.cloudformation.CloudFormationTemplateEngine;@@ -191,7 +192,7 @@ class EcsCapacityCfnProvisionerTest {ObjectNode props = mapper.createObjectNode();props.put("Name", "the-provider");props.putObject("AutoScalingGroupProvider").put("AutoScalingGroupArn", ASG_ARN);- var tags = props.putArray("Tags");+ ArrayNode tags = props.putArray("Tags");tags.addObject().put("Key", "keep").put("Value", "1");provisioner.provision(r, props, ctx());@@ -243,7 +244,7 @@ class EcsCapacityCfnProvisionerTest {StackResource r = resource(PROVIDER_TYPE, "Provider");ObjectNode props = mapper.createObjectNode();props.put("Name", "the-provider");- var tags = props.putArray("Tags");+ ArrayNode tags = props.putArray("Tags");tags.addObject().put("Key", "env").put("Value", "prod");tags.addObject().put("Key", "team").put("Value", "platform");@@ -260,10 +261,10 @@ class EcsCapacityCfnProvisionerTest {StackResource r = resource(ASSOCIATIONS_TYPE, "Assoc");ObjectNode props = mapper.createObjectNode();props.put("Cluster", "the-cluster");- var providers = props.putArray("CapacityProviders");+ ArrayNode providers = props.putArray("CapacityProviders");providers.add("the-provider");providers.add("FARGATE");- var strategy = props.putArray("DefaultCapacityProviderStrategy");+ ArrayNode strategy = props.putArray("DefaultCapacityProviderStrategy");strategy.addObject().put("CapacityProvider", "the-provider").put("Weight", 2).put("Base", 1);provisioner.provision(r, props, ctx());diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/ElbV2CfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/ElbV2CfnProvisionerTest.javaindex b3d8578190..4fe3e5e177 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/ElbV2CfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/ElbV2CfnProvisionerTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.cloudformation.provisioners;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.AwsException;import io.github.hectorvent.floci.services.cloudformation.CloudFormationTemplateEngine;@@ -286,7 +287,7 @@ class ElbV2CfnProvisionerTest {when(elb.createRule(eq(REGION), eq(LISTENER_ARN), anyList(), eq(10), anyList(), eq(Map.of()))).thenReturn(rule(LISTENER_ARN));ObjectNode props = mapper.createObjectNode().put("ListenerArn", LISTENER_ARN).put("Priority", "10");- var conditions = props.putArray("Conditions");+ ArrayNode conditions = props.putArray("Conditions");conditions.addObject().put("Field", "path-pattern").putObject("PathPatternConfig").putArray("Values").add("/api/*");ObjectNode header = conditions.addObject().put("Field", "http-header");header.putObject("HttpHeaderConfig").put("HttpHeaderName", "X-Env").putArray("Values").add("prod");diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EventsCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EventsCfnProvisionerTest.javaindex 4db763dd23..c0401c9d79 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EventsCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/EventsCfnProvisionerTest.java@@ -12,6 +12,7 @@ import io.github.hectorvent.floci.services.eventbridge.model.Rule;import io.github.hectorvent.floci.services.eventbridge.model.Target;import org.junit.jupiter.api.Test;import org.mockito.ArgumentCaptor;+import org.mockito.stubbing.OngoingStubbing;import java.util.HashMap;import java.util.List;@@ -343,7 +344,7 @@ class EventsCfnProvisionerTest {/** Successive answers from ListTargetsByRule, in the order the run asks for them. */@SafeVarargsprivate void stubTargetSequence(List<Target> first, List<Target>... rest) {- var stub = when(events.listTargetsByRule(anyString(), any(), anyString())).thenReturn(first);+ OngoingStubbing<List<Target>> stub = when(events.listTargetsByRule(anyString(), any(), anyString())).thenReturn(first);for (List<Target> answer : rest) {stub = stub.thenReturn(answer);}diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LambdaEventSourceMappingCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LambdaEventSourceMappingCfnProvisionerTest.javaindex 906d57a456..24ba4918bb 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LambdaEventSourceMappingCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LambdaEventSourceMappingCfnProvisionerTest.java@@ -120,7 +120,7 @@ class LambdaEventSourceMappingCfnProvisionerTest {return resolved;}if (node.isArray()) {- var arr = mapper.createArrayNode();+ ArrayNode arr = mapper.createArrayNode();for (JsonNode item : node) {arr.add(resolveMockNode(item, engine));}diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontCustomOriginServingTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontCustomOriginServingTest.javaindex 681125acdf..e7f97c1bb1 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontCustomOriginServingTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontCustomOriginServingTest.java@@ -183,7 +183,7 @@ class CloudFrontCustomOriginServingTest {distribution.setConfig(config);Distribution created = cloudFrontService.createDistribution(distribution, Map.of());- var response = given()+ Response response = given().header("Host", created.getDomainName()).header("Origin", "https://viewer.example").when().get("/resource")@@ -228,7 +228,7 @@ class CloudFrontCustomOriginServingTest {Distribution removeOnlyCreated =cloudFrontService.createDistribution(removeOnlyDistribution, Map.of());- var removeOnlyResponse = given()+ Response removeOnlyResponse = given().header("Host", removeOnlyCreated.getDomainName()).when().get("/resource").then().statusCode(200)diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontDistributionServingTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontDistributionServingTest.javaindex 43b0f94e8f..5dbb0fb40a 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontDistributionServingTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontDistributionServingTest.java@@ -14,6 +14,7 @@ import io.github.hectorvent.floci.services.s3.S3Service;import io.github.hectorvent.floci.services.s3.model.PutObjectOptions;import io.github.hectorvent.floci.services.s3.model.S3Object;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.Response;import jakarta.inject.Inject;import org.junit.jupiter.api.Test;@@ -431,7 +432,7 @@ class CloudFrontDistributionServingTest {defaultSigner.keyGroupId(),privateSigner.keyGroupId()));- var created = given()+ Response created = given().contentType("application/xml").body(body).when()@@ -450,7 +451,7 @@ class CloudFrontDistributionServingTest {.extract().response();String configPath = created.header("Location") + "/config";- var config = given()+ Response config = given().when().get(configPath).then()@@ -518,7 +519,7 @@ class CloudFrontDistributionServingTest {defaultSigner.keyGroupId(),privateSigner.keyGroupId()));- var created = given()+ Response created = given().contentType("application/xml").body(body).when()@@ -532,7 +533,7 @@ class CloudFrontDistributionServingTest {.extract().response();String configPath = created.header("Location") + "/config";- var config = given()+ Response config = given().when().get(configPath).then()diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontServiceTest.javaindex 4475664d12..37ba1b2e43 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontServiceTest.java@@ -134,8 +134,8 @@ class CloudFrontServiceTest {EmulatorConfig config = Mockito.mock(EmulatorConfig.class);EmulatorConfig.DnsConfig dnsConfig = Mockito.mock(EmulatorConfig.DnsConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var cloudFrontConfig = Mockito.mock(EmulatorConfig.CloudFrontServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.CloudFrontServiceConfig cloudFrontConfig = Mockito.mock(EmulatorConfig.CloudFrontServiceConfig.class);when(config.defaultAccountId()).thenReturn(ACCOUNT);when(config.hostname()).thenReturn(Optional.empty());diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontSignatureVerifierTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontSignatureVerifierTest.javaindex 286a120b77..9b0d926ec1 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontSignatureVerifierTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontSignatureVerifierTest.java@@ -80,7 +80,7 @@ class CloudFrontSignatureVerifierTest {"Signature", signCfBase64(policy, "SHA1withRSA"),"Key-Pair-Id", KEY_ID);- var result = CloudFrontSignatureVerifier.verify(RESOURCE, query, Map.of(), null, trusted(), now);+ CloudFrontSignatureVerifier.Result result = CloudFrontSignatureVerifier.verify(RESOURCE, query, Map.of(), null, trusted(), now);assertTrue(result.allowed(), result.reason());}@@ -94,7 +94,7 @@ class CloudFrontSignatureVerifierTest {"Signature", signCfBase64(policy, "SHA1withRSA"),"Key-Pair-Id", KEY_ID);- var result = CloudFrontSignatureVerifier.verify(+ CloudFrontSignatureVerifier.Result result = CloudFrontSignatureVerifier.verify(resource, query, Map.of(), null, trusted(), now);assertTrue(result.allowed(), result.reason());}@@ -109,7 +109,7 @@ class CloudFrontSignatureVerifierTest {"Signature", signCfBase64(policyJson, "SHA1withRSA"),"Key-Pair-Id", KEY_ID);- var result = CloudFrontSignatureVerifier.verify(+ CloudFrontSignatureVerifier.Result result = CloudFrontSignatureVerifier.verify(resource, query, Map.of(), null, trusted(), now);assertTrue(result.allowed(), result.reason());}@@ -169,7 +169,7 @@ class CloudFrontSignatureVerifierTest {signCfBase64(policy, "SHA1withRSA"),"CloudFront-Key-Pair-Id", KEY_ID);- var result = CloudFrontSignatureVerifier.verify(+ CloudFrontSignatureVerifier.Result result = CloudFrontSignatureVerifier.verify(RESOURCE,Map.of("Expires", Long.toString(soon())),cookies,@@ -237,7 +237,7 @@ class CloudFrontSignatureVerifierTest {"Signature", signCfBase64(policy, "SHA1withRSA"),"Key-Pair-Id", KEY_ID);- var result = CloudFrontSignatureVerifier.verify(RESOURCE, query, Map.of(), null, trusted(), now);+ CloudFrontSignatureVerifier.Result result = CloudFrontSignatureVerifier.verify(RESOURCE, query, Map.of(), null, trusted(), now);assertFalse(result.allowed());assertTrue(result.reason().contains("expired"), result.reason());}@@ -251,7 +251,7 @@ class CloudFrontSignatureVerifierTest {"Signature", signCfBase64(policy, "SHA1withRSA"),"Key-Pair-Id", KEY_ID);- var result = CloudFrontSignatureVerifier.verify(+ CloudFrontSignatureVerifier.Result result = CloudFrontSignatureVerifier.verify("https://d123.cloudfront.net/private/OTHER.jpg", query, Map.of(), null, trusted(), now);assertFalse(result.allowed());}@@ -264,14 +264,14 @@ class CloudFrontSignatureVerifierTest {"Signature", signCfBase64(policy, "SHA1withRSA"),"Key-Pair-Id", "SOME-OTHER-KEY");- var result = CloudFrontSignatureVerifier.verify(RESOURCE, query, Map.of(), null, trusted(), now);+ CloudFrontSignatureVerifier.Result result = CloudFrontSignatureVerifier.verify(RESOURCE, query, Map.of(), null, trusted(), now);assertFalse(result.allowed());assertTrue(result.reason().contains("trusted signer"), result.reason());}@Testvoid missingSignatureIsRejected() {- var result = CloudFrontSignatureVerifier.verify(RESOURCE, Map.of(), Map.of(), null, trusted(), now);+ CloudFrontSignatureVerifier.Result result = CloudFrontSignatureVerifier.verify(RESOURCE, Map.of(), Map.of(), null, trusted(), now);assertFalse(result.allowed());assertEquals("Missing CloudFront signature", result.reason());}@@ -285,7 +285,7 @@ class CloudFrontSignatureVerifierTest {"Signature", "AAAA","Key-Pair-Id", KEY_ID);- var result = CloudFrontSignatureVerifier.verify(RESOURCE, query, Map.of(), null, trusted(), now);+ CloudFrontSignatureVerifier.Result result = CloudFrontSignatureVerifier.verify(RESOURCE, query, Map.of(), null, trusted(), now);assertFalse(result.allowed());assertTrue(result.reason().contains("base64"), result.reason());}diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudfront/ResponseHeadersPolicyConfigCodecTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudfront/ResponseHeadersPolicyConfigCodecTest.javaindex 9a3036d7ae..4e8ef49aa9 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudfront/ResponseHeadersPolicyConfigCodecTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudfront/ResponseHeadersPolicyConfigCodecTest.java@@ -84,7 +84,7 @@ class ResponseHeadersPolicyConfigCodecTest {@Testvoid removeHeadersConfigIsCaptured() {- var directives = ResponseHeadersPolicyConfigCodec.directives(+ ResponseHeadersPolicyConfigCodec.Directives directives = ResponseHeadersPolicyConfigCodec.directives(ResponseHeadersPolicyConfigCodec.parse(XML));assertEquals(List.of("Server"), directives.remove());}@@ -163,7 +163,7 @@ class ResponseHeadersPolicyConfigCodecTest {cors.put("OriginOverride", "false");Map<String, Object> config = Map.of("CorsConfig", cors);- var simple = ResponseHeadersPolicyConfigCodec.directives(+ ResponseHeadersPolicyConfigCodec.Directives simple = ResponseHeadersPolicyConfigCodec.directives(config, "https://viewer.example", false, true, null);Map<String, String> simpleHeaders = simple.add().stream().collect(java.util.stream.Collectors.toMap(@@ -171,7 +171,7 @@ class ResponseHeadersPolicyConfigCodecTest {ResponseHeadersPolicyConfigCodec.PolicyHeader::value));assertEquals(Map.of("Access-Control-Allow-Origin", "*"), simpleHeaders);- var preflight = ResponseHeadersPolicyConfigCodec.directives(+ ResponseHeadersPolicyConfigCodec.Directives preflight = ResponseHeadersPolicyConfigCodec.directives(config, "https://viewer.example", true, true, null);Map<String, String> preflightHeaders = preflight.add().stream().collect(java.util.stream.Collectors.toMap(diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudtrail/CloudTrailAdvancedSelectorsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudtrail/CloudTrailAdvancedSelectorsIntegrationTest.javaindex 5f4275f9f3..a681516a60 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudtrail/CloudTrailAdvancedSelectorsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudtrail/CloudTrailAdvancedSelectorsIntegrationTest.java@@ -6,7 +6,9 @@ import jakarta.inject.Inject;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;+import java.io.ByteArrayInputStream;import java.util.UUID;+import java.util.zip.GZIPInputStream;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.containsString;@@ -184,7 +186,7 @@ class CloudTrailAdvancedSelectorsIntegrationTest {}private static String gunzip(byte[] gz) throws Exception {- try (var gzin = new java.util.zip.GZIPInputStream(new java.io.ByteArrayInputStream(gz))) {+ try (GZIPInputStream gzin = new GZIPInputStream(new ByteArrayInputStream(gz))) {return new String(gzin.readAllBytes());}}diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandlerTest.javaindex e2cb5166e2..fb9bd0a6ec 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandlerTest.java@@ -368,7 +368,7 @@ class CloudWatchLogsHandlerTest {Response response = handler.handle("PutLogEvents", request, REGION);assertEquals(200, response.getStatus());- var stored = service.getLogEvents(GROUP, STREAM, null, null, 100, true, null, REGION);+ CloudWatchLogsService.LogEventsResult stored = service.getLogEvents(GROUP, STREAM, null, null, 100, true, null, REGION);assertEquals(1, stored.events().size());assertEquals("hello via ARN", stored.events().getFirst().getMessage());}diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsServiceTest.javaindex ca6401fef5..ee8eb55e17 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsServiceTest.java@@ -428,7 +428,7 @@ class CloudWatchLogsServiceTest {service.putLogEvents("/app/logs", "b-newest", List.of(Map.of("timestamp", 3000L, "message", "new")), REGION);service.putLogEvents("/app/logs", "c-middle", List.of(Map.of("timestamp", 2000L, "message", "mid")), REGION);- var result = service.describeLogStreams("/app/logs", null, "LastEventTime", true, 1, null, REGION);+ CloudWatchLogsService.DescribeLogStreamsResult result = service.describeLogStreams("/app/logs", null, "LastEventTime", true, 1, null, REGION);assertEquals(1, result.logStreams().size());assertEquals("b-newest", result.logStreams().getFirst().getLogStreamName());@@ -442,11 +442,11 @@ class CloudWatchLogsServiceTest {service.createLogStream("/app/logs", "a-active", REGION);service.putLogEvents("/app/logs", "a-active", List.of(Map.of("timestamp", 1000L, "message", "x")), REGION);- var descending = service.describeLogStreams("/app/logs", null, "LastEventTime", true, 0, null, REGION);+ CloudWatchLogsService.DescribeLogStreamsResult descending = service.describeLogStreams("/app/logs", null, "LastEventTime", true, 0, null, REGION);assertEquals(List.of("a-active", "z-empty"),descending.logStreams().stream().map(LogStream::getLogStreamName).toList());- var ascending = service.describeLogStreams("/app/logs", null, "LastEventTime", false, 0, null, REGION);+ CloudWatchLogsService.DescribeLogStreamsResult ascending = service.describeLogStreams("/app/logs", null, "LastEventTime", false, 0, null, REGION);assertEquals(List.of("z-empty", "a-active"),ascending.logStreams().stream().map(LogStream::getLogStreamName).toList());}@@ -458,12 +458,12 @@ class CloudWatchLogsServiceTest {service.createLogStream("/app/logs", "stream-2", REGION);service.createLogStream("/app/logs", "stream-3", REGION);- var page1 = service.describeLogStreams("/app/logs", null, null, false, 2, null, REGION);+ CloudWatchLogsService.DescribeLogStreamsResult page1 = service.describeLogStreams("/app/logs", null, null, false, 2, null, REGION);assertEquals(List.of("stream-1", "stream-2"),page1.logStreams().stream().map(LogStream::getLogStreamName).toList());assertNotNull(page1.nextToken());- var page2 = service.describeLogStreams("/app/logs", null, null, false, 2, page1.nextToken(), REGION);+ CloudWatchLogsService.DescribeLogStreamsResult page2 = service.describeLogStreams("/app/logs", null, null, false, 2, page1.nextToken(), REGION);assertEquals(List.of("stream-3"),page2.logStreams().stream().map(LogStream::getLogStreamName).toList());assertNull(page2.nextToken());@@ -507,13 +507,13 @@ class CloudWatchLogsServiceTest {service.createLogStream("/app/logs", "stream-" + i, REGION);}- var page1 = service.describeLogStreams("/app/logs", null, null, false, 2, null, REGION);+ CloudWatchLogsService.DescribeLogStreamsResult page1 = service.describeLogStreams("/app/logs", null, null, false, 2, null, REGION);assertEquals(List.of("stream-1", "stream-2"),page1.logStreams().stream().map(LogStream::getLogStreamName).toList());service.deleteLogStream("/app/logs", "stream-1", REGION);- var page2 = service.describeLogStreams("/app/logs", null, null, false, 2, page1.nextToken(), REGION);+ CloudWatchLogsService.DescribeLogStreamsResult page2 = service.describeLogStreams("/app/logs", null, null, false, 2, page1.nextToken(), REGION);assertEquals(List.of("stream-3", "stream-4"),page2.logStreams().stream().map(LogStream::getLogStreamName).toList());assertNull(page2.nextToken());@@ -534,13 +534,13 @@ class CloudWatchLogsServiceTest {service.putLogEvents("/app/logs", "c", List.of(Map.of("timestamp", 3000L, "message", "x")), REGION);service.putLogEvents("/app/logs", "d", List.of(Map.of("timestamp", 4000L, "message", "x")), REGION);- var page1 = service.describeLogStreams("/app/logs", null, "LastEventTime", true, 2, null, REGION);+ CloudWatchLogsService.DescribeLogStreamsResult page1 = service.describeLogStreams("/app/logs", null, "LastEventTime", true, 2, null, REGION);assertEquals(List.of("d", "c"),page1.logStreams().stream().map(LogStream::getLogStreamName).toList());service.putLogEvents("/app/logs", "d", List.of(Map.of("timestamp", 5000L, "message", "x")), REGION);- var page2 = service.describeLogStreams("/app/logs", null, "LastEventTime", true, 2, page1.nextToken(), REGION);+ CloudWatchLogsService.DescribeLogStreamsResult page2 = service.describeLogStreams("/app/logs", null, "LastEventTime", true, 2, page1.nextToken(), REGION);assertEquals(List.of("b", "a"),page2.logStreams().stream().map(LogStream::getLogStreamName).toList());assertNull(page2.nextToken());@@ -562,14 +562,14 @@ class CloudWatchLogsServiceTest {service.putLogEvents("/app/logs", "c", List.of(Map.of("timestamp", 3000L, "message", "x")), REGION);service.putLogEvents("/app/logs", "d", List.of(Map.of("timestamp", 4000L, "message", "x")), REGION);- var page1 = service.describeLogStreams("/app/logs", null, "LastEventTime", true, 2, null, REGION);+ CloudWatchLogsService.DescribeLogStreamsResult page1 = service.describeLogStreams("/app/logs", null, "LastEventTime", true, 2, null, REGION);assertEquals(List.of("d", "c"),page1.logStreams().stream().map(LogStream::getLogStreamName).toList());// b was not returned yet; this would now sort it ahead of c, the last returned stream.service.putLogEvents("/app/logs", "b", List.of(Map.of("timestamp", 9000L, "message", "x")), REGION);- var page2 = service.describeLogStreams("/app/logs", null, "LastEventTime", true, 2, page1.nextToken(), REGION);+ CloudWatchLogsService.DescribeLogStreamsResult page2 = service.describeLogStreams("/app/logs", null, "LastEventTime", true, 2, page1.nextToken(), REGION);assertEquals(List.of("b", "a"),page2.logStreams().stream().map(LogStream::getLogStreamName).toList());assertNull(page2.nextToken());diff --git a/src/test/java/io/github/hectorvent/floci/services/connect/ConnectIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/connect/ConnectIntegrationTest.javaindex 5cdffd5f04..471dd6025e 100644--- a/src/test/java/io/github/hectorvent/floci/services/connect/ConnectIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/connect/ConnectIntegrationTest.java@@ -1,6 +1,8 @@package io.github.hectorvent.floci.services.connect;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.ExtractableResponse;+import io.restassured.response.Response;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;@@ -24,7 +26,7 @@ class ConnectIntegrationTest {@Test@Order(1)void createInstance() {- var response = given()+ ExtractableResponse<Response> response = given().contentType("application/json").body("""{diff --git a/src/test/java/io/github/hectorvent/floci/services/controlcatalog/ControlCatalogControllerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/controlcatalog/ControlCatalogControllerIntegrationTest.javaindex 5643848f6b..d2dcfdbe5c 100644--- a/src/test/java/io/github/hectorvent/floci/services/controlcatalog/ControlCatalogControllerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/controlcatalog/ControlCatalogControllerIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.controlcatalog;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.Response;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;@@ -111,7 +112,7 @@ class ControlCatalogControllerIntegrationTest {@Testvoid listControlsSupportsImplementationFilterAndPagination() {String filter = "{\"Filter\":{\"Implementations\":{\"Types\":[\"AWS::Organizations::Policy::RESOURCE_CONTROL_POLICY\"]}}}";- var firstPage = given()+ Response firstPage = given().contentType("application/json").header("Authorization", auth("us-east-1")).body(filter)@@ -125,7 +126,7 @@ class ControlCatalogControllerIntegrationTest {.extract().response();List<String> allArns = new ArrayList<>(firstPage.path("Controls.Arn"));- var secondPage = given()+ Response secondPage = given().contentType("application/json").header("Authorization", auth("us-east-1")).body(filter)@@ -138,7 +139,7 @@ class ControlCatalogControllerIntegrationTest {.extract().response();allArns.addAll(secondPage.path("Controls.Arn"));- var finalPage = given()+ Response finalPage = given().contentType("application/json").header("Authorization", auth("us-east-1")).body(filter)diff --git a/src/test/java/io/github/hectorvent/floci/services/controlcatalog/ControlCatalogServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/controlcatalog/ControlCatalogServiceTest.javaindex 155e3856f7..de7c6e8c13 100644--- a/src/test/java/io/github/hectorvent/floci/services/controlcatalog/ControlCatalogServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/controlcatalog/ControlCatalogServiceTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.controlcatalog;import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.services.controlcatalog.model.ControlDefinition;@@ -19,7 +20,7 @@ class ControlCatalogServiceTest {@Testvoid listControlsFiltersByImplementationIdentifierAndProvider() throws Exception {- var response = service.listControls(objectMapper.readTree("""+ ObjectNode response = service.listControls(objectMapper.readTree("""{"Filter":{"Implementations":{"Identifiers":["CT.S3.PV.5"]},"GovernedProviders":["AWS"]}}"""), null, null, "aws");@@ -45,7 +46,7 @@ class ControlCatalogServiceTest {service.clear();assertTrue(controls.keysForAccount("000000000000").isEmpty());- var response = service.listControls(objectMapper.createObjectNode(), null, null, "aws");+ ObjectNode response = service.listControls(objectMapper.createObjectNode(), null, null, "aws");assertEquals(6, response.path("Controls").size());assertFalse(controls.keysForAccount("000000000000").isEmpty());}diff --git a/src/test/java/io/github/hectorvent/floci/services/cur/CurEmissionIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cur/CurEmissionIntegrationTest.javaindex a3b7782455..5cdb30d55b 100644--- a/src/test/java/io/github/hectorvent/floci/services/cur/CurEmissionIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cur/CurEmissionIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.cur;import io.github.hectorvent.floci.services.floci.duck.FlociDuckClient;import io.github.hectorvent.floci.services.s3.S3Service;+import io.github.hectorvent.floci.services.s3.model.S3Object;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.github.hectorvent.floci.testing.SynchronousBillingEmissionProfile;import io.quarkus.test.junit.QuarkusTest;@@ -80,7 +81,7 @@ class CurEmissionIntegrationTest {.then().statusCode(200);// Find the freshly written Parquet object by listing the destination prefix.- var listing = s3Service.listObjects(destBucket, "billing/sync-emit/", null, Integer.MAX_VALUE);+ List<S3Object> listing = s3Service.listObjects(destBucket, "billing/sync-emit/", null, Integer.MAX_VALUE);assertThat(listing.size(), greaterThanOrEqualTo(1));String parquetKey = listing.get(0).getKey();assertThat(parquetKey, startsWith("billing/sync-emit/"));diff --git a/src/test/java/io/github/hectorvent/floci/services/cur/ParquetEmitterIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cur/ParquetEmitterIntegrationTest.javaindex 236e3e4376..7743642142 100644--- a/src/test/java/io/github/hectorvent/floci/services/cur/ParquetEmitterIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cur/ParquetEmitterIntegrationTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.cur;import io.github.hectorvent.floci.core.common.UsageLine;import io.github.hectorvent.floci.services.floci.duck.FlociDuckClient;import io.github.hectorvent.floci.services.s3.S3Service;+import io.github.hectorvent.floci.services.s3.model.S3Object;import io.github.hectorvent.floci.testing.SidecarContainersProfile;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.TestProfile;@@ -87,7 +88,7 @@ class ParquetEmitterIntegrationTest {assertThat(result.rowCount(), equalTo(2));// Confirm the Parquet object actually landed in S3.- var parquetObject = s3Service.getObject(destBucket, result.key());+ S3Object parquetObject = s3Service.getObject(destBucket, result.key());assertNotNull(parquetObject);assertThat(parquetObject.getSize(), greaterThanOrEqualTo(1L));@@ -126,7 +127,7 @@ class ParquetEmitterIntegrationTest {ParquetEmitter.Result result = emitter.emit("cleanup-report", destBucket, null, lines);// Staging bucket exists, but no staging objects should remain for this run.- var staging = s3Service.listObjects("floci-cur-staging",+ List<S3Object> staging = s3Service.listObjects("floci-cur-staging","cur-staging/cleanup-report/" + result.runId(), null, Integer.MAX_VALUE);assertTrue(staging.isEmpty(),"Expected no leftover staging objects, found: " + staging);diff --git a/src/test/java/io/github/hectorvent/floci/services/datasync/DataSyncServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/datasync/DataSyncServiceTest.javaindex e0ceafcc2d..81d4e01e0f 100644--- a/src/test/java/io/github/hectorvent/floci/services/datasync/DataSyncServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/datasync/DataSyncServiceTest.java@@ -376,7 +376,7 @@ class DataSyncServiceTest {"S3Config": {"BucketAccessRoleArn": "arn:aws:iam::000000000000:role/datasync"}}""");- var page = service.listLocations(+ DataSyncService.Page<DataSyncLocation> page = service.listLocations(json("[{\"Name\": \"LocationType\", \"Values\": [\"Nfs\"], \"Operator\": \"Equals\"}]"), null, 0);assertEquals(List.of(nfs.getLocationArn()),@@ -403,11 +403,11 @@ class DataSyncServiceTest {service.createAgent(json("{\"ActivationKey\": \"AAAAA-1AAAA-BB1CC-DDDDD-EEEEE\"}"), REGION);}- var first = service.listAgents(null, 2);+ DataSyncService.Page<DataSyncAgent> first = service.listAgents(null, 2);assertEquals(2, first.items().size());assertEquals(first.items().get(1).getAgentArn(), first.nextToken());- var second = service.listAgents(first.nextToken(), 2);+ DataSyncService.Page<DataSyncAgent> second = service.listAgents(first.nextToken(), 2);assertEquals(1, second.items().size());assertNull(second.nextToken());}diff --git a/src/test/java/io/github/hectorvent/floci/services/detective/DetectiveServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/detective/DetectiveServiceTest.javaindex 174ae42aaa..0a00714d5f 100644--- a/src/test/java/io/github/hectorvent/floci/services/detective/DetectiveServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/detective/DetectiveServiceTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.detective;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;+import io.github.hectorvent.floci.services.detective.model.DetectiveMember;import io.github.hectorvent.floci.services.detective.model.DetectiveState;import io.github.hectorvent.floci.services.organizations.OrganizationsService;import io.github.hectorvent.floci.services.organizations.model.Organization;@@ -62,7 +63,7 @@ class DetectiveServiceTest {when(regionResolver.getAccountId()).thenReturn(ADMIN_ACCOUNT);String graphArn = service.graphArn(REGION);- var member = service.createMember(REGION, graphArn, MEMBER_ACCOUNT, null);+ DetectiveMember member = service.createMember(REGION, graphArn, MEMBER_ACCOUNT, null);assertEquals(MEMBER_ACCOUNT, member.getAccountId());assertNull(member.getEmailAddress());diff --git a/src/test/java/io/github/hectorvent/floci/services/docdb/DocDbLegacyMigrationRaceTest.java b/src/test/java/io/github/hectorvent/floci/services/docdb/DocDbLegacyMigrationRaceTest.javaindex e7b8ab65fe..56b6c1aecc 100644--- a/src/test/java/io/github/hectorvent/floci/services/docdb/DocDbLegacyMigrationRaceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/docdb/DocDbLegacyMigrationRaceTest.java@@ -48,8 +48,8 @@ class DocDbLegacyMigrationRaceTest {"docdb-clusters.json".equals(inv.getArgument(1)) ? clusterStore : instanceStore);EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var docdbConfig = Mockito.mock(EmulatorConfig.DocDbServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.DocDbServiceConfig docdbConfig = Mockito.mock(EmulatorConfig.DocDbServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.docdb()).thenReturn(docdbConfig);when(docdbConfig.mock()).thenReturn(true);@@ -67,8 +67,8 @@ class DocDbLegacyMigrationRaceTest {"docdb-clusters.json".equals(inv.getArgument(1)) ? clusterStore : instanceStore);EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var docdbConfig = Mockito.mock(EmulatorConfig.DocDbServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.DocDbServiceConfig docdbConfig = Mockito.mock(EmulatorConfig.DocDbServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.docdb()).thenReturn(docdbConfig);when(docdbConfig.mock()).thenReturn(true);diff --git a/src/test/java/io/github/hectorvent/floci/services/docdb/DocDbServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/docdb/DocDbServiceTest.javaindex 666288386c..7d21e76a0e 100644--- a/src/test/java/io/github/hectorvent/floci/services/docdb/DocDbServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/docdb/DocDbServiceTest.java@@ -54,8 +54,8 @@ class DocDbServiceTest {.thenAnswer(inv -> AccountAwareStorageBackend.inMemory("000000000000"));EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var docdbConfig = Mockito.mock(EmulatorConfig.DocDbServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.DocDbServiceConfig docdbConfig = Mockito.mock(EmulatorConfig.DocDbServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.docdb()).thenReturn(docdbConfig);when(docdbConfig.mock()).thenReturn(true);@@ -157,8 +157,8 @@ class DocDbServiceTest {when(storageFactory.create(anyString(), anyString(), any())).thenAnswer(inv -> AccountAwareStorageBackend.inMemory("000000000000"));EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var docdbConfig = Mockito.mock(EmulatorConfig.DocDbServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.DocDbServiceConfig docdbConfig = Mockito.mock(EmulatorConfig.DocDbServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.docdb()).thenReturn(docdbConfig);when(docdbConfig.mock()).thenReturn(false);@@ -227,8 +227,8 @@ class DocDbServiceTest {"docdb-clusters.json".equals(inv.getArgument(1)) ? clusterStore : instanceStore);EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var docdbConfig = Mockito.mock(EmulatorConfig.DocDbServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.DocDbServiceConfig docdbConfig = Mockito.mock(EmulatorConfig.DocDbServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.docdb()).thenReturn(docdbConfig);when(docdbConfig.mock()).thenReturn(true);@@ -321,8 +321,8 @@ class DocDbServiceTest {when(storageFactory.create(anyString(), anyString(), any())).thenAnswer(inv ->"docdb-clusters.json".equals(inv.getArgument(1)) ? clusterStore : instanceStore);EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var docdbConfig = Mockito.mock(EmulatorConfig.DocDbServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.DocDbServiceConfig docdbConfig = Mockito.mock(EmulatorConfig.DocDbServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.docdb()).thenReturn(docdbConfig);when(docdbConfig.mock()).thenReturn(true);diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPathValidatorTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPathValidatorTest.javaindex 76d39a8714..8cef2bb31f 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPathValidatorTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbAccessPathValidatorTest.java@@ -358,11 +358,11 @@ class DynamoDbAccessPathValidatorTest {@Testvoid rejectsANestedPathOnAKeyAttribute() {- var names = mapper.createObjectNode();+ ObjectNode names = mapper.createObjectNode();names.put("#sk", "sk");- var values = expressionValues(":pk", ":v");+ ObjectNode values = expressionValues(":pk", ":v");- var error = assertThrows(AwsException.class,+ AwsException error = assertThrows(AwsException.class,() -> DynamoDbAccessPathValidator.validateQuery(table, tablePath, null, "pk = :pk AND #sk.foo = :v",null, null, names, values));@@ -373,7 +373,7 @@ class DynamoDbAccessPathValidatorTest {@Testvoid reportsTheMissingKeySchemaElementForANonKeyAttribute() {- var error = assertThrows(AwsException.class,+ AwsException error = assertThrows(AwsException.class,() -> validateExpression(tablePath, "attr1 = :v"));assertEquals("Query condition missed key schema element: pk", error.getMessage());@@ -381,7 +381,7 @@ class DynamoDbAccessPathValidatorTest {@Testvoid stillRejectsANonKeyAttributeAlongsideTheFullKey() {- var error = assertThrows(AwsException.class,+ AwsException error = assertThrows(AwsException.class,() -> validateExpression(tablePath, "pk = :pk AND attr1 = :v"));assertEquals("Query key condition not supported", error.getMessage());diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbConcurrencyIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbConcurrencyIntegrationTest.javaindex 046c16bbd3..6309356359 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbConcurrencyIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbConcurrencyIntegrationTest.java@@ -7,6 +7,7 @@ import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.dynamodb.model.AttributeDefinition;import io.github.hectorvent.floci.services.dynamodb.model.ConditionalCheckFailedException;+import io.github.hectorvent.floci.services.dynamodb.model.DynamoDbStreamRecord;import io.github.hectorvent.floci.services.dynamodb.model.KeySchemaElement;import io.github.hectorvent.floci.services.dynamodb.model.KinesisStreamingDestination;import io.github.hectorvent.floci.services.dynamodb.model.StreamDescription;@@ -481,7 +482,7 @@ class DynamoDbConcurrencyIntegrationTest {// The NEW_IMAGE.cnt values, read in stream order, must be strictly increasing.int previous = 0;- for (var record : pulled.records()) {+ for (DynamoDbStreamRecord record : pulled.records()) {JsonNode newImage = record.getNewImage();assertNotNull(newImage, "NEW_IMAGE view type must populate newImage");int current = Integer.parseInt(newImage.get("cnt").get("N").asText());diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbConsumedCapacityIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbConsumedCapacityIntegrationTest.javaindex e93fceb8b5..7ddec3b154 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbConsumedCapacityIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbConsumedCapacityIntegrationTest.java@@ -151,7 +151,7 @@ class DynamoDbConsumedCapacityIntegrationTest {@Test@Order(5)void scanWithFilterCostsWhatTheUnfilteredScanCosts() {- for (var i = 0; i < 6; i++) {+ for (int i = 0; i < 6; i++) {putItem("""{"pk": {"S": "cc-scan-%d"}, "keep": {"S": "no"}, "filler": {"S": "%s"}}""".formatted(i, "x".repeat(1000)));diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbFilterExpressionIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbFilterExpressionIntegrationTest.javaindex 203223f928..77e2bc61ed 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbFilterExpressionIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbFilterExpressionIntegrationTest.java@@ -367,7 +367,7 @@ class DynamoDbFilterExpressionIntegrationTest {private void scanWithFilter(String filterExpression, String exprAttrValuesJson,String exprAttrNamesJson, int expectedCount) {- var body = new StringBuilder();+ StringBuilder body = new StringBuilder();body.append("{");body.append("\"TableName\": \"").append(TABLE_NAME).append("\",");body.append("\"FilterExpression\": \"").append(filterExpression).append("\",");diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbGsiSortKeyRestartTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbGsiSortKeyRestartTest.javaindex 1ef2fcdd78..0c433cfedf 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbGsiSortKeyRestartTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbGsiSortKeyRestartTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.dynamodb;import com.fasterxml.jackson.core.type.TypeReference;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.RegionResolver;import io.github.hectorvent.floci.core.storage.PersistentStorage;@@ -52,14 +53,14 @@ class DynamoDbGsiSortKeyRestartTest {ObjectNode req = mapper.createObjectNode();req.put("TableName", TABLE);req.putArray("KeySchema").addObject().put("AttributeName", "PK").put("KeyType", "HASH");- var attrDefs = req.putArray("AttributeDefinitions");+ ArrayNode attrDefs = req.putArray("AttributeDefinitions");attrDefs.addObject().put("AttributeName", "PK").put("AttributeType", "S");attrDefs.addObject().put("AttributeName", "GSI1PK").put("AttributeType", "S");attrDefs.addObject().put("AttributeName", "GSI1SK").put("AttributeType", "S");req.put("BillingMode", "PAY_PER_REQUEST");ObjectNode gsi = req.putArray("GlobalSecondaryIndexes").addObject();gsi.put("IndexName", "GSI1");- var gsiKeySchema = gsi.putArray("KeySchema");+ ArrayNode gsiKeySchema = gsi.putArray("KeySchema");gsiKeySchema.addObject().put("AttributeName", "GSI1PK").put("KeyType", "HASH");gsiKeySchema.addObject().put("AttributeName", "GSI1SK").put("KeyType", "RANGE");gsi.putObject("Projection").put("ProjectionType", "ALL");diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbImportIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbImportIntegrationTest.javaindex d527c2f0f6..cb198f0da5 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbImportIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbImportIntegrationTest.java@@ -10,6 +10,7 @@ import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.HashSet;import java.util.concurrent.CountDownLatch;+import java.util.concurrent.ExecutorService;import java.util.concurrent.Executors;import java.util.concurrent.Future;import java.util.concurrent.TimeUnit;@@ -49,7 +50,7 @@ class DynamoDbImportIntegrationTest {putObject("plain/data.json","{\"Item\":{\"pk\":{\"S\":\"imported1\"}}}\n{\"Item\":{\"pk\":{\"S\":\"imported2\"}}}\n");- var importArn = dynamo("ImportTable", importRequest("ImportPlain", BUCKET_NAME, "plain/", "DYNAMODB_JSON", "NONE"))+ String importArn = dynamo("ImportTable", importRequest("ImportPlain", BUCKET_NAME, "plain/", "DYNAMODB_JSON", "NONE")).then().statusCode(200).body("ImportTableDescription.ImportArn", containsString("/import/"))@@ -108,13 +109,13 @@ class DynamoDbImportIntegrationTest {@Testvoid importTable_gzip_roundTripsAnExport() {createCompositeTable("RoundTripSource");- for (var i = 1; i <= 3; i++) {+ for (int i = 1; i <= 3; i++) {dynamo("PutItem", "{\"TableName\": \"RoundTripSource\", \"Item\": {\"pk\": {\"S\": \"user-" + i+ "\"}, \"sk\": {\"S\": \"order-" + i + "\"}, \"total\": {\"N\": \"" + (i * 10) + "\"}}}").then().statusCode(200);}- var exportArn = dynamo("ExportTableToPointInTime", """+ String exportArn = dynamo("ExportTableToPointInTime", """{"TableArn": "%s","S3Bucket": "%s",@@ -125,10 +126,10 @@ class DynamoDbImportIntegrationTest {.extract().jsonPath().getString("ExportDescription.ExportArn");assertEquals("COMPLETED", pollExport(exportArn));- var exportId = exportArn.substring(exportArn.lastIndexOf('/') + 1);- var dataPrefix = "roundtrip/AWSDynamoDB/" + exportId + "/data/";+ String exportId = exportArn.substring(exportArn.lastIndexOf('/') + 1);+ String dataPrefix = "roundtrip/AWSDynamoDB/" + exportId + "/data/";- var importArn = dynamo("ImportTable", """+ String importArn = dynamo("ImportTable", """{"S3BucketSource": {"S3Bucket": "%s", "S3KeyPrefix": "%s"},"InputFormat": "DYNAMODB_JSON",@@ -171,7 +172,7 @@ class DynamoDbImportIntegrationTest {putObject("bad/data.json","{\"Item\":{\"pk\":{\"S\":\"good\"}}}\nnot json at all\n{\"NoItem\":1}\n\n{\"Item\":{\"other\":{\"S\":\"missing key\"}}}\n");- var importArn = dynamo("ImportTable", importRequest("ImportBadLines", BUCKET_NAME, "bad/", "DYNAMODB_JSON", "NONE"))+ String importArn = dynamo("ImportTable", importRequest("ImportBadLines", BUCKET_NAME, "bad/", "DYNAMODB_JSON", "NONE")).then().statusCode(200).extract().jsonPath().getString("ImportTableDescription.ImportArn");@@ -187,7 +188,7 @@ class DynamoDbImportIntegrationTest {@Testvoid importTable_missingBucket_failsWithS3NoSuchBucket() {- var importArn = dynamo("ImportTable", importRequest("ImportNoBucket", "no-such-import-bucket", "imp/", "DYNAMODB_JSON", "NONE"))+ String importArn = dynamo("ImportTable", importRequest("ImportNoBucket", "no-such-import-bucket", "imp/", "DYNAMODB_JSON", "NONE")).then().statusCode(200).body("ImportTableDescription.ImportStatus", equalTo("IN_PROGRESS")).extract().jsonPath().getString("ImportTableDescription.ImportArn");@@ -210,7 +211,7 @@ class DynamoDbImportIntegrationTest {@Testvoid importTable_bucketOfAnotherAccount_failsWithS3AccessDenied() {- var importArn = dynamo("ImportTable", """+ String importArn = dynamo("ImportTable", """{"S3BucketSource": {"S3Bucket": "%s", "S3KeyPrefix": "plain/", "S3BucketOwner": "111111111111"},"InputFormat": "DYNAMODB_JSON",@@ -238,7 +239,7 @@ class DynamoDbImportIntegrationTest {@Testvoid importTable_emptyPrefix_fails() {- var importArn = dynamo("ImportTable", importRequest("ImportEmptyPrefix", BUCKET_NAME, "nothing-here/", "DYNAMODB_JSON", "NONE"))+ String importArn = dynamo("ImportTable", importRequest("ImportEmptyPrefix", BUCKET_NAME, "nothing-here/", "DYNAMODB_JSON", "NONE")).then().statusCode(200).extract().jsonPath().getString("ImportTableDescription.ImportArn");@@ -253,7 +254,7 @@ class DynamoDbImportIntegrationTest {@Testvoid importTable_sameClientToken_returnsTheSameImport() {putObject("token/data.json", "{\"Item\":{\"pk\":{\"S\":\"one\"}}}\n");- var body = """+ String body = """{"ClientToken": "import-token-1","S3BucketSource": {"S3Bucket": "%s", "S3KeyPrefix": "token/"},@@ -267,12 +268,12 @@ class DynamoDbImportIntegrationTest {}""".formatted(BUCKET_NAME);- var first = dynamo("ImportTable", body)+ String first = dynamo("ImportTable", body).then().statusCode(200).body("ImportTableDescription.ClientToken", equalTo("import-token-1")).extract().jsonPath().getString("ImportTableDescription.ImportArn");- var second = dynamo("ImportTable", body)+ String second = dynamo("ImportTable", body).then().statusCode(200).extract().jsonPath().getString("ImportTableDescription.ImportArn");@@ -283,7 +284,7 @@ class DynamoDbImportIntegrationTest {@Testvoid importTable_concurrentSameClientToken_startsOneImport() throws Exception {putObject("race/data.json", "{\"Item\":{\"pk\":{\"S\":\"one\"}}}\n");- var body = """+ String body = """{"ClientToken": "import-token-race","S3BucketSource": {"S3Bucket": "%s", "S3KeyPrefix": "race/"},@@ -296,12 +297,12 @@ class DynamoDbImportIntegrationTest {}}""".formatted(BUCKET_NAME);- var threads = 8;- var startGate = new CountDownLatch(1);- var pool = Executors.newFixedThreadPool(threads);+ int threads = 8;+ CountDownLatch startGate = new CountDownLatch(1);+ ExecutorService pool = Executors.newFixedThreadPool(threads);try {- var futures = new ArrayList<Future<String>>();- for (var i = 0; i < threads; i++) {+ ArrayList<Future<String>> futures = new ArrayList<>();+ for (int i = 0; i < threads; i++) {futures.add(pool.submit(() -> {startGate.await();return dynamo("ImportTable", body)@@ -310,8 +311,8 @@ class DynamoDbImportIntegrationTest {}));}startGate.countDown();- var importArns = new HashSet<String>();- for (var future : futures) {+ HashSet<String> importArns = new HashSet<>();+ for (Future<String> future : futures) {importArns.add(future.get(30, TimeUnit.SECONDS));}assertEquals(1, importArns.size(), importArns.toString());@@ -486,9 +487,9 @@ class DynamoDbImportIntegrationTest {}private String pollStatus(Supplier<io.restassured.response.Response> call, String statusPath) {- var deadline = System.currentTimeMillis() + 10_000;+ long deadline = System.currentTimeMillis() + 10_000;while (System.currentTimeMillis() < deadline) {- var status = call.get().then().statusCode(200).extract().jsonPath().getString(statusPath);+ String status = call.get().then().statusCode(200).extract().jsonPath().getString(statusPath);if (!"IN_PROGRESS".equals(status)) {return status;}diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParserTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParserTest.javaindex b37f980df1..0be82cf04f 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParserTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbPartiQLParserTest.java@@ -41,7 +41,7 @@ class DynamoDbPartiQLParserTest {}private Cond firstCond(String statement, String... params) {- var stmt = DynamoDbPartiQLParser.parse(statement, Arrays.stream(params).map(this::json).toList());+ Stmt stmt = DynamoDbPartiQLParser.parse(statement, Arrays.stream(params).map(this::json).toList());return assertInstanceOf(Stmt.Select.class, stmt).where().get(0);}@@ -55,9 +55,9 @@ class DynamoDbPartiQLParserTest {"{\"M\":{\"a\":{\"S\":\"b\"}}}"})void bindsAParameterOfATypeWithNoLiteralSyntax(String param) {- var cond = firstCond(SELECT + "= ?", param);+ Cond cond = firstCond(SELECT + "= ?", param);- var val = assertInstanceOf(Cond.Eq.class, cond).val();+ PVal val = assertInstanceOf(Cond.Eq.class, cond).val();assertEquals(json(param), assertInstanceOf(PVal.Av.class, val).node());}@@ -66,7 +66,7 @@ class DynamoDbPartiQLParserTest {@ParameterizedTest@ValueSource(strings = {"{\"Q\":\"x\"}", "{}"})void rejectsAParameterCarryingNoRecognisedType(String param) {- var e = assertThrows(AwsException.class, () -> firstCond(SELECT + "= ?", param));+ AwsException e = assertThrows(AwsException.class, () -> firstCond(SELECT + "= ?", param));assertEquals("ValidationException", e.getErrorCode());assertEquals("Supplied AttributeValue is empty, must contain exactly one of the supported datatypes",@@ -81,7 +81,7 @@ class DynamoDbPartiQLParserTest {"{\"M\":{\"k\":{\"S\":\"a\",\"N\":\"1\"}}}"})void rejectsAParameterCarryingMoreThanOneType(String param) {- var e = assertThrows(AwsException.class, () -> firstCond(SELECT + "= ?", param));+ AwsException e = assertThrows(AwsException.class, () -> firstCond(SELECT + "= ?", param));assertEquals("ValidationException", e.getErrorCode());assertEquals("Supplied AttributeValue has more than one datatypes set, "@@ -97,7 +97,7 @@ class DynamoDbPartiQLParserTest {"{\"B\":123}"})void rejectsABinaryParameterThatIsNotBase64(String param) {- var e = assertThrows(AwsException.class, () -> firstCond(SELECT + "= ?", param));+ AwsException e = assertThrows(AwsException.class, () -> firstCond(SELECT + "= ?", param));assertEquals("SerializationException", e.getErrorCode());assertEquals(400, e.getHttpStatus());@@ -105,7 +105,7 @@ class DynamoDbPartiQLParserTest {@Testvoid namesTheLengthOfBase64ThatIsNotAMultipleOfFour() {- var e = assertThrows(AwsException.class, () -> firstCond(SELECT + "= ?", "{\"B\":\"AQI\"}"));+ AwsException e = assertThrows(AwsException.class, () -> firstCond(SELECT + "= ?", "{\"B\":\"AQI\"}"));assertEquals("SerializationException", e.getErrorCode());assertEquals("Base64 encoded length is expected a multiple of 4 bytes but found: 3", e.getMessage());@@ -113,7 +113,7 @@ class DynamoDbPartiQLParserTest {@Testvoid acceptsAnEmptyBinaryParameter() {- var cond = firstCond(SELECT + "= ?", "{\"B\":\"\"}");+ Cond cond = firstCond(SELECT + "= ?", "{\"B\":\"\"}");assertInstanceOf(PVal.Av.class, assertInstanceOf(Cond.Eq.class, cond).val());}@@ -122,7 +122,7 @@ class DynamoDbPartiQLParserTest {// last placeholder still fails the request.@Testvoid rejectsAMalformedParameterBeyondThePlaceholders() {- var e = assertThrows(AwsException.class,+ AwsException e = assertThrows(AwsException.class,() -> firstCond(SELECT + "= ?", "{\"S\":\"a\"}", "{\"B\":\"not base64!!\"}"));assertEquals("SerializationException", e.getErrorCode());@@ -139,7 +139,7 @@ class DynamoDbPartiQLParserTest {"'<', {\"BS\":[\"AQID\"]}, BS"})void rejectsAnOrderingOperatorOnATypeWithNoOrdering(String op, String param, String type) {- var e = assertThrows(AwsException.class, () -> firstCond(SELECT + op + " ?", param));+ AwsException e = assertThrows(AwsException.class, () -> firstCond(SELECT + op + " ?", param));assertEquals("ValidationException", e.getErrorCode());assertEquals("Incorrect operand type for operator or function; "@@ -148,7 +148,7 @@ class DynamoDbPartiQLParserTest {@Testvoid namesBetweenAsTheOperatorWhenItsBoundIsUnordered() {- var e = assertThrows(AwsException.class,+ AwsException e = assertThrows(AwsException.class,() -> firstCond(SELECT + "BETWEEN ? AND ?", "{\"BOOL\":true}", "{\"BOOL\":false}"));assertEquals("Incorrect operand type for operator or function; "@@ -164,7 +164,7 @@ class DynamoDbPartiQLParserTest {@ParameterizedTest@ValueSource(strings = {"{\"S\":\"a\"}", "{\"N\":\"1\"}", "{\"B\":\"AQID\"}"})void acceptsAnOrderingOperatorOnAnOrderedType(String param) {- var cond = firstCond(SELECT + "< ?", param);+ Cond cond = firstCond(SELECT + "< ?", param);assertEquals("<", assertInstanceOf(Cond.Cmp.class, cond).op());}diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.javaindex 590dc62225..d6a787bbac 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.dynamodb;+import com.fasterxml.jackson.databind.node.ArrayNode;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;@@ -627,7 +628,7 @@ class DynamoDbServiceTest {ObjectNode keyConditions = mapper.createObjectNode();ObjectNode pkCondition = mapper.createObjectNode();pkCondition.put("ComparisonOperator", "EQ");- var attrList = mapper.createArrayNode();+ ArrayNode attrList = mapper.createArrayNode();ObjectNode pkVal = mapper.createObjectNode();pkVal.put("S", "c1");attrList.add(pkVal);@@ -658,12 +659,12 @@ class DynamoDbServiceTest {@Testvoid queryWithTheSortKeyValueOnTheLeft() {- var region = "eu-west-1";+ String region = "eu-west-1";createOrdersTable(region);service.putItem("Orders", item("customerId", "c1", "orderId", "o1"), region);service.putItem("Orders", item("customerId", "c1", "orderId", "o3"), region);- var exprValues = mapper.createObjectNode();+ ObjectNode exprValues = mapper.createObjectNode();exprValues.set(":pk", mapper.createObjectNode().put("S", "c1"));exprValues.set(":lo", mapper.createObjectNode().put("S", "o2"));@@ -890,7 +891,7 @@ class DynamoDbServiceTest {private ObjectNode legacyEqCondition(String value) {ObjectNode condition = mapper.createObjectNode();condition.put("ComparisonOperator", "EQ");- var attrList = mapper.createArrayNode();+ ArrayNode attrList = mapper.createArrayNode();attrList.add(attributeValue("S", value));condition.set("AttributeValueList", attrList);return condition;@@ -989,7 +990,7 @@ class DynamoDbServiceTest {ObjectNode scanFilter = mapper.createObjectNode();ObjectNode condition = mapper.createObjectNode();condition.put("ComparisonOperator", "EQ");- var attrList = mapper.createArrayNode();+ ArrayNode attrList = mapper.createArrayNode();ObjectNode val = mapper.createObjectNode();val.put("S", "Alice");attrList.add(val);@@ -1012,7 +1013,7 @@ class DynamoDbServiceTest {ObjectNode scanFilter = mapper.createObjectNode();ObjectNode condition = mapper.createObjectNode();condition.put("ComparisonOperator", "GE");- var attrList = mapper.createArrayNode();+ ArrayNode attrList = mapper.createArrayNode();ObjectNode val = mapper.createObjectNode();val.put("S", "Bob");attrList.add(val);@@ -1503,7 +1504,7 @@ class DynamoDbServiceTest {private ObjectNode listAttributeValue(String... values) {ObjectNode node = mapper.createObjectNode();- var arrayNode = mapper.createArrayNode();+ ArrayNode arrayNode = mapper.createArrayNode();for (String v : values) {arrayNode.add(attributeValue("S", v));}@@ -1513,7 +1514,7 @@ class DynamoDbServiceTest {private ObjectNode stringSetAttributeValue(String... values) {ObjectNode node = mapper.createObjectNode();- var arrayNode = mapper.createArrayNode();+ ArrayNode arrayNode = mapper.createArrayNode();for (String v : values) {arrayNode.add(v);}@@ -1535,7 +1536,7 @@ class DynamoDbServiceTest {private ObjectNode numberSetAttributeValue(String... values) {ObjectNode node = mapper.createObjectNode();- var arrayNode = mapper.createArrayNode();+ ArrayNode arrayNode = mapper.createArrayNode();for (String v : values) {arrayNode.add(v);}@@ -1545,7 +1546,7 @@ class DynamoDbServiceTest {private ObjectNode binarySetAttributeValue(String... base64Values) {ObjectNode node = mapper.createObjectNode();- var arrayNode = mapper.createArrayNode();+ ArrayNode arrayNode = mapper.createArrayNode();for (String v : base64Values) {arrayNode.add(v);}@@ -1699,7 +1700,7 @@ class DynamoDbServiceTest {String region = "eu-west-1";createUsersTable(region);ObjectNode u1 = item("userId", "u1");- var list = mapper.createArrayNode();+ ArrayNode list = mapper.createArrayNode();list.add(attributeValue("N", "10"));list.add(attributeValue("N", "20"));ObjectNode listNode = mapper.createObjectNode();@@ -1708,7 +1709,7 @@ class DynamoDbServiceTest {service.putItem("Users", u1, region);ObjectNode u2 = item("userId", "u2");- var list2 = mapper.createArrayNode();+ ArrayNode list2 = mapper.createArrayNode();list2.add(attributeValue("N", "30"));ObjectNode listNode2 = mapper.createObjectNode();listNode2.set("L", list2);@@ -1739,7 +1740,7 @@ class DynamoDbServiceTest {// Use SS (String Set) type for ADD operationObjectNode tagVal = mapper.createObjectNode();- var tagArray = tagVal.putArray("SS");+ ArrayNode tagArray = tagVal.putArray("SS");tagArray.add("a");exprValues.set(":val", priceVal);exprValues.set(":newTag", tagVal);@@ -1750,7 +1751,7 @@ class DynamoDbServiceTest {// And add another tag to the same item, to verify that the ADD works on existing items as wellObjectNode tagVal2 = mapper.createObjectNode();- var tagArray2 = tagVal2.putArray("SS");+ ArrayNode tagArray2 = tagVal2.putArray("SS");tagArray2.add("b");exprValues.set(":newTag", tagVal2);DynamoDbService.UpdateResult updateResult = service.updateItem("Orders", key, null,@@ -1847,7 +1848,7 @@ class DynamoDbServiceTest {ObjectNode initialItem = item("userId", "list-test");ObjectNode listValue = mapper.createObjectNode();- var list = listValue.putArray("L");+ ArrayNode list = listValue.putArray("L");list.add(attributeValue("S", "a"));list.add(attributeValue("S", "b"));@@ -1884,7 +1885,7 @@ class DynamoDbServiceTest {ObjectNode initialItem = item("userId", "huge-index-test");ObjectNode listValue = mapper.createObjectNode();- var list = listValue.putArray("L");+ ArrayNode list = listValue.putArray("L");list.add(attributeValue("S", "a"));list.add(attributeValue("S", "b"));@@ -1919,7 +1920,7 @@ class DynamoDbServiceTest {ObjectNode initialItem = item("userId", "max-index-test");ObjectNode listValue = mapper.createObjectNode();- var list = listValue.putArray("L");+ ArrayNode list = listValue.putArray("L");list.add(attributeValue("S", "a"));list.add(attributeValue("S", "b"));@@ -1954,7 +1955,7 @@ class DynamoDbServiceTest {ObjectNode initialItem = item("userId", "invalid-index-test");ObjectNode listValue = mapper.createObjectNode();- var list = listValue.putArray("L");+ ArrayNode list = listValue.putArray("L");list.add(attributeValue("S", "a"));list.add(attributeValue("S", "b"));@@ -2658,7 +2659,7 @@ class DynamoDbServiceTest {}private void createBinaryIndexedTable(String region) {- var gsi = new GlobalSecondaryIndex("gsib",+ GlobalSecondaryIndex gsi = new GlobalSecondaryIndex("gsib",List.of(new KeySchemaElement("bidx", "HASH")), null, "ALL", null);service.createTable("BinaryIndexed",List.of(new KeySchemaElement("pk", "HASH")),@@ -2670,13 +2671,13 @@ class DynamoDbServiceTest {@Testvoid putItemEmptyBinaryGsiKeyThrowsValidationException() {- var region = "eu-west-1";+ String region = "eu-west-1";createBinaryIndexedTable(region);- var item = item("pk", "p1");+ ObjectNode item = item("pk", "p1");item.set("bidx", attributeValue("B", ""));- var ex = assertThrows(AwsException.class, () ->+ AwsException ex = assertThrows(AwsException.class, () ->service.putItem("BinaryIndexed", item, region));assertEquals("ValidationException", ex.getErrorCode());assertEquals("One or more parameter values are not valid. A value specified for a secondary "@@ -2686,13 +2687,13 @@ class DynamoDbServiceTest {@Testvoid updateItemSettingEmptyBinaryGsiKeyThrowsValidationException() {- var region = "eu-west-1";+ String region = "eu-west-1";createBinaryIndexedTable(region);- var exprValues = mapper.createObjectNode();+ ObjectNode exprValues = mapper.createObjectNode();exprValues.set(":v", attributeValue("B", ""));- var ex = assertThrows(AwsException.class, () ->+ AwsException ex = assertThrows(AwsException.class, () ->service.updateItem("BinaryIndexed", item("pk", "p1"), null,"SET bidx = :v", null, exprValues, null, region));assertEquals("ValidationException", ex.getErrorCode());@@ -3085,7 +3086,7 @@ class DynamoDbServiceTest {exprValues.set(":start", attributeValue("S", "2026-01-01Z#"));exprValues.set(":end", attributeValue("S", "2026-12-31Z#z"));- var result = service.query("Orders", null, exprValues,+ DynamoDbService.QueryResult result = service.query("Orders", null, exprValues,"customerId = :pk AND (orderId BETWEEN :start AND :end)", null, null, region);assertEquals(3, result.items().size(), "parenthesized BETWEEN should work");}@@ -3104,7 +3105,7 @@ class DynamoDbServiceTest {exprValues.set(":v1", attributeValue("S", "2026-01-01Z#"));exprValues.set(":v2", attributeValue("S", "2026-12-31Z#z"));- var result = service.query("Orders", null, exprValues,+ DynamoDbService.QueryResult result = service.query("Orders", null, exprValues,"(#f0 = :v0)AND(#f1 BETWEEN :v1 AND :v2)", null, null, null, null, null, exprNames, "us-east-1");assertEquals(2, result.items().size(), "compact AND with BETWEEN should work");}@@ -3112,10 +3113,10 @@ class DynamoDbServiceTest {@Testvoid batchWriteItemReportsAKeySchemaMismatchTheWayAwsDoes() {createUsersTable("us-east-1");- var wrongType = mapper.createObjectNode();+ ObjectNode wrongType = mapper.createObjectNode();wrongType.set("userId", attributeValue("N", "5"));- var error = assertThrows(AwsException.class, () -> service.batchWriteItem(+ AwsException error = assertThrows(AwsException.class, () -> service.batchWriteItem(Map.of("Users", List.of(putRequest(wrongType))), "us-east-1"));assertEquals("The provided key element does not match the schema", error.getMessage());}@@ -3123,14 +3124,14 @@ class DynamoDbServiceTest {@Testvoid batchWriteItemReportsAMissingKeyAsASchemaMismatch() {createUsersTable("us-east-1");- var noKey = mapper.createObjectNode();+ ObjectNode noKey = mapper.createObjectNode();noKey.set("name", attributeValue("S", "x"));- var putError = assertThrows(AwsException.class, () -> service.batchWriteItem(+ AwsException putError = assertThrows(AwsException.class, () -> service.batchWriteItem(Map.of("Users", List.of(putRequest(noKey))), "us-east-1"));assertEquals("The provided key element does not match the schema", putError.getMessage());- var deleteError = assertThrows(AwsException.class, () -> service.batchWriteItem(+ AwsException deleteError = assertThrows(AwsException.class, () -> service.batchWriteItem(Map.of("Users", List.of(deleteRequest(noKey))), "us-east-1"));assertEquals("The provided key element does not match the schema", deleteError.getMessage());}@@ -3138,10 +3139,10 @@ class DynamoDbServiceTest {@Testvoid putItemStillNamesTheMismatchedKeyTypes() {createUsersTable("us-east-1");- var wrongType = mapper.createObjectNode();+ ObjectNode wrongType = mapper.createObjectNode();wrongType.set("userId", attributeValue("N", "5"));- var error = assertThrows(AwsException.class,+ AwsException error = assertThrows(AwsException.class,() -> service.putItem("Users", wrongType, "us-east-1"));assertEquals("One or more parameter values were invalid: Type mismatch for key userId "+ "expected: S actual: N", error.getMessage());@@ -3209,7 +3210,7 @@ class DynamoDbServiceTest {key.set("customerId", attributeValue("S", "c9"));key.set("orderId", attributeValue("S", "o9"));- var ex = assertThrows(AwsException.class, () -> service.updateItem("Orders", key, null,+ AwsException ex = assertThrows(AwsException.class, () -> service.updateItem("Orders", key, null,"SET #missing.subkey = :val", exprNames, exprValues, "NONE", null, "us-east-1", "NONE"));assertEquals("The document path provided in the update expression is invalid for update", ex.getMessage());}@@ -3236,7 +3237,7 @@ class DynamoDbServiceTest {key.set("customerId", attributeValue("S", "c1"));key.set("orderId", attributeValue("S", "o1"));- var result = service.updateItem("Orders", key, null,+ DynamoDbService.UpdateResult result = service.updateItem("Orders", key, null,"SET #details.subkey = :val, #status = :s", exprNames, exprValues, "ALL_NEW", null, "us-east-1", "NONE");JsonNode updated = result.newItem();@@ -3285,7 +3286,7 @@ class DynamoDbServiceTest {"SET #a = :v1, #b = :v1, #c = :v1, #d = :v1", exprNames, exprValues, "NONE", null, "us-east-1", "NONE");// SET last two assignments, then REMOVE two fields (comma-separated)- var result = service.updateItem("Orders", key, null,+ DynamoDbService.UpdateResult result = service.updateItem("Orders", key, null,"SET #a = :v1, #b = :v2 REMOVE #c, #d", exprNames, exprValues, "ALL_NEW", null, "us-east-1", "NONE");JsonNode updated = result.newItem();@@ -3529,13 +3530,13 @@ class DynamoDbServiceTest {@Testvoid updateItemSetArithmeticOverflowThrowsValidationException() {- var region = "eu-west-1";+ String region = "eu-west-1";createUsersTable(region);- var exprValues = mapper.createObjectNode();+ ObjectNode exprValues = mapper.createObjectNode();exprValues.set(":a", attributeValue("N", "9.9e125"));exprValues.set(":b", attributeValue("N", "9.9e125"));- var ex = assertThrows(AwsException.class, () ->+ AwsException ex = assertThrows(AwsException.class, () ->service.updateItem("Users", item("userId", "u1"), null,"SET n = :a + :b", null, exprValues, null, region));assertEquals("ValidationException", ex.getErrorCode());@@ -3546,15 +3547,15 @@ class DynamoDbServiceTest {@Testvoid updateItemAddOverflowThrowsValidationException() {- var region = "eu-west-1";+ String region = "eu-west-1";createUsersTable(region);- var existing = item("userId", "u1");+ ObjectNode existing = item("userId", "u1");existing.set("n", attributeValue("N", "9.9e125"));service.putItem("Users", existing, region);- var exprValues = mapper.createObjectNode();+ ObjectNode exprValues = mapper.createObjectNode();exprValues.set(":a", attributeValue("N", "9.9e125"));- var ex = assertThrows(AwsException.class, () ->+ AwsException ex = assertThrows(AwsException.class, () ->service.updateItem("Users", item("userId", "u1"), null,"ADD n :a", null, exprValues, null, region));assertEquals("ValidationException", ex.getErrorCode());@@ -4081,9 +4082,9 @@ class DynamoDbServiceTest {}private ImportTableDescription importDescription(String bucket, String prefix, String compression) {- var desc = new ImportTableDescription();+ ImportTableDescription desc = new ImportTableDescription();desc.setImportArn("arn:aws:dynamodb:us-east-1:000000000000:table/Users/import/1-abc");- var source = mapper.createObjectNode();+ ObjectNode source = mapper.createObjectNode();source.put("S3Bucket", bucket);source.put("S3KeyPrefix", prefix);desc.setS3BucketSource(source);@@ -4092,7 +4093,7 @@ class DynamoDbServiceTest {}private ObjectNode importRequest(String tableName, String inputFormat) {- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.putObject("S3BucketSource").put("S3Bucket", "bucket").put("S3KeyPrefix", "imp/");request.put("InputFormat", inputFormat);request.putObject("TableCreationParameters").put("TableName", tableName);@@ -4100,8 +4101,8 @@ class DynamoDbServiceTest {}private static byte[] gzip(String text) throws Exception {- var out = new ByteArrayOutputStream();- try (var gz = new GZIPOutputStream(out)) {+ ByteArrayOutputStream out = new ByteArrayOutputStream();+ try (GZIPOutputStream gz = new GZIPOutputStream(out)) {gz.write(text.getBytes(StandardCharsets.UTF_8));}return out.toByteArray();@@ -4112,9 +4113,9 @@ class DynamoDbServiceTest {}private static S3Service s3With(S3Object... objects) {- var s3 = mock(S3Service.class);+ S3Service s3 = mock(S3Service.class);when(s3.listObjects("bucket", "imp/", null, Integer.MAX_VALUE)).thenReturn(List.of(objects));- for (var object : objects) {+ for (S3Object object : objects) {when(s3.getObjectMetadata("bucket", object.getKey(), null)).thenReturn(object);when(s3.openObjectStream("bucket", object.getKey(), null)).thenAnswer(invocation -> new ByteArrayInputStream(object.getData()));@@ -4161,17 +4162,17 @@ class DynamoDbServiceTest {/** Checked against real DynamoDB: every item call on a CREATING table fails this way, DescribeTable still works. */@Testvoid itemCalls_creatingTable_returnResourceNotFoundWithoutTableName() {- var svc = serviceWithS3(mock(S3Service.class), new InMemoryStorage<>());+ DynamoDbService svc = serviceWithS3(mock(S3Service.class), new InMemoryStorage<>());createUsersTableInCreating(svc);- var region = "us-east-1";- var key = item("userId", "u1");- var keys = mapper.createObjectNode();+ String region = "us-east-1";+ ObjectNode key = item("userId", "u1");+ ObjectNode keys = mapper.createObjectNode();keys.set("Keys", mapper.createArrayNode().add(key));- var putRequest = mapper.createObjectNode();+ ObjectNode putRequest = mapper.createObjectNode();putRequest.putObject("PutRequest").set("Item", key);- var transactPut = mapper.createObjectNode();+ ObjectNode transactPut = mapper.createObjectNode();transactPut.putObject("Put").put("TableName", "Users").set("Item", key);- var transactGet = mapper.createObjectNode();+ ObjectNode transactGet = mapper.createObjectNode();transactGet.putObject("Get").put("TableName", "Users").set("Key", key);List<org.junit.jupiter.api.function.Executable> itemCalls = List.of(@@ -4185,8 +4186,8 @@ class DynamoDbServiceTest {() -> svc.batchWriteItem(Map.of("Users", List.of(putRequest)), region),() -> svc.transactWriteItems(List.of(transactPut), region, null, null),() -> svc.transactGetItems(List.of(transactGet), region));- for (var call : itemCalls) {- var e = assertThrows(AwsException.class, call);+ for (Executable call : itemCalls) {+ AwsException e = assertThrows(AwsException.class, call);assertEquals("ResourceNotFoundException", e.getErrorCode());assertEquals("Requested resource not found", e.getMessage());}@@ -4195,12 +4196,12 @@ class DynamoDbServiceTest {@Testvoid runImport_loadsGzipLinesAndCountsBadOnes() throws Exception {- var object = s3Object("imp/part-0.json.gz",+ S3Object object = s3Object("imp/part-0.json.gz",gzip("{\"Item\":{\"userId\":{\"S\":\"u1\"}}}\nnot json\n{\"Item\":{\"userId\":{\"S\":\"u2\"}}}\n"));- var importStore = new InMemoryStorage<String, ImportTableDescription>();- var svc = serviceWithS3(s3With(object), importStore);+ InMemoryStorage<String, ImportTableDescription> importStore = new InMemoryStorage<>();+ DynamoDbService svc = serviceWithS3(s3With(object), importStore);createUsersTableInCreating(svc);- var desc = importDescription("bucket", "imp/", "GZIP");+ ImportTableDescription desc = importDescription("bucket", "imp/", "GZIP");svc.runImport(desc, "Users", "us-east-1");@@ -4218,10 +4219,10 @@ class DynamoDbServiceTest {/** Checked against real DynamoDB: another account's bucket fails this way when no policy grants access. */@Testvoid runImport_bucketOfAnotherAccount_failsWithS3AccessDeniedWithoutReadingS3() {- var s3 = mock(S3Service.class);- var svc = serviceWithS3(s3, new InMemoryStorage<>());+ S3Service s3 = mock(S3Service.class);+ DynamoDbService svc = serviceWithS3(s3, new InMemoryStorage<>());createUsersTableInCreating(svc);- var desc = importDescription("bucket", "imp/", "NONE");+ ImportTableDescription desc = importDescription("bucket", "imp/", "NONE");((ObjectNode) desc.getS3BucketSource()).put("S3BucketOwner", "111111111111");svc.runImport(desc, "Users", "us-east-1");@@ -4235,10 +4236,10 @@ class DynamoDbServiceTest {@Testvoid runImport_bucketOwnerIsTheCaller_readsTheBucket() {- var object = s3Object("imp/data.json", "{\"Item\":{\"userId\":{\"S\":\"u1\"}}}\n".getBytes(StandardCharsets.UTF_8));- var svc = serviceWithS3(s3With(object), new InMemoryStorage<>());+ S3Object object = s3Object("imp/data.json", "{\"Item\":{\"userId\":{\"S\":\"u1\"}}}\n".getBytes(StandardCharsets.UTF_8));+ DynamoDbService svc = serviceWithS3(s3With(object), new InMemoryStorage<>());createUsersTableInCreating(svc);- var desc = importDescription("bucket", "imp/", "NONE");+ ImportTableDescription desc = importDescription("bucket", "imp/", "NONE");((ObjectNode) desc.getS3BucketSource()).put("S3BucketOwner", "000000000000");svc.runImport(desc, "Users", "us-east-1");@@ -4249,10 +4250,10 @@ class DynamoDbServiceTest {@Testvoid runImport_persistsLoadedItems() {- var object = s3Object("imp/data.json",+ S3Object object = s3Object("imp/data.json","{\"Item\":{\"userId\":{\"S\":\"u1\"}}}\n{\"Item\":{\"userId\":{\"S\":\"u2\"}}}\n".getBytes(StandardCharsets.UTF_8));- var itemStore = new InMemoryStorage<String, Map<String, JsonNode>>();- var svc = new DynamoDbService(new InMemoryStorage<>(), itemStore, null, new InMemoryStorage<>(),+ InMemoryStorage<String, Map<String, JsonNode>> itemStore = new InMemoryStorage<>();+ DynamoDbService svc = new DynamoDbService(new InMemoryStorage<>(), itemStore, null, new InMemoryStorage<>(),new RegionResolver("us-east-1", "000000000000"), null, null, s3With(object), mapper);createUsersTableInCreating(svc);@@ -4264,11 +4265,11 @@ class DynamoDbServiceTest {@Testvoid runImport_unreadableObject_isCountedAndTheRestIsLoaded() throws Exception {- var data = s3Object("imp/data.json.gz", gzip("{\"Item\":{\"userId\":{\"S\":\"u1\"}}}\n"));- var manifest = s3Object("imp/manifest-summary.json", "{}".getBytes(StandardCharsets.UTF_8));- var svc = serviceWithS3(s3With(data, manifest), new InMemoryStorage<>());+ S3Object data = s3Object("imp/data.json.gz", gzip("{\"Item\":{\"userId\":{\"S\":\"u1\"}}}\n"));+ S3Object manifest = s3Object("imp/manifest-summary.json", "{}".getBytes(StandardCharsets.UTF_8));+ DynamoDbService svc = serviceWithS3(s3With(data, manifest), new InMemoryStorage<>());createUsersTableInCreating(svc);- var desc = importDescription("bucket", "imp/", "GZIP");+ ImportTableDescription desc = importDescription("bucket", "imp/", "GZIP");svc.runImport(desc, "Users", "us-east-1");@@ -4280,12 +4281,12 @@ class DynamoDbServiceTest {@Testvoid runImport_malformedAttributeValue_isCountedNotFatal() {- var object = s3Object("imp/data.json",+ S3Object object = s3Object("imp/data.json",("{\"Item\":{\"userId\":{\"S\":\"u1\"},\"m\":{\"M\":\"not a map\"}}}\n"+ "{\"Item\":{\"userId\":{\"S\":\"u2\"}}}\n").getBytes(StandardCharsets.UTF_8));- var svc = serviceWithS3(s3With(object), new InMemoryStorage<>());+ DynamoDbService svc = serviceWithS3(s3With(object), new InMemoryStorage<>());createUsersTableInCreating(svc);- var desc = importDescription("bucket", "imp/", "NONE");+ ImportTableDescription desc = importDescription("bucket", "imp/", "NONE");svc.runImport(desc, "Users", "us-east-1");@@ -4296,12 +4297,12 @@ class DynamoDbServiceTest {@Testvoid runImport_missingBucket_failsWithS3NoSuchBucket() {- var s3 = mock(S3Service.class);+ S3Service s3 = mock(S3Service.class);when(s3.listObjects("missing", "imp/", null, Integer.MAX_VALUE)).thenThrow(new AwsException("NoSuchBucket", "The specified bucket does not exist.", 404));- var svc = serviceWithS3(s3, new InMemoryStorage<>());+ DynamoDbService svc = serviceWithS3(s3, new InMemoryStorage<>());createUsersTableInCreating(svc);- var desc = importDescription("missing", "imp/", "NONE");+ ImportTableDescription desc = importDescription("missing", "imp/", "NONE");svc.runImport(desc, "Users", "us-east-1");@@ -4313,12 +4314,12 @@ class DynamoDbServiceTest {@Testvoid runImport_otherS3Error_reportsAnS3FailureCode() {- var s3 = mock(S3Service.class);+ S3Service s3 = mock(S3Service.class);when(s3.listObjects("bucket", "imp/", null, Integer.MAX_VALUE)).thenThrow(new AwsException("AccessDenied", "Access Denied", 403));- var svc = serviceWithS3(s3, new InMemoryStorage<>());+ DynamoDbService svc = serviceWithS3(s3, new InMemoryStorage<>());createUsersTableInCreating(svc);- var desc = importDescription("bucket", "imp/", "NONE");+ ImportTableDescription desc = importDescription("bucket", "imp/", "NONE");svc.runImport(desc, "Users", "us-east-1");@@ -4330,7 +4331,7 @@ class DynamoDbServiceTest {void deleteTable_whileCreating_returnsResourceInUseException() {createUsersTableInCreating(service);- var e = assertThrows(AwsException.class, () -> service.deleteTable("Users", "us-east-1"));+ AwsException e = assertThrows(AwsException.class, () -> service.deleteTable("Users", "us-east-1"));assertEquals("ResourceInUseException", e.getErrorCode());assertEquals("CREATING", service.describeTable("Users", "us-east-1").getTableStatus());@@ -4340,14 +4341,14 @@ class DynamoDbServiceTest {void updateTable_whileCreating_returnsResourceInUseException() {createUsersTableInCreating(service);- var e = assertThrows(AwsException.class, () -> service.updateTable("Users", 10L, 10L, "us-east-1"));+ AwsException e = assertThrows(AwsException.class, () -> service.updateTable("Users", 10L, 10L, "us-east-1"));assertEquals("ResourceInUseException", e.getErrorCode());}@Testvoid validateImportRequest_rejectsUnsupportedFormatWithoutUnsupportedOperationWording() {- var e = assertThrows(AwsException.class,+ AwsException e = assertThrows(AwsException.class,() -> service.validateImportRequest(importRequest("Users", "CSV")));assertEquals("ValidationException", e.getErrorCode());@@ -4357,67 +4358,67 @@ class DynamoDbServiceTest {@Testvoid validateImportRequest_blankClientToken_returnsValidationException() {- var request = importRequest("Users", "DYNAMODB_JSON");+ ObjectNode request = importRequest("Users", "DYNAMODB_JSON");request.put("ClientToken", "");- var e = assertThrows(AwsException.class, () -> service.validateImportRequest(request));+ AwsException e = assertThrows(AwsException.class, () -> service.validateImportRequest(request));assertEquals("ValidationException", e.getErrorCode());}@Testvoid validateImportRequest_sameClientToken_returnsExistingImport() {- var importStore = new InMemoryStorage<String, ImportTableDescription>();- var request = importRequest("Users", "DYNAMODB_JSON");+ InMemoryStorage<String, ImportTableDescription> importStore = new InMemoryStorage<>();+ ObjectNode request = importRequest("Users", "DYNAMODB_JSON");request.put("ClientToken", "token-1");- var existing = importDescription("bucket", "imp/", "NONE");+ ImportTableDescription existing = importDescription("bucket", "imp/", "NONE");existing.setClientToken("token-1");existing.setInputFormat("DYNAMODB_JSON");existing.setTableCreationParameters(request.get("TableCreationParameters"));importStore.put(existing.getImportArn(), existing);- var svc = serviceWithS3(mock(S3Service.class), importStore);+ DynamoDbService svc = serviceWithS3(mock(S3Service.class), importStore);assertSame(existing, svc.validateImportRequest(request));}@Testvoid validateImportRequest_sameClientTokenDifferentParameters_returnsImportConflictException() {- var importStore = new InMemoryStorage<String, ImportTableDescription>();- var existing = importDescription("bucket", "imp/", "NONE");+ InMemoryStorage<String, ImportTableDescription> importStore = new InMemoryStorage<>();+ ImportTableDescription existing = importDescription("bucket", "imp/", "NONE");existing.setClientToken("token-1");existing.setInputFormat("DYNAMODB_JSON");existing.setTableCreationParameters(mapper.createObjectNode().put("TableName", "Users"));importStore.put(existing.getImportArn(), existing);- var svc = serviceWithS3(mock(S3Service.class), importStore);- var request = importRequest("Other", "DYNAMODB_JSON");+ DynamoDbService svc = serviceWithS3(mock(S3Service.class), importStore);+ ObjectNode request = importRequest("Other", "DYNAMODB_JSON");request.put("ClientToken", "token-1");- var e = assertThrows(AwsException.class, () -> svc.validateImportRequest(request));+ AwsException e = assertThrows(AwsException.class, () -> svc.validateImportRequest(request));assertEquals("ImportConflictException", e.getErrorCode());}@Testvoid listImports_pageSizeBelowOne_returnsValidationException() {- var svc = serviceWithS3(mock(S3Service.class), new InMemoryStorage<>());+ DynamoDbService svc = serviceWithS3(mock(S3Service.class), new InMemoryStorage<>());- var e = assertThrows(AwsException.class, () -> svc.listImports(null, 0, null));+ AwsException e = assertThrows(AwsException.class, () -> svc.listImports(null, 0, null));assertEquals("ValidationException", e.getErrorCode());}@Testvoid listImports_walksPagesByNextToken() {- var importStore = new InMemoryStorage<String, ImportTableDescription>();- for (var i = 1; i <= 3; i++) {- var desc = importDescription("bucket", "imp/", "NONE");+ InMemoryStorage<String, ImportTableDescription> importStore = new InMemoryStorage<>();+ for (int i = 1; i <= 3; i++) {+ ImportTableDescription desc = importDescription("bucket", "imp/", "NONE");desc.setImportArn("arn:aws:dynamodb:us-east-1:000000000000:table/Users/import/" + i + "-abc");importStore.put(desc.getImportArn(), desc);}- var svc = serviceWithS3(mock(S3Service.class), importStore);+ DynamoDbService svc = serviceWithS3(mock(S3Service.class), importStore);- var first = svc.listImports(null, 2, null);- var second = svc.listImports(null, 2, first.nextToken());+ DynamoDbService.ListImportsResult first = svc.listImports(null, 2, null);+ DynamoDbService.ListImportsResult second = svc.listImports(null, 2, first.nextToken());assertEquals(2, first.importSummaryList().size());assertNotNull(first.nextToken());@@ -4427,22 +4428,22 @@ class DynamoDbServiceTest {@Testvoid constructor_failsInterruptedJobsAndActivatesCreatingTables() {- var resolver = new RegionResolver("us-east-1", "000000000000");- var tables = new AccountAwareStorageBackend<TableDefinition>(new InMemoryStorage<>(), null, "000000000000");- var exports = new AccountAwareStorageBackend<ExportDescription>(new InMemoryStorage<>(), null, "000000000000");- var imports = new AccountAwareStorageBackend<ImportTableDescription>(new InMemoryStorage<>(), null, "000000000000");- var before = new DynamoDbService(tables, new InMemoryStorage<>(), exports, imports,+ RegionResolver resolver = new RegionResolver("us-east-1", "000000000000");+ AccountAwareStorageBackend<TableDefinition> tables = new AccountAwareStorageBackend<>(new InMemoryStorage<>(), null, "000000000000");+ AccountAwareStorageBackend<ExportDescription> exports = new AccountAwareStorageBackend<>(new InMemoryStorage<>(), null, "000000000000");+ AccountAwareStorageBackend<ImportTableDescription> imports = new AccountAwareStorageBackend<>(new InMemoryStorage<>(), null, "000000000000");+ DynamoDbService before = new DynamoDbService(tables, new InMemoryStorage<>(), exports, imports,resolver, null, null, mock(S3Service.class), mapper);createUsersTableInCreating(before);- var importDesc = importDescription("bucket", "imp/", "NONE");+ ImportTableDescription importDesc = importDescription("bucket", "imp/", "NONE");importDesc.setImportStatus("IN_PROGRESS");imports.put(importDesc.getImportArn(), importDesc);- var exportDesc = new ExportDescription();+ ExportDescription exportDesc = new ExportDescription();exportDesc.setExportArn("arn:aws:dynamodb:us-east-1:000000000000:table/Users/export/1-abc");exportDesc.setExportStatus("IN_PROGRESS");exports.put(exportDesc.getExportArn(), exportDesc);- var restarted = new DynamoDbService(tables, new InMemoryStorage<>(), exports, imports,+ DynamoDbService restarted = new DynamoDbService(tables, new InMemoryStorage<>(), exports, imports,resolver, null, null, mock(S3Service.class), mapper);assertEquals("ACTIVE", restarted.describeTable("Users", "us-east-1").getTableStatus());diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbTableArnIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbTableArnIntegrationTest.javaindex 87fe83163b..8b45a2feea 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbTableArnIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbTableArnIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.dynamodb;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;@@ -459,7 +460,7 @@ class DynamoDbTableArnIntegrationTest {}private static String createTable(String tableName, String authorization) {- var request = given()+ RequestSpecification request = given().header("X-Amz-Target", "DynamoDB_20120810.CreateTable").contentType(DYNAMODB_CONTENT_TYPE);if (authorization != null) {diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbWriteCapacityTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbWriteCapacityTest.javaindex 1afd676c03..7b242f03a6 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbWriteCapacityTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbWriteCapacityTest.java@@ -65,7 +65,7 @@ class DynamoDbWriteCapacityTest {@Testvoid insertChargesTableAndEveryIndexTheItemEnters() {- var cost = DynamoDbWriteCapacity.forWrite(table, null, fullItem());+ DynamoDbWriteCapacity.Cost cost = DynamoDbWriteCapacity.forWrite(table, null, fullItem());assertEquals(1.0, cost.table());assertEquals(Map.of("gsi-inc", 1.0), cost.gsi());assertEquals(Map.of("lsi1", 1.0), cost.lsi());@@ -74,10 +74,10 @@ class DynamoDbWriteCapacityTest {@Testvoid sparseInsertChargesNothingForTheIndexesItMisses() {- var sparse = item("""+ ObjectNode sparse = item("""{"pk": {"S": "p1"}, "sk": {"S": "1"}, "other": {"S": "o"}}""");- var cost = DynamoDbWriteCapacity.forWrite(table, null, sparse);+ DynamoDbWriteCapacity.Cost cost = DynamoDbWriteCapacity.forWrite(table, null, sparse);assertEquals(1.0, cost.total());assertTrue(cost.gsi().isEmpty(), "an item without gsiPk never enters the GSI");assertTrue(cost.lsi().isEmpty(), "an item without lsiSk never enters the LSI");@@ -85,7 +85,7 @@ class DynamoDbWriteCapacityTest {@Testvoid identicalOverwriteChargesNoIndexWritesAtAll() {- var cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), fullItem());+ DynamoDbWriteCapacity.Cost cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), fullItem());assertEquals(1.0, cost.table(), "the table write is still charged");assertTrue(cost.gsi().isEmpty());assertTrue(cost.lsi().isEmpty());@@ -93,11 +93,11 @@ class DynamoDbWriteCapacityTest {@Testvoid nonProjectedAttributeChangeChargesNothingOnTheIncludeIndex() {- var updated = fullItem();+ ObjectNode updated = fullItem();updated.set("other", item("""{"S": "o2"}"""));- var cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), updated);+ DynamoDbWriteCapacity.Cost cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), updated);assertTrue(cost.gsi().isEmpty(), "other is outside the INCLUDE projection");assertEquals(Map.of("lsi1", 1.0), cost.lsi());assertEquals(2.0, cost.total());@@ -105,11 +105,11 @@ class DynamoDbWriteCapacityTest {@Testvoid projectedAttributeChangeChargesOneIndexWrite() {- var updated = fullItem();+ ObjectNode updated = fullItem();updated.set("proj", item("""{"S": "p2"}"""));- var cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), updated);+ DynamoDbWriteCapacity.Cost cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), updated);assertEquals(Map.of("gsi-inc", 1.0), cost.gsi());assertEquals(Map.of("lsi1", 1.0), cost.lsi());assertEquals(3.0, cost.total());@@ -117,11 +117,11 @@ class DynamoDbWriteCapacityTest {@Testvoid indexKeyChangeChargesDeletePlusInsert() {- var moved = fullItem();+ ObjectNode moved = fullItem();moved.set("gsiPk", item("""{"S": "g-moved"}"""));- var cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), moved);+ DynamoDbWriteCapacity.Cost cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), moved);assertEquals(Map.of("gsi-inc", 2.0), cost.gsi());assertEquals(Map.of("lsi1", 1.0), cost.lsi());assertEquals(4.0, cost.total());@@ -129,9 +129,9 @@ class DynamoDbWriteCapacityTest {@Testvoid removingTheIndexKeyChargesDeleteOnly() {- var removed = fullItem();+ ObjectNode removed = fullItem();removed.remove("gsiPk");- var cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), removed);+ DynamoDbWriteCapacity.Cost cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), removed);assertEquals(Map.of("gsi-inc", 1.0), cost.gsi());assertEquals(Map.of("lsi1", 1.0), cost.lsi());assertEquals(3.0, cost.total());@@ -139,11 +139,11 @@ class DynamoDbWriteCapacityTest {@Testvoid lsiKeyChangeWalksTheSameLadder() {- var moved = fullItem();+ ObjectNode moved = fullItem();moved.set("lsiSk", item("""{"S": "L2"}"""));- var cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), moved);+ DynamoDbWriteCapacity.Cost cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), moved);assertTrue(cost.gsi().isEmpty(), "lsiSk is outside the GSI projection, its view never changed");assertEquals(Map.of("lsi1", 2.0), cost.lsi());assertEquals(3.0, cost.total());@@ -151,7 +151,7 @@ class DynamoDbWriteCapacityTest {@Testvoid deleteChargesOneWritePerIndexTheItemOccupied() {- var cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), null);+ DynamoDbWriteCapacity.Cost cost = DynamoDbWriteCapacity.forWrite(table, fullItem(), null);assertEquals(1.0, cost.table());assertEquals(Map.of("gsi-inc", 1.0), cost.gsi());assertEquals(Map.of("lsi1", 1.0), cost.lsi());@@ -160,17 +160,17 @@ class DynamoDbWriteCapacityTest {@Testvoid deleteOfAMissingItemStillChargesOneTableUnit() {- var cost = DynamoDbWriteCapacity.forWrite(table, null, null);+ DynamoDbWriteCapacity.Cost cost = DynamoDbWriteCapacity.forWrite(table, null, null);assertEquals(1.0, cost.total());}@Testvoid costPlusSumsTheTableAndMergesIndexArms() {- var indexed = DynamoDbWriteCapacity.forWrite(table, null, fullItem());- var sparse = DynamoDbWriteCapacity.forWrite(table, null, item("""+ DynamoDbWriteCapacity.Cost indexed = DynamoDbWriteCapacity.forWrite(table, null, fullItem());+ DynamoDbWriteCapacity.Cost sparse = DynamoDbWriteCapacity.forWrite(table, null, item("""{"pk": {"S": "p2"}, "sk": {"S": "1"}, "other": {"S": "o"}}"""));- var sum = DynamoDbWriteCapacity.Cost.zero().plus(indexed).plus(sparse);+ DynamoDbWriteCapacity.Cost sum = DynamoDbWriteCapacity.Cost.zero().plus(indexed).plus(sparse);assertEquals(2.0, sum.table());assertEquals(Map.of("gsi-inc", 1.0), sum.gsi());assertEquals(Map.of("lsi1", 1.0), sum.lsi());@@ -179,13 +179,13 @@ class DynamoDbWriteCapacityTest {@Testvoid tableUnitsFollowTheLargerImagePerKilobyte() {- var big = item("""+ ObjectNode big = item("""{"pk": {"S": "p1"}, "sk": {"S": "1"}}""");big.set("filler", item("""{"S": "%s"}""".formatted("x".repeat(2500))));- var cost = DynamoDbWriteCapacity.forWrite(table, big, fullItem());+ DynamoDbWriteCapacity.Cost cost = DynamoDbWriteCapacity.forWrite(table, big, fullItem());assertEquals(3.0, cost.table(), "the larger of the two images rounds up per 1KB");}diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/ExpressionEvaluatorTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/ExpressionEvaluatorTest.javaindex aed6eae6ee..e81ba2c692 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/ExpressionEvaluatorTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/ExpressionEvaluatorTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.dynamodb;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;import org.junit.jupiter.api.Nested;import org.junit.jupiter.api.Test;@@ -22,8 +23,8 @@ class ExpressionEvaluatorTest {@Testvoid standardExpression() {- var tokens = ExpressionEvaluator.tokenize("pk = :pk AND sk BETWEEN :a AND :b");- var types = tokens.stream().map(ExpressionEvaluator.Token::type).toList();+ List<ExpressionEvaluator.Token> tokens = ExpressionEvaluator.tokenize("pk = :pk AND sk BETWEEN :a AND :b");+ List<ExpressionEvaluator.TokenType> types = tokens.stream().map(ExpressionEvaluator.Token::type).toList();assertEquals(List.of(ExpressionEvaluator.TokenType.IDENTIFIER, // pkExpressionEvaluator.TokenType.EQ, // =@@ -40,8 +41,8 @@ class ExpressionEvaluatorTest {@Testvoid compactFormat() {- var tokens = ExpressionEvaluator.tokenize("(#f0 = :v0)AND(#f1 BETWEEN :v1 AND :v2)");- var types = tokens.stream().map(ExpressionEvaluator.Token::type).toList();+ List<ExpressionEvaluator.Token> tokens = ExpressionEvaluator.tokenize("(#f0 = :v0)AND(#f1 BETWEEN :v1 AND :v2)");+ List<ExpressionEvaluator.TokenType> types = tokens.stream().map(ExpressionEvaluator.Token::type).toList();assertEquals(List.of(ExpressionEvaluator.TokenType.LPAREN,ExpressionEvaluator.TokenType.NAME_REF, // #f0@@ -62,8 +63,8 @@ class ExpressionEvaluatorTest {@Testvoid allComparators() {- var tokens = ExpressionEvaluator.tokenize("a = b a <> b a < b a <= b a > b a >= b");- var comparators = tokens.stream()+ List<ExpressionEvaluator.Token> tokens = ExpressionEvaluator.tokenize("a = b a <> b a < b a <= b a > b a >= b");+ List<ExpressionEvaluator.TokenType> comparators = tokens.stream().map(ExpressionEvaluator.Token::type).filter(t -> t != ExpressionEvaluator.TokenType.IDENTIFIER && t != ExpressionEvaluator.TokenType.EOF).toList();@@ -79,8 +80,8 @@ class ExpressionEvaluatorTest {@Testvoid functionTokens() {- var tokens = ExpressionEvaluator.tokenize("attribute_exists(a) AND begins_with(b, :v) AND contains(c, :w) AND size(d) > :x AND attribute_not_exists(e)");- var functions = tokens.stream()+ List<ExpressionEvaluator.Token> tokens = ExpressionEvaluator.tokenize("attribute_exists(a) AND begins_with(b, :v) AND contains(c, :w) AND size(d) > :x AND attribute_not_exists(e)");+ List<String> functions = tokens.stream().filter(t -> t.type() == ExpressionEvaluator.TokenType.FUNCTION).map(ExpressionEvaluator.Token::value).toList();@@ -89,15 +90,15 @@ class ExpressionEvaluatorTest {@Testvoid inAndBetweenKeywords() {- var tokens = ExpressionEvaluator.tokenize("x IN (:a, :b) AND y BETWEEN :c AND :d");+ List<ExpressionEvaluator.Token> tokens = ExpressionEvaluator.tokenize("x IN (:a, :b) AND y BETWEEN :c AND :d");assertTrue(tokens.stream().anyMatch(t -> t.type() == ExpressionEvaluator.TokenType.IN));assertTrue(tokens.stream().anyMatch(t -> t.type() == ExpressionEvaluator.TokenType.BETWEEN));}@Testvoid dottedPath() {- var tokens = ExpressionEvaluator.tokenize("info.nested = :v");- var types = tokens.stream().map(ExpressionEvaluator.Token::type).toList();+ List<ExpressionEvaluator.Token> tokens = ExpressionEvaluator.tokenize("info.nested = :v");+ List<ExpressionEvaluator.TokenType> types = tokens.stream().map(ExpressionEvaluator.Token::type).toList();assertEquals(List.of(ExpressionEvaluator.TokenType.IDENTIFIER, // infoExpressionEvaluator.TokenType.DOT,@@ -116,87 +117,87 @@ class ExpressionEvaluatorTest {@Testvoid simpleComparison() {- var expr = ExpressionEvaluator.parse("pk = :pk");+ ExpressionEvaluator.Expr expr = ExpressionEvaluator.parse("pk = :pk");assertInstanceOf(ExpressionEvaluator.CompareExpr.class, expr);}@Testvoid andExpression() {- var expr = ExpressionEvaluator.parse("a = :a AND b = :b");+ ExpressionEvaluator.Expr expr = ExpressionEvaluator.parse("a = :a AND b = :b");assertInstanceOf(ExpressionEvaluator.AndExpr.class, expr);assertEquals(2, ((ExpressionEvaluator.AndExpr) expr).operands().size());}@Testvoid orExpression() {- var expr = ExpressionEvaluator.parse("a = :a OR b = :b");+ ExpressionEvaluator.Expr expr = ExpressionEvaluator.parse("a = :a OR b = :b");assertInstanceOf(ExpressionEvaluator.OrExpr.class, expr);assertEquals(2, ((ExpressionEvaluator.OrExpr) expr).operands().size());}@Testvoid notExpression() {- var expr = ExpressionEvaluator.parse("NOT a = :a");+ ExpressionEvaluator.Expr expr = ExpressionEvaluator.parse("NOT a = :a");assertInstanceOf(ExpressionEvaluator.NotExpr.class, expr);}@Testvoid nestedParens() {- var expr = ExpressionEvaluator.parse("(a = :a OR b = :b) AND c = :c");+ ExpressionEvaluator.Expr expr = ExpressionEvaluator.parse("(a = :a OR b = :b) AND c = :c");assertInstanceOf(ExpressionEvaluator.AndExpr.class, expr);- var and = (ExpressionEvaluator.AndExpr) expr;+ ExpressionEvaluator.AndExpr and = (ExpressionEvaluator.AndExpr) expr;assertInstanceOf(ExpressionEvaluator.OrExpr.class, and.operands().get(0));assertInstanceOf(ExpressionEvaluator.CompareExpr.class, and.operands().get(1));}@Testvoid betweenAndNotConfusedWithLogicalAnd() {- var expr = ExpressionEvaluator.parse("sk BETWEEN :a AND :b");+ ExpressionEvaluator.Expr expr = ExpressionEvaluator.parse("sk BETWEEN :a AND :b");assertInstanceOf(ExpressionEvaluator.BetweenExpr.class, expr);}@Testvoid betweenInsideAnd() {- var expr = ExpressionEvaluator.parse("pk = :pk AND sk BETWEEN :a AND :b");+ ExpressionEvaluator.Expr expr = ExpressionEvaluator.parse("pk = :pk AND sk BETWEEN :a AND :b");assertInstanceOf(ExpressionEvaluator.AndExpr.class, expr);- var and = (ExpressionEvaluator.AndExpr) expr;+ ExpressionEvaluator.AndExpr and = (ExpressionEvaluator.AndExpr) expr;assertInstanceOf(ExpressionEvaluator.CompareExpr.class, and.operands().get(0));assertInstanceOf(ExpressionEvaluator.BetweenExpr.class, and.operands().get(1));}@Testvoid inOperator() {- var expr = ExpressionEvaluator.parse("status IN (:a, :b, :c)");+ ExpressionEvaluator.Expr expr = ExpressionEvaluator.parse("status IN (:a, :b, :c)");assertInstanceOf(ExpressionEvaluator.InExpr.class, expr);assertEquals(3, ((ExpressionEvaluator.InExpr) expr).candidates().size());}@Testvoid inOperatorSingleValue() {- var expr = ExpressionEvaluator.parse("status IN (:a)");+ ExpressionEvaluator.Expr expr = ExpressionEvaluator.parse("status IN (:a)");assertInstanceOf(ExpressionEvaluator.InExpr.class, expr);assertEquals(1, ((ExpressionEvaluator.InExpr) expr).candidates().size());}@Testvoid functionCallCondition() {- var expr = ExpressionEvaluator.parse("attribute_exists(myAttr)");+ ExpressionEvaluator.Expr expr = ExpressionEvaluator.parse("attribute_exists(myAttr)");assertInstanceOf(ExpressionEvaluator.FunctionCallExpr.class, expr);}@Testvoid sizeComparison() {- var expr = ExpressionEvaluator.parse("size(myList) > :val");+ ExpressionEvaluator.Expr expr = ExpressionEvaluator.parse("size(myList) > :val");assertInstanceOf(ExpressionEvaluator.CompareExpr.class, expr);- var cmp = (ExpressionEvaluator.CompareExpr) expr;+ ExpressionEvaluator.CompareExpr cmp = (ExpressionEvaluator.CompareExpr) expr;assertInstanceOf(ExpressionEvaluator.FunctionOperand.class, cmp.left());}@Testvoid compactFormatParsesCorrectly() {- var expr = ExpressionEvaluator.parse("(#f0 = :v0)AND(#f1 BETWEEN :v1 AND :v2)");+ ExpressionEvaluator.Expr expr = ExpressionEvaluator.parse("(#f0 = :v0)AND(#f1 BETWEEN :v1 AND :v2)");assertInstanceOf(ExpressionEvaluator.AndExpr.class, expr);- var and = (ExpressionEvaluator.AndExpr) expr;+ ExpressionEvaluator.AndExpr and = (ExpressionEvaluator.AndExpr) expr;assertInstanceOf(ExpressionEvaluator.CompareExpr.class, and.operands().get(0));assertInstanceOf(ExpressionEvaluator.BetweenExpr.class, and.operands().get(1));}@@ -209,42 +210,42 @@ class ExpressionEvaluatorTest {@Testvoid pkAndSkEquals() {- var result = ExpressionEvaluator.splitKeyCondition("pk = :pk AND sk = :sk");+ String[] result = ExpressionEvaluator.splitKeyCondition("pk = :pk AND sk = :sk");assertEquals("pk = :pk", result[0]);assertEquals("sk = :sk", result[1]);}@Testvoid pkAndSkBetweenParenthesized() {- var result = ExpressionEvaluator.splitKeyCondition("pk = :pk AND (sk BETWEEN :a AND :b)");+ String[] result = ExpressionEvaluator.splitKeyCondition("pk = :pk AND (sk BETWEEN :a AND :b)");assertEquals("pk = :pk", result[0]);assertEquals("(sk BETWEEN :a AND :b)", result[1]);}@Testvoid compactFormat() {- var result = ExpressionEvaluator.splitKeyCondition("(#f0 = :v0)AND(#f1 BETWEEN :v1 AND :v2)");+ String[] result = ExpressionEvaluator.splitKeyCondition("(#f0 = :v0)AND(#f1 BETWEEN :v1 AND :v2)");assertEquals("(#f0 = :v0)", result[0]);assertEquals("(#f1 BETWEEN :v1 AND :v2)", result[1]);}@Testvoid pkOnly() {- var result = ExpressionEvaluator.splitKeyCondition("pk = :pk");+ String[] result = ExpressionEvaluator.splitKeyCondition("pk = :pk");assertEquals("pk = :pk", result[0]);assertNull(result[1]);}@Testvoid pkAndSkBeginsWith() {- var result = ExpressionEvaluator.splitKeyCondition("pk = :pk AND begins_with(sk, :prefix)");+ String[] result = ExpressionEvaluator.splitKeyCondition("pk = :pk AND begins_with(sk, :prefix)");assertEquals("pk = :pk", result[0]);assertEquals("begins_with(sk, :prefix)", result[1]);}@Testvoid pkAndSkBetweenNoParen() {- var result = ExpressionEvaluator.splitKeyCondition("pk = :pk AND sk BETWEEN :a AND :b");+ String[] result = ExpressionEvaluator.splitKeyCondition("pk = :pk AND sk BETWEEN :a AND :b");assertEquals("pk = :pk", result[0]);assertEquals("sk BETWEEN :a AND :b", result[1]);}@@ -279,43 +280,43 @@ class ExpressionEvaluatorTest {@Testvoid andBothTrue() throws Exception {- var i = item("{\"a\": {\"S\": \"1\"}, \"b\": {\"S\": \"2\"}}");- var v = values("{\n\":a\": {\"S\": \"1\"},\n\":b\": {\"S\": \"2\"}}");+ JsonNode i = item("{\"a\": {\"S\": \"1\"}, \"b\": {\"S\": \"2\"}}");+ JsonNode v = values("{\n\":a\": {\"S\": \"1\"},\n\":b\": {\"S\": \"2\"}}");assertTrue(ExpressionEvaluator.matches("a = :a AND b = :b", i, null, v));}@Testvoid andOneFalse() throws Exception {- var i = item("{\"a\": {\"S\": \"1\"}, \"b\": {\"S\": \"3\"}}");- var v = values("{\n\":a\": {\"S\": \"1\"},\n\":b\": {\"S\": \"2\"}}");+ JsonNode i = item("{\"a\": {\"S\": \"1\"}, \"b\": {\"S\": \"3\"}}");+ JsonNode v = values("{\n\":a\": {\"S\": \"1\"},\n\":b\": {\"S\": \"2\"}}");assertFalse(ExpressionEvaluator.matches("a = :a AND b = :b", i, null, v));}@Testvoid orOneTrue() throws Exception {- var i = item("{\"a\": {\"S\": \"1\"}, \"b\": {\"S\": \"3\"}}");- var v = values("{\n\":a\": {\"S\": \"1\"},\n\":b\": {\"S\": \"2\"}}");+ JsonNode i = item("{\"a\": {\"S\": \"1\"}, \"b\": {\"S\": \"3\"}}");+ JsonNode v = values("{\n\":a\": {\"S\": \"1\"},\n\":b\": {\"S\": \"2\"}}");assertTrue(ExpressionEvaluator.matches("a = :a OR b = :b", i, null, v));}@Testvoid orBothFalse() throws Exception {- var i = item("{\"a\": {\"S\": \"X\"}, \"b\": {\"S\": \"Y\"}}");- var v = values("{\n\":a\": {\"S\": \"1\"},\n\":b\": {\"S\": \"2\"}}");+ JsonNode i = item("{\"a\": {\"S\": \"X\"}, \"b\": {\"S\": \"Y\"}}");+ JsonNode v = values("{\n\":a\": {\"S\": \"1\"},\n\":b\": {\"S\": \"2\"}}");assertFalse(ExpressionEvaluator.matches("a = :a OR b = :b", i, null, v));}@Testvoid notTrue() throws Exception {- var i = item("{\"a\": {\"S\": \"X\"}}");- var v = values("{\n\":a\": {\"S\": \"1\"}}");+ JsonNode i = item("{\"a\": {\"S\": \"X\"}}");+ JsonNode v = values("{\n\":a\": {\"S\": \"1\"}}");assertTrue(ExpressionEvaluator.matches("NOT a = :a", i, null, v));}@Testvoid notFalse() throws Exception {- var i = item("{\"a\": {\"S\": \"1\"}}");- var v = values("{\n\":a\": {\"S\": \"1\"}}");+ JsonNode i = item("{\"a\": {\"S\": \"1\"}}");+ JsonNode v = values("{\n\":a\": {\"S\": \"1\"}}");assertFalse(ExpressionEvaluator.matches("NOT a = :a", i, null, v));}@@ -323,22 +324,22 @@ class ExpressionEvaluatorTest {@Testvoid stringEquals() throws Exception {- var i = item("{\"name\": {\"S\": \"Alice\"}}");- var v = values("{\n\":v\": {\"S\": \"Alice\"}}");+ JsonNode i = item("{\"name\": {\"S\": \"Alice\"}}");+ JsonNode v = values("{\n\":v\": {\"S\": \"Alice\"}}");assertTrue(ExpressionEvaluator.matches("name = :v", i, null, v));}@Testvoid stringNotEquals() throws Exception {- var i = item("{\"name\": {\"S\": \"Alice\"}}");- var v = values("{\n\":v\": {\"S\": \"Bob\"}}");+ JsonNode i = item("{\"name\": {\"S\": \"Alice\"}}");+ JsonNode v = values("{\n\":v\": {\"S\": \"Bob\"}}");assertTrue(ExpressionEvaluator.matches("name <> :v", i, null, v));}@Testvoid stringLessThan() throws Exception {- var i = item("{\"name\": {\"S\": \"Alice\"}}");- var v = values("{\n\":v\": {\"S\": \"Bob\"}}");+ JsonNode i = item("{\"name\": {\"S\": \"Alice\"}}");+ JsonNode v = values("{\n\":v\": {\"S\": \"Bob\"}}");assertTrue(ExpressionEvaluator.matches("name < :v", i, null, v));}@@ -346,22 +347,22 @@ class ExpressionEvaluatorTest {@Testvoid numberEquals() throws Exception {- var i = item("{\"age\": {\"N\": \"25\"}}");- var v = values("{\n\":v\": {\"N\": \"25\"}}");+ JsonNode i = item("{\"age\": {\"N\": \"25\"}}");+ JsonNode v = values("{\n\":v\": {\"N\": \"25\"}}");assertTrue(ExpressionEvaluator.matches("age = :v", i, null, v));}@Testvoid numberGreaterThan() throws Exception {- var i = item("{\"age\": {\"N\": \"30\"}}");- var v = values("{\n\":v\": {\"N\": \"25\"}}");+ JsonNode i = item("{\"age\": {\"N\": \"30\"}}");+ JsonNode v = values("{\n\":v\": {\"N\": \"25\"}}");assertTrue(ExpressionEvaluator.matches("age > :v", i, null, v));}@Testvoid numberLessThanOrEqual() throws Exception {- var i = item("{\"age\": {\"N\": \"25\"}}");- var v = values("{\n\":v\": {\"N\": \"25\"}}");+ JsonNode i = item("{\"age\": {\"N\": \"25\"}}");+ JsonNode v = values("{\n\":v\": {\"N\": \"25\"}}");assertTrue(ExpressionEvaluator.matches("age <= :v", i, null, v));}@@ -369,31 +370,31 @@ class ExpressionEvaluatorTest {@Testvoid boolNotEqualFalse() throws Exception {- var i = item("{\"active\": {\"BOOL\": \"false\"}}");- var v = values("{\n\":v\": {\"BOOL\": \"true\"}}");+ JsonNode i = item("{\"active\": {\"BOOL\": \"false\"}}");+ JsonNode v = values("{\n\":v\": {\"BOOL\": \"true\"}}");assertTrue(ExpressionEvaluator.matches("active <> :v", i, null, v));}@Testvoid boolNotEqualTrue() throws Exception {- var i = item("{\"active\": {\"BOOL\": \"true\"}}");- var v = values("{\n\":v\": {\"BOOL\": \"true\"}}");+ JsonNode i = item("{\"active\": {\"BOOL\": \"true\"}}");+ JsonNode v = values("{\n\":v\": {\"BOOL\": \"true\"}}");assertFalse(ExpressionEvaluator.matches("active <> :v", i, null, v));}@Testvoid missingAttributeNotEqual() throws Exception {// DynamoDB: missing <> val → true- var i = item("{\"other\": {\"S\": \"x\"}}");- var v = values("{\n\":v\": {\"BOOL\": \"true\"}}");+ JsonNode i = item("{\"other\": {\"S\": \"x\"}}");+ JsonNode v = values("{\n\":v\": {\"BOOL\": \"true\"}}");assertTrue(ExpressionEvaluator.matches("active <> :v", i, null, v));}@Testvoid missingAttributeEquals() throws Exception {// DynamoDB: missing = val → false- var i = item("{\"other\": {\"S\": \"x\"}}");- var v = values("{\n\":v\": {\"S\": \"hello\"}}");+ JsonNode i = item("{\"other\": {\"S\": \"x\"}}");+ JsonNode v = values("{\n\":v\": {\"S\": \"hello\"}}");assertFalse(ExpressionEvaluator.matches("name = :v", i, null, v));}@@ -401,29 +402,29 @@ class ExpressionEvaluatorTest {@Testvoid inWithNumbers() throws Exception {- var i = item("{\"status\": {\"N\": \"2\"}}");- var v = values("{\n\":a\": {\"N\": \"1\"},\n\":b\": {\"N\": \"2\"},\n\":c\": {\"N\": \"3\"}}");+ JsonNode i = item("{\"status\": {\"N\": \"2\"}}");+ JsonNode v = values("{\n\":a\": {\"N\": \"1\"},\n\":b\": {\"N\": \"2\"},\n\":c\": {\"N\": \"3\"}}");assertTrue(ExpressionEvaluator.matches("status IN (:a, :b, :c)", i, null, v));}@Testvoid inWithStrings() throws Exception {- var i = item("{\"color\": {\"S\": \"red\"}}");- var v = values("{\n\":a\": {\"S\": \"red\"},\n\":b\": {\"S\": \"blue\"}}");+ JsonNode i = item("{\"color\": {\"S\": \"red\"}}");+ JsonNode v = values("{\n\":a\": {\"S\": \"red\"},\n\":b\": {\"S\": \"blue\"}}");assertTrue(ExpressionEvaluator.matches("color IN (:a, :b)", i, null, v));}@Testvoid inNotMatching() throws Exception {- var i = item("{\"color\": {\"S\": \"green\"}}");- var v = values("{\n\":a\": {\"S\": \"red\"},\n\":b\": {\"S\": \"blue\"}}");+ JsonNode i = item("{\"color\": {\"S\": \"green\"}}");+ JsonNode v = values("{\n\":a\": {\"S\": \"red\"},\n\":b\": {\"S\": \"blue\"}}");assertFalse(ExpressionEvaluator.matches("color IN (:a, :b)", i, null, v));}@Testvoid inSingleValue() throws Exception {- var i = item("{\"status\": {\"S\": \"active\"}}");- var v = values("{\n\":a\": {\"S\": \"active\"}}");+ JsonNode i = item("{\"status\": {\"S\": \"active\"}}");+ JsonNode v = values("{\n\":a\": {\"S\": \"active\"}}");assertTrue(ExpressionEvaluator.matches("status IN (:a)", i, null, v));}@@ -431,15 +432,15 @@ class ExpressionEvaluatorTest {@Testvoid betweenStrings() throws Exception {- var i = item("{\"sk\": {\"S\": \"B\"}}");- var v = values("{\n\":low\": {\"S\": \"A\"},\n\":high\": {\"S\": \"C\"}}");+ JsonNode i = item("{\"sk\": {\"S\": \"B\"}}");+ JsonNode v = values("{\n\":low\": {\"S\": \"A\"},\n\":high\": {\"S\": \"C\"}}");assertTrue(ExpressionEvaluator.matches("sk BETWEEN :low AND :high", i, null, v));}@Testvoid betweenOutOfRange() throws Exception {- var i = item("{\"sk\": {\"S\": \"D\"}}");- var v = values("{\n\":low\": {\"S\": \"A\"},\n\":high\": {\"S\": \"C\"}}");+ JsonNode i = item("{\"sk\": {\"S\": \"D\"}}");+ JsonNode v = values("{\n\":low\": {\"S\": \"A\"},\n\":high\": {\"S\": \"C\"}}");assertFalse(ExpressionEvaluator.matches("sk BETWEEN :low AND :high", i, null, v));}@@ -447,37 +448,37 @@ class ExpressionEvaluatorTest {@Testvoid attributeExistsPresent() throws Exception {- var i = item("{\"name\": {\"S\": \"Alice\"}}");+ JsonNode i = item("{\"name\": {\"S\": \"Alice\"}}");assertTrue(ExpressionEvaluator.matches("attribute_exists(name)", i, null, null));}@Testvoid attributeExistsMissing() throws Exception {- var i = item("{\"other\": {\"S\": \"x\"}}");+ JsonNode i = item("{\"other\": {\"S\": \"x\"}}");assertFalse(ExpressionEvaluator.matches("attribute_exists(name)", i, null, null));}@Testvoid attributeNotExistsPresent() throws Exception {- var i = item("{\"name\": {\"S\": \"Alice\"}}");+ JsonNode i = item("{\"name\": {\"S\": \"Alice\"}}");assertFalse(ExpressionEvaluator.matches("attribute_not_exists(name)", i, null, null));}@Testvoid attributeNotExistsMissing() throws Exception {- var i = item("{\"other\": {\"S\": \"x\"}}");+ JsonNode i = item("{\"other\": {\"S\": \"x\"}}");assertTrue(ExpressionEvaluator.matches("attribute_not_exists(name)", i, null, null));}@Testvoid attributeExistsNested() throws Exception {- var i = item("{\"info\": {\"M\": {\"email\": {\"S\": \"[email protected]\"}}}}");+ JsonNode i = item("{\"info\": {\"M\": {\"email\": {\"S\": \"[email protected]\"}}}}");assertTrue(ExpressionEvaluator.matches("attribute_exists(info.email)", i, null, null));}@Testvoid attributeExistsNestedMissing() throws Exception {- var i = item("{\"info\": {\"M\": {\"name\": {\"S\": \"Alice\"}}}}");+ JsonNode i = item("{\"info\": {\"M\": {\"name\": {\"S\": \"Alice\"}}}}");assertFalse(ExpressionEvaluator.matches("attribute_exists(info.email)", i, null, null));}@@ -485,15 +486,15 @@ class ExpressionEvaluatorTest {@Testvoid beginsWithMatch() throws Exception {- var i = item("{\"sk\": {\"S\": \"USER#123\"}}");- var v = values("{\n\":prefix\": {\"S\": \"USER#\"}}");+ JsonNode i = item("{\"sk\": {\"S\": \"USER#123\"}}");+ JsonNode v = values("{\n\":prefix\": {\"S\": \"USER#\"}}");assertTrue(ExpressionEvaluator.matches("begins_with(sk, :prefix)", i, null, v));}@Testvoid beginsWithNoMatch() throws Exception {- var i = item("{\"sk\": {\"S\": \"ORDER#123\"}}");- var v = values("{\n\":prefix\": {\"S\": \"USER#\"}}");+ JsonNode i = item("{\"sk\": {\"S\": \"ORDER#123\"}}");+ JsonNode v = values("{\n\":prefix\": {\"S\": \"USER#\"}}");assertFalse(ExpressionEvaluator.matches("begins_with(sk, :prefix)", i, null, v));}@@ -501,29 +502,29 @@ class ExpressionEvaluatorTest {@Testvoid containsString() throws Exception {- var i = item("{\"desc\": {\"S\": \"hello world\"}}");- var v = values("{\n\":sub\": {\"S\": \"world\"}}");+ JsonNode i = item("{\"desc\": {\"S\": \"hello world\"}}");+ JsonNode v = values("{\n\":sub\": {\"S\": \"world\"}}");assertTrue(ExpressionEvaluator.matches("contains(desc, :sub)", i, null, v));}@Testvoid containsList() throws Exception {- var i = item("{\"tags\": {\"L\": [{\"S\": \"a\"}, {\"S\": \"b\"}, {\"S\": \"c\"}]}}");- var v = values("{\n\":val\": {\"S\": \"b\"}}");+ JsonNode i = item("{\"tags\": {\"L\": [{\"S\": \"a\"}, {\"S\": \"b\"}, {\"S\": \"c\"}]}}");+ JsonNode v = values("{\n\":val\": {\"S\": \"b\"}}");assertTrue(ExpressionEvaluator.matches("contains(tags, :val)", i, null, v));}@Testvoid containsStringSet() throws Exception {- var i = item("{\"tags\": {\"SS\": [\"a\", \"b\", \"c\"]}}");- var v = values("{\n\":val\": {\"S\": \"b\"}}");+ JsonNode i = item("{\"tags\": {\"SS\": [\"a\", \"b\", \"c\"]}}");+ JsonNode v = values("{\n\":val\": {\"S\": \"b\"}}");assertTrue(ExpressionEvaluator.matches("contains(tags, :val)", i, null, v));}@Testvoid containsNumberSet() throws Exception {- var i = item("{\"nums\": {\"NS\": [\"1\", \"2\", \"3\"]}}");- var v = values("{\n\":val\": {\"N\": \"2\"}}");+ JsonNode i = item("{\"nums\": {\"NS\": [\"1\", \"2\", \"3\"]}}");+ JsonNode v = values("{\n\":val\": {\"N\": \"2\"}}");assertTrue(ExpressionEvaluator.matches("contains(nums, :val)", i, null, v));}@@ -531,9 +532,9 @@ class ExpressionEvaluatorTest {@Testvoid expressionAttributeNames() throws Exception {- var i = item("{\"status\": {\"S\": \"active\"}}");- var v = values("{\n\":v\": {\"S\": \"active\"}}");- var n = names("{\"#s\": \"status\"}");+ JsonNode i = item("{\"status\": {\"S\": \"active\"}}");+ JsonNode v = values("{\n\":v\": {\"S\": \"active\"}}");+ JsonNode n = names("{\"#s\": \"status\"}");assertTrue(ExpressionEvaluator.matches("#s = :v", i, n, v));}@@ -542,8 +543,8 @@ class ExpressionEvaluatorTest {@Testvoid nestedParentheses() throws Exception {// ((a = :1 OR b = :2) AND c = :3) OR d = :4- var i = item("{\"a\": {\"S\": \"X\"}, \"b\": {\"S\": \"Y\"}, \"c\": {\"S\": \"3\"}, \"d\": {\"S\": \"4\"}}");- var v = values("{\n\":1\": {\"S\": \"1\"},\n\":2\": {\"S\": \"2\"},\n\":3\": {\"S\": \"3\"},\n\":4\": {\"S\": \"4\"}}");+ JsonNode i = item("{\"a\": {\"S\": \"X\"}, \"b\": {\"S\": \"Y\"}, \"c\": {\"S\": \"3\"}, \"d\": {\"S\": \"4\"}}");+ JsonNode v = values("{\n\":1\": {\"S\": \"1\"},\n\":2\": {\"S\": \"2\"},\n\":3\": {\"S\": \"3\"},\n\":4\": {\"S\": \"4\"}}");// a!=1, b!=2 so inner OR is false, AND c=3 doesn't matter (false AND true = false)// d=4 so outer OR is trueassertTrue(ExpressionEvaluator.matches("((a = :1 OR b = :2) AND c = :3) OR d = :4", i, null, v));@@ -551,8 +552,8 @@ class ExpressionEvaluatorTest {@Testvoid nestedParenthesesAllFalse() throws Exception {- var i = item("{\"a\": {\"S\": \"X\"}, \"b\": {\"S\": \"Y\"}, \"c\": {\"S\": \"3\"}, \"d\": {\"S\": \"Z\"}}");- var v = values("{\n\":1\": {\"S\": \"1\"},\n\":2\": {\"S\": \"2\"},\n\":3\": {\"S\": \"3\"},\n\":4\": {\"S\": \"4\"}}");+ JsonNode i = item("{\"a\": {\"S\": \"X\"}, \"b\": {\"S\": \"Y\"}, \"c\": {\"S\": \"3\"}, \"d\": {\"S\": \"Z\"}}");+ JsonNode v = values("{\n\":1\": {\"S\": \"1\"},\n\":2\": {\"S\": \"2\"},\n\":3\": {\"S\": \"3\"},\n\":4\": {\"S\": \"4\"}}");assertFalse(ExpressionEvaluator.matches("((a = :1 OR b = :2) AND c = :3) OR d = :4", i, null, v));}@@ -560,9 +561,9 @@ class ExpressionEvaluatorTest {@Testvoid compactFormatEvaluation() throws Exception {- var i = item("{\"pk\": {\"S\": \"USER#1\"}, \"sk\": {\"S\": \"B\"}}");- var v = values("{\n\":v0\": {\"S\": \"USER#1\"},\n\":v1\": {\"S\": \"A\"},\n\":v2\": {\"S\": \"C\"}}");- var n = names("{\"#f0\": \"pk\", \"#f1\": \"sk\"}");+ JsonNode i = item("{\"pk\": {\"S\": \"USER#1\"}, \"sk\": {\"S\": \"B\"}}");+ JsonNode v = values("{\n\":v0\": {\"S\": \"USER#1\"},\n\":v1\": {\"S\": \"A\"},\n\":v2\": {\"S\": \"C\"}}");+ JsonNode n = names("{\"#f0\": \"pk\", \"#f1\": \"sk\"}");assertTrue(ExpressionEvaluator.matches("(#f0 = :v0)AND(#f1 BETWEEN :v1 AND :v2)", i, n, v));}@@ -570,13 +571,13 @@ class ExpressionEvaluatorTest {@Testvoid nullExpressionMatchesAll() throws Exception {- var i = item("{\"a\": {\"S\": \"1\"}}");+ JsonNode i = item("{\"a\": {\"S\": \"1\"}}");assertTrue(ExpressionEvaluator.matches(null, i, null, null));}@Testvoid blankExpressionMatchesAll() throws Exception {- var i = item("{\"a\": {\"S\": \"1\"}}");+ JsonNode i = item("{\"a\": {\"S\": \"1\"}}");assertTrue(ExpressionEvaluator.matches(" ", i, null, null));}}@@ -605,12 +606,12 @@ class ExpressionEvaluatorTest {@Testvoid reversedBetweenBoundsAreRejectedAtParseTime() {- var mapper = new ObjectMapper();- var values = mapper.createObjectNode();+ ObjectMapper mapper = new ObjectMapper();+ ObjectNode values = mapper.createObjectNode();values.set(":hi", mapper.createObjectNode().put("N", "10"));values.set(":lo", mapper.createObjectNode().put("N", "1"));- var e = assertThrows(AwsException.class, () ->+ AwsException e = assertThrows(AwsException.class, () ->ExpressionEvaluator.validateExpression("n BETWEEN :hi AND :lo","ConditionExpression", null, values));assertEquals("ValidationException", e.getErrorCode());@@ -624,19 +625,19 @@ class ExpressionEvaluatorTest {// their UTF-8 bytes. Java's UTF-16 ordering puts them the other way round.@Testvoid stringBoundsAreOrderedByUtf8Bytes() {- var mapper = new ObjectMapper();- var values = mapper.createObjectNode();+ ObjectMapper mapper = new ObjectMapper();+ ObjectNode values = mapper.createObjectNode();values.set(":lo", mapper.createObjectNode().put("S", "\uE000"));values.set(":hi", mapper.createObjectNode().put("S", "\uD800\uDC00"));assertDoesNotThrow(() -> ExpressionEvaluator.validateExpression("n BETWEEN :lo AND :hi","ConditionExpression", null, values));- var reversed = mapper.createObjectNode();+ ObjectNode reversed = mapper.createObjectNode();reversed.set(":lo", mapper.createObjectNode().put("S", "\uD800\uDC00"));reversed.set(":hi", mapper.createObjectNode().put("S", "\uE000"));- var e = assertThrows(AwsException.class, () ->+ AwsException e = assertThrows(AwsException.class, () ->ExpressionEvaluator.validateExpression("n BETWEEN :lo AND :hi","ConditionExpression", null, reversed));assertEquals("ValidationException", e.getErrorCode());@@ -647,21 +648,21 @@ class ExpressionEvaluatorTest {// SerializationException before any comparison happens.@Testvoid binaryBoundsCompareByBytesAndRejectMalformedBase64() {- var mapper = new ObjectMapper();- var reversed = mapper.createObjectNode();+ ObjectMapper mapper = new ObjectMapper();+ ObjectNode reversed = mapper.createObjectNode();reversed.set(":lo", mapper.createObjectNode().put("B", "/w=="));reversed.set(":hi", mapper.createObjectNode().put("B", "AA=="));- var e = assertThrows(AwsException.class, () ->+ AwsException e = assertThrows(AwsException.class, () ->ExpressionEvaluator.validateExpression("n BETWEEN :lo AND :hi","ConditionExpression", null, reversed));assertEquals("ValidationException", e.getErrorCode());- var malformed = mapper.createObjectNode();+ ObjectNode malformed = mapper.createObjectNode();malformed.set(":lo", mapper.createObjectNode().put("B", "!!!not-base64!!!"));malformed.set(":hi", mapper.createObjectNode().put("B", "@@@@"));- var serialization = assertThrows(AwsException.class, () ->+ AwsException serialization = assertThrows(AwsException.class, () ->ExpressionEvaluator.validateExpression("n BETWEEN :lo AND :hi","ConditionExpression", null, malformed));assertEquals("SerializationException", serialization.getErrorCode());@@ -673,10 +674,10 @@ class ExpressionEvaluatorTest {// SerializationException, so the comparison itself must never decode blindly.@Testvoid binaryComparisonRejectsMalformedBase64() {- var valid = mapper.createObjectNode().put("B", "AQID");- var malformed = mapper.createObjectNode().put("B", "not base64!!");+ ObjectNode valid = mapper.createObjectNode().put("B", "AQID");+ ObjectNode malformed = mapper.createObjectNode().put("B", "not base64!!");- var e = assertThrows(AwsException.class,+ AwsException e = assertThrows(AwsException.class,() -> ExpressionEvaluator.compareAttributeValues(valid, malformed));assertEquals("SerializationException", e.getErrorCode());assertEquals(400, e.getHttpStatus());@@ -685,12 +686,12 @@ class ExpressionEvaluatorTest {// A FilterExpression carries the same text without the envelope on AWS.@Testvoid filterExpressionReportsTheReversedBoundsWithoutTheEnvelope() {- var mapper = new ObjectMapper();- var values = mapper.createObjectNode();+ ObjectMapper mapper = new ObjectMapper();+ ObjectNode values = mapper.createObjectNode();values.set(":hi", mapper.createObjectNode().put("N", "10"));values.set(":lo", mapper.createObjectNode().put("N", "1"));- var e = assertThrows(AwsException.class, () ->+ AwsException e = assertThrows(AwsException.class, () ->ExpressionEvaluator.validateExpression("n BETWEEN :hi AND :lo","FilterExpression", null, values));assertEquals("Invalid FilterExpression: The BETWEEN operator requires upper bound to be "@@ -700,8 +701,8 @@ class ExpressionEvaluatorTest {@Testvoid orderedBetweenBoundsAreAccepted() {- var mapper = new ObjectMapper();- var values = mapper.createObjectNode();+ ObjectMapper mapper = new ObjectMapper();+ ObjectNode values = mapper.createObjectNode();values.set(":lo", mapper.createObjectNode().put("N", "1"));values.set(":hi", mapper.createObjectNode().put("N", "10"));diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/NativeDynamoDbJsonHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/NativeDynamoDbJsonHandlerTest.javaindex 5c743fb980..cfd779af4a 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/NativeDynamoDbJsonHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/NativeDynamoDbJsonHandlerTest.java@@ -631,14 +631,14 @@ class NativeDynamoDbJsonHandlerTest {}private AwsException expectValidationException(String action, JsonNode request) {- var ex = assertThrows(AwsException.class, () -> handler.handle(action, request, "eu-west-1"));+ AwsException ex = assertThrows(AwsException.class, () -> handler.handle(action, request, "eu-west-1"));assertEquals("ValidationException", ex.getErrorCode());return ex;}@Testvoid createTableRejectsProvisionedThroughputWithPayPerRequest() {- var ex = expectValidationException("CreateTable", json("""+ AwsException ex = expectValidationException("CreateTable", json("""{"TableName": "PprTable","KeySchema": [{"AttributeName": "pk", "KeyType": "HASH"}],@@ -653,7 +653,7 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid createTableRejectsGsiIncludeProjectionWithoutNonKeyAttributes() {- var ex = expectValidationException("CreateTable", json("""+ AwsException ex = expectValidationException("CreateTable", json("""{"TableName": "GsiIncTable","KeySchema": [{"AttributeName": "pk", "KeyType": "HASH"}],@@ -675,7 +675,7 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid createTableRejectsLsiIncludeProjectionWithoutNonKeyAttributes() {- var ex = expectValidationException("CreateTable", json("""+ AwsException ex = expectValidationException("CreateTable", json("""{"TableName": "LsiIncTable","KeySchema": [@@ -704,7 +704,7 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid createTableRejectsKeysOnlyProjectionCarryingNonKeyAttributes() {- var ex = expectValidationException("CreateTable", json("""+ AwsException ex = expectValidationException("CreateTable", json("""{"TableName": "KeysOnlyTable","KeySchema": [{"AttributeName": "pk", "KeyType": "HASH"}],@@ -727,7 +727,7 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateTableRejectsGsiIncludeProjectionWithoutNonKeyAttributes() {createUsersTable("eu-west-1");- var ex = expectValidationException("UpdateTable", json("""+ AwsException ex = expectValidationException("UpdateTable", json("""{"TableName": "Users","AttributeDefinitions": [{"AttributeName": "g", "AttributeType": "S"}],@@ -746,7 +746,7 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateTableRejectsAllProjectionCarryingNonKeyAttributes() {createUsersTable("eu-west-1");- var ex = expectValidationException("UpdateTable", json("""+ AwsException ex = expectValidationException("UpdateTable", json("""{"TableName": "Users","AttributeDefinitions": [{"AttributeName": "g", "AttributeType": "S"}],@@ -905,7 +905,7 @@ class NativeDynamoDbJsonHandlerTest {// Checked against real DynamoDB: the projection is validated before the table lookup.@Testvoid updateTableValidatesGsiProjectionBeforeTableLookup() {- var ex = expectValidationException("UpdateTable", json("""+ AwsException ex = expectValidationException("UpdateTable", json("""{"TableName": "NoSuchTable","AttributeDefinitions": [{"AttributeName": "g", "AttributeType": "S"}],@@ -923,7 +923,7 @@ class NativeDynamoDbJsonHandlerTest {// The empty-list, null, and index-position cases below were checked against real DynamoDB.@Testvoid createTableRejectsEmptyGsiNonKeyAttributesWithItsPosition() {- var ex = expectValidationException("CreateTable", json("""+ AwsException ex = expectValidationException("CreateTable", json("""{"TableName": "EmptyGsiNonKey","KeySchema": [{"AttributeName": "pk", "KeyType": "HASH"}],@@ -953,7 +953,7 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid createTableRejectsEmptyLsiNonKeyAttributes() {- var ex = expectValidationException("CreateTable", json("""+ AwsException ex = expectValidationException("CreateTable", json("""{"TableName": "EmptyLsiNonKey","KeySchema": [@@ -984,7 +984,7 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateTableRejectsEmptyGsiNonKeyAttributesBeforeProjectionTypeCheck() {createUsersTable("eu-west-1");- var ex = expectValidationException("UpdateTable", json("""+ AwsException ex = expectValidationException("UpdateTable", json("""{"TableName": "Users","AttributeDefinitions": [{"AttributeName": "g", "AttributeType": "S"}],@@ -1019,13 +1019,13 @@ class NativeDynamoDbJsonHandlerTest {}"""), "eu-west-1");assertEquals(200, response.getStatus());- var gsi = service.describeTable("NullNonKey", "eu-west-1").findGsi("gsi1").orElseThrow();+ GlobalSecondaryIndex gsi = service.describeTable("NullNonKey", "eu-west-1").findGsi("gsi1").orElseThrow();assertEquals("KEYS_ONLY", gsi.getProjectionType());}@Testvoid createTableRejectsStreamViewTypeWithStreamEnabledFalse() {- var ex = expectValidationException("CreateTable", json("""+ AwsException ex = expectValidationException("CreateTable", json("""{"TableName": "StreamFalseTable","KeySchema": [{"AttributeName": "pk", "KeyType": "HASH"}],@@ -1040,7 +1040,7 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid scanRejectsTotalSegmentsAboveTheMaximum() {- var ex = expectValidationException("Scan", json("""+ AwsException ex = expectValidationException("Scan", json("""{"TableName": "Users", "Segment": 0, "TotalSegments": 1000001}"""));assertEquals("1 validation error detected: Value '1000001' at 'totalSegments' failed to "@@ -1050,7 +1050,7 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateItemRejectsExpressionAttributeNamesWithNoExpression() {createUsersTable("eu-west-1");- var ex = expectValidationException("UpdateItem", json("""+ AwsException ex = expectValidationException("UpdateItem", json("""{"TableName": "Users","Key": {"userId": {"S": "u1"}},@@ -1063,7 +1063,7 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid scanRejectsANegativeSegment() {- var ex = expectValidationException("Scan", json("""+ AwsException ex = expectValidationException("Scan", json("""{"TableName": "Users", "Segment": -1, "TotalSegments": 4}"""));assertEquals("1 validation error detected: Value '-1' at 'segment' failed to satisfy constraint: "@@ -1072,7 +1072,7 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid scanRejectsTotalSegmentsBelowOne() {- var ex = expectValidationException("Scan", json("""+ AwsException ex = expectValidationException("Scan", json("""{"TableName": "Users", "Segment": 0, "TotalSegments": 0}"""));assertEquals("1 validation error detected: Value '0' at 'totalSegments' failed to satisfy constraint: "@@ -1081,7 +1081,7 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid scanReportsTotalSegmentsBeforeSegmentWhenBothAreOutOfRange() {- var ex = expectValidationException("Scan", json("""+ AwsException ex = expectValidationException("Scan", json("""{"TableName": "Users", "Segment": -1, "TotalSegments": 0}"""));assertEquals("2 validation errors detected: "@@ -1095,7 +1095,7 @@ class NativeDynamoDbJsonHandlerTest {void scanAcceptsSegmentsAtTheBounds() throws Exception {createUsersTable("eu-west-1");- var response = handler.handle("Scan", json("""+ Response response = handler.handle("Scan", json("""{"TableName": "Users", "Segment": 0, "TotalSegments": 1000000}"""), "eu-west-1");assertEquals(200, response.getStatus());@@ -1113,16 +1113,16 @@ class NativeDynamoDbJsonHandlerTest {int totalSegments = 10;int totalDeleted = 0;for (int segment = 0; segment < totalSegments; segment++) {- var scanReq = mapper.createObjectNode();+ ObjectNode scanReq = mapper.createObjectNode();scanReq.put("TableName", "Users");scanReq.put("Segment", segment);scanReq.put("TotalSegments", totalSegments);- var response = handler.handle("Scan", scanReq, region);+ Response response = handler.handle("Scan", scanReq, region);assertEquals(200, response.getStatus());- var entity = mapper.readTree(response.getEntity().toString());- var items = entity.get("Items");- for (var item : items) {+ JsonNode entity = mapper.readTree(response.getEntity().toString());+ JsonNode items = entity.get("Items");+ for (JsonNode item : items) {totalDeleted++;String key = item.get("userId").get("S").asText();service.deleteItem("Users", item("userId", key), region);@@ -1131,10 +1131,10 @@ class NativeDynamoDbJsonHandlerTest {assertEquals(10, totalDeleted, "All 10 items should have been returned and deleted across segments");- var checkResponse = handler.handle("Scan", json("""+ Response checkResponse = handler.handle("Scan", json("""{"TableName": "Users", "Select": "COUNT"}"""), region);- var checkEntity = mapper.readTree(checkResponse.getEntity().toString());+ JsonNode checkEntity = mapper.readTree(checkResponse.getEntity().toString());assertEquals(0, checkEntity.get("Count").asInt(), "No remaining items should be in the table");}@@ -1152,7 +1152,7 @@ class NativeDynamoDbJsonHandlerTest {for (int segment = 0; segment < totalSegments; segment++) {JsonNode exclusiveStartKey = null;do {- var scanReq = mapper.createObjectNode();+ ObjectNode scanReq = mapper.createObjectNode();scanReq.put("TableName", "Users");scanReq.put("Segment", segment);scanReq.put("TotalSegments", totalSegments);@@ -1161,12 +1161,12 @@ class NativeDynamoDbJsonHandlerTest {scanReq.set("ExclusiveStartKey", exclusiveStartKey);}- var response = handler.handle("Scan", scanReq, region);+ Response response = handler.handle("Scan", scanReq, region);assertEquals(200, response.getStatus());- var entity = mapper.readTree(response.getEntity().toString());- var items = entity.get("Items");+ JsonNode entity = mapper.readTree(response.getEntity().toString());+ JsonNode items = entity.get("Items");assertTrue(items.size() <= 2, "Page size must not exceed limit");- for (var item : items) {+ for (JsonNode item : items) {String key = item.get("userId").get("S").asText();assertTrue(collectedKeys.add(key), "Item must not be returned multiple times: " + key);}@@ -1190,15 +1190,15 @@ class NativeDynamoDbJsonHandlerTest {int sumCount = 0;int sumScannedCount = 0;for (int segment = 0; segment < totalSegments; segment++) {- var scanReq = mapper.createObjectNode();+ ObjectNode scanReq = mapper.createObjectNode();scanReq.put("TableName", "Users");scanReq.put("Segment", segment);scanReq.put("TotalSegments", totalSegments);scanReq.put("Select", "COUNT");- var response = handler.handle("Scan", scanReq, region);+ Response response = handler.handle("Scan", scanReq, region);assertEquals(200, response.getStatus());- var entity = mapper.readTree(response.getEntity().toString());+ JsonNode entity = mapper.readTree(response.getEntity().toString());sumCount += entity.get("Count").asInt();sumScannedCount += entity.get("ScannedCount").asInt();}@@ -1230,16 +1230,16 @@ class NativeDynamoDbJsonHandlerTest {userSegments.put("bob", new HashSet<>());for (int segment = 0; segment < totalSegments; segment++) {- var scanReq = mapper.createObjectNode();+ ObjectNode scanReq = mapper.createObjectNode();scanReq.put("TableName", "Orders");scanReq.put("Segment", segment);scanReq.put("TotalSegments", totalSegments);- var response = handler.handle("Scan", scanReq, region);+ Response response = handler.handle("Scan", scanReq, region);assertEquals(200, response.getStatus());- var entity = mapper.readTree(response.getEntity().toString());- var items = entity.get("Items");- for (var item : items) {+ JsonNode entity = mapper.readTree(response.getEntity().toString());+ JsonNode items = entity.get("Items");+ for (JsonNode item : items) {String userId = item.get("userId").get("S").asText();userSegments.get(userId).add(segment);}@@ -1250,7 +1250,7 @@ class NativeDynamoDbJsonHandlerTest {}private ObjectNode updateUserRequest() {- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.put("TableName", "Users");request.set("Key", mapper.createObjectNode().set("userId", attributeValue("S", "u1")));return request;@@ -1259,26 +1259,26 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateItemUpdatedNewReturnsOnlyTheChangedMapFragment() throws Exception {createUsersTable("eu-west-1");- var parent = mapper.createObjectNode();+ ObjectNode parent = mapper.createObjectNode();parent.set("keep", attributeValue("S", "k"));parent.set("child", attributeValue("S", "old"));- var putRequest = mapper.createObjectNode();+ ObjectNode putRequest = mapper.createObjectNode();putRequest.put("TableName", "Users");- var item = mapper.createObjectNode();+ ObjectNode item = mapper.createObjectNode();item.set("userId", attributeValue("S", "u1"));item.set("parent", mapper.createObjectNode().set("M", parent));putRequest.set("Item", item);handler.handle("PutItem", putRequest, "eu-west-1");- var request = updateUserRequest();+ ObjectNode request = updateUserRequest();request.put("UpdateExpression", "SET parent.child = :v");request.set("ExpressionAttributeValues",mapper.createObjectNode().set(":v", attributeValue("S", "new")));request.put("ReturnValues", "UPDATED_NEW");- var response = handler.handle("UpdateItem", request, "eu-west-1");- var body = mapper.convertValue(response.getEntity(), JsonNode.class);- var attributes = body.get("Attributes");+ Response response = handler.handle("UpdateItem", request, "eu-west-1");+ JsonNode body = mapper.convertValue(response.getEntity(), JsonNode.class);+ JsonNode attributes = body.get("Attributes");assertEquals("new", attributes.get("parent").get("M").get("child").get("S").asText());assertFalse(attributes.get("parent").get("M").has("keep"));}@@ -1286,31 +1286,31 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateItemRemoveWithUpdatedNewOmitsAttributes() throws Exception {createUsersTable("eu-west-1");- var putRequest = mapper.createObjectNode();+ ObjectNode putRequest = mapper.createObjectNode();putRequest.put("TableName", "Users");- var item = mapper.createObjectNode();+ ObjectNode item = mapper.createObjectNode();item.set("userId", attributeValue("S", "u1"));item.set("y", attributeValue("S", "drop"));putRequest.set("Item", item);handler.handle("PutItem", putRequest, "eu-west-1");- var request = updateUserRequest();+ ObjectNode request = updateUserRequest();request.put("UpdateExpression", "REMOVE y");request.put("ReturnValues", "UPDATED_NEW");- var response = handler.handle("UpdateItem", request, "eu-west-1");- var body = mapper.convertValue(response.getEntity(), JsonNode.class);+ Response response = handler.handle("UpdateItem", request, "eu-west-1");+ JsonNode body = mapper.convertValue(response.getEntity(), JsonNode.class);assertFalse(body.has("Attributes"));}@Testvoid updateItemReportsOnlyTheFirstInvalidEnum() {createUsersTable("eu-west-1");- var request = updateUserRequest();+ ObjectNode request = updateUserRequest();request.put("ReturnValues", "INVALID");request.put("ReturnConsumedCapacity", "INVALID");- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("UpdateItem", request, "eu-west-1"));assertEquals("ValidationException", ex.getErrorCode());assertTrue(ex.getMessage().startsWith("1 validation error detected:"), ex.getMessage());@@ -1327,12 +1327,12 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateItemRejectsAnUpdateExpressionOver4096BytesBeforeTheTableLookup() {- var request = updateUserRequest();+ ObjectNode request = updateUserRequest();request.put("TableName", "Missing");request.put("UpdateExpression", "SET " + nameOfBytes(4088) + " = :v");request.set("ExpressionAttributeValues", singleValue(":v"));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("UpdateItem", request, "eu-west-1"));assertEquals("ValidationException", ex.getErrorCode());assertEquals("1 validation error detected: Invalid UpdateExpression: "@@ -1342,11 +1342,11 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateItemAcceptsAnUpdateExpressionOfExactly4096Bytes() throws Exception {createUsersTable("eu-west-1");- var request = updateUserRequest();+ ObjectNode request = updateUserRequest();request.put("UpdateExpression", "SET " + nameOfBytes(4087) + " = :v");request.set("ExpressionAttributeValues", singleValue(":v"));- var response = handler.handle("UpdateItem", request, "eu-west-1");+ Response response = handler.handle("UpdateItem", request, "eu-west-1");assertEquals(200, response.getStatus());}@@ -1370,12 +1370,12 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid putItemRejectsAConditionExpressionOver4096Bytes() {createUsersTable("eu-west-1");- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.put("TableName", "Users");request.set("Item", item("userId", "u1"));request.put("ConditionExpression", "attribute_not_exists(" + nameOfBytes(4075) + ")");- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("PutItem", request, "eu-west-1"));assertEquals("1 validation error detected: Invalid ConditionExpression: "+ "Expression size has exceeded the maximum allowed size;", ex.getMessage());@@ -1384,15 +1384,15 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid queryRejectsAFilterExpressionOver4096Bytes() {createUsersTable("eu-west-1");- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.put("TableName", "Users");request.put("KeyConditionExpression", "userId = :pk");request.put("FilterExpression", nameOfBytes(4092) + " = :v");- var values = singleValue(":pk");+ ObjectNode values = singleValue(":pk");values.set(":v", attributeValue("S", "x"));request.set("ExpressionAttributeValues", values);- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("Query", request, "eu-west-1"));assertEquals("Invalid FilterExpression: Expression size has exceeded the maximum allowed size;",ex.getMessage());@@ -1401,12 +1401,12 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid scanRejectsAFilterExpressionOver4096BytesAndReportsTheSize() {createUsersTable("eu-west-1");- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.put("TableName", "Users");request.put("FilterExpression", nameOfBytes(4092) + " = :v");request.set("ExpressionAttributeValues", singleValue(":v"));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("Scan", request, "eu-west-1"));assertEquals("Invalid FilterExpression: Expression size has exceeded the maximum allowed size; "+ "expression size: 4097", ex.getMessage());@@ -1415,10 +1415,10 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid getItemRejectsAProjectionExpressionOver4096Bytes() {createUsersTable("eu-west-1");- var request = updateUserRequest();+ ObjectNode request = updateUserRequest();request.put("ProjectionExpression", nameOfBytes(4097));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("GetItem", request, "eu-west-1"));assertEquals("Invalid ProjectionExpression: Expression size has exceeded the maximum allowed size;",ex.getMessage());@@ -1426,8 +1426,8 @@ class NativeDynamoDbJsonHandlerTest {private ObjectNode nestedMaps(int levels) {ObjectNode value = attributeValue("S", "leaf");- for (var i = 0; i < levels; i++) {- var map = mapper.createObjectNode();+ for (int i = 0; i < levels; i++) {+ ObjectNode map = mapper.createObjectNode();map.set("n", value);value = mapper.createObjectNode();value.set("M", map);@@ -1436,9 +1436,9 @@ class NativeDynamoDbJsonHandlerTest {}private ObjectNode putRequest(JsonNode value) {- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.put("TableName", "Users");- var item = item("userId", "u1");+ ObjectNode item = item("userId", "u1");item.set("data", value);request.set("Item", item);return request;@@ -1451,16 +1451,16 @@ class NativeDynamoDbJsonHandlerTest {void putItemAcceptsAnAttributeWithALeafAtLevel32() throws Exception {createUsersTable("eu-west-1");- var response = handler.handle("PutItem", putRequest(nestedMaps(31)), "eu-west-1");+ Response response = handler.handle("PutItem", putRequest(nestedMaps(31)), "eu-west-1");assertEquals(200, response.getStatus());}@Testvoid putItemRejectsAnAttributeWithALeafAtLevel33BeforeTheTableLookup() {- var request = putRequest(nestedMaps(32));+ ObjectNode request = putRequest(nestedMaps(32));request.put("TableName", "Missing");- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("PutItem", request, "eu-west-1"));assertEquals("ValidationException", ex.getErrorCode());assertEquals(NESTING_MESSAGE, ex.getMessage());@@ -1469,15 +1469,15 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateItemRejectsAnExpressionAttributeValueWithALeafAtLevel33() {createUsersTable("eu-west-1");- var request = updateUserRequest();+ ObjectNode request = updateUserRequest();request.put("UpdateExpression", "SET touched = :t");request.put("ConditionExpression", "#d = :deep");request.set("ExpressionAttributeNames", mapper.createObjectNode().put("#d", "data"));- var values = singleValue(":t");+ ObjectNode values = singleValue(":t");values.set(":deep", nestedMaps(32));request.set("ExpressionAttributeValues", values);- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("UpdateItem", request, "eu-west-1"));assertEquals(NESTING_MESSAGE, ex.getMessage());}@@ -1502,22 +1502,22 @@ class NativeDynamoDbJsonHandlerTest {private ObjectNode transactWrite(String action, ObjectNode op) {op.put("TableName", "Users");- var member = mapper.createObjectNode();+ ObjectNode member = mapper.createObjectNode();member.set(action, op);- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.set("TransactItems", mapper.createArrayNode().add(member));return request;}@Testvoid transactWriteItemsRejectsAConditionExpressionOver4096BytesWithTheSizeBeforeTheTableLookup() {- var put = mapper.createObjectNode();+ ObjectNode put = mapper.createObjectNode();put.set("Item", item("userId", "u1"));put.put("ConditionExpression", "attribute_not_exists(" + nameOfBytes(4075) + ")");- var request = transactWrite("Put", put);+ ObjectNode request = transactWrite("Put", put);((ObjectNode) request.get("TransactItems").get(0).get("Put")).put("TableName", "Missing");- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("TransactWriteItems", request, "eu-west-1"));assertEquals("ValidationException", ex.getErrorCode());assertEquals("Invalid ConditionExpression: Expression size has exceeded the maximum allowed size; "@@ -1540,12 +1540,12 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid transactWriteItemsRejectsAnUpdateExpressionOver4096Bytes() {createUsersTable("eu-west-1");- var update = mapper.createObjectNode();+ ObjectNode update = mapper.createObjectNode();update.set("Key", item("userId", "u1"));update.put("UpdateExpression", "SET " + nameOfBytes(4088) + " = :v");update.set("ExpressionAttributeValues", singleValue(":v"));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("TransactWriteItems", transactWrite("Update", update), "eu-west-1"));assertEquals("Invalid UpdateExpression: Expression size has exceeded the maximum allowed size;",ex.getMessage());@@ -1554,12 +1554,12 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid transactWriteItemsRejectsAPutItemWithALeafAtLevel33() {createUsersTable("eu-west-1");- var put = mapper.createObjectNode();- var item = item("userId", "u1");+ ObjectNode put = mapper.createObjectNode();+ ObjectNode item = item("userId", "u1");item.set("data", nestedMaps(32));put.set("Item", item);- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("TransactWriteItems", transactWrite("Put", put), "eu-west-1"));assertEquals("Nesting Levels have exceeded supported limits: "+ "Attributes in the item have nested levels beyond supported limit", ex.getMessage());@@ -1567,14 +1567,14 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid batchWriteItemRejectsAPutItemWithALeafAtLevel33BeforeTheTableLookup() {- var item = item("userId", "u1");+ ObjectNode item = item("userId", "u1");item.set("data", nestedMaps(32));- var putRequest = mapper.createObjectNode();+ ObjectNode putRequest = mapper.createObjectNode();putRequest.set("PutRequest", mapper.createObjectNode().set("Item", item));- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.set("RequestItems", mapper.createObjectNode().set("Missing", mapper.createArrayNode().add(putRequest)));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("BatchWriteItem", request, "eu-west-1"));assertEquals("ValidationException", ex.getErrorCode());assertEquals("Nesting Levels have exceeded supported limits: "@@ -1584,16 +1584,16 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid transactWriteItemsCancelsOnAnUpdateValueWithALeafAtLevel33() throws Exception {createUsersTable("eu-west-1");- var update = mapper.createObjectNode();+ ObjectNode update = mapper.createObjectNode();update.set("Key", item("userId", "u1"));update.put("UpdateExpression", "SET deep = :deep");update.set("ExpressionAttributeValues", mapper.createObjectNode().set(":deep", nestedMaps(32)));- var response = handler.handle("TransactWriteItems", transactWrite("Update", update), "eu-west-1");+ Response response = handler.handle("TransactWriteItems", transactWrite("Update", update), "eu-west-1");assertEquals(400, response.getStatus());- var body = mapper.convertValue(response.getEntity(), JsonNode.class);+ JsonNode body = mapper.convertValue(response.getEntity(), JsonNode.class);assertEquals("TransactionCanceledException", body.get("__type").asText());- var reason = body.get("CancellationReasons").get(0);+ JsonNode reason = body.get("CancellationReasons").get(0);assertEquals("ValidationError", reason.get("Code").asText());assertEquals("Nesting Levels have exceeded supported limits", reason.get("Message").asText());assertNull(service.getItem("Users", item("userId", "u1"), "eu-west-1"));@@ -1602,31 +1602,31 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid transactWriteItemsDoesNotCheckTheDepthOfAConditionCheckValue() throws Exception {createUsersTable("eu-west-1");- var putRequest = mapper.createObjectNode();+ ObjectNode putRequest = mapper.createObjectNode();putRequest.put("TableName", "Users");putRequest.set("Item", item("userId", "u1", "marker", "x"));handler.handle("PutItem", putRequest, "eu-west-1");- var check = mapper.createObjectNode();+ ObjectNode check = mapper.createObjectNode();check.set("Key", item("userId", "u1"));check.put("ConditionExpression", "#d = :deep");check.set("ExpressionAttributeNames", mapper.createObjectNode().put("#d", "data"));check.set("ExpressionAttributeValues", mapper.createObjectNode().set(":deep", nestedMaps(32)));- var response = handler.handle("TransactWriteItems", transactWrite("ConditionCheck", check), "eu-west-1");+ Response response = handler.handle("TransactWriteItems", transactWrite("ConditionCheck", check), "eu-west-1");assertEquals(400, response.getStatus());- var reason = mapper.convertValue(response.getEntity(), JsonNode.class).get("CancellationReasons").get(0);+ JsonNode reason = mapper.convertValue(response.getEntity(), JsonNode.class).get("CancellationReasons").get(0);assertEquals("ConditionalCheckFailed", reason.get("Code").asText());assertEquals("The conditional request failed", reason.get("Message").asText());}@Testvoid updateItemRejectsAnOutOfRangeAddOperandBeforeTheTableLookup() {- var request = updateUserRequest();+ ObjectNode request = updateUserRequest();request.put("TableName", "Missing");request.put("UpdateExpression", "ADD n :a");request.set("ExpressionAttributeValues", mapper.createObjectNode().set(":a", attributeValue("N", "1e126")));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("UpdateItem", request, "eu-west-1"));assertEquals("ValidationException", ex.getErrorCode());assertEquals("1 validation error detected: Number overflow. "@@ -1636,11 +1636,11 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateItemRejectsATooSmallExpressionAttributeValue() {createUsersTable("eu-west-1");- var request = updateUserRequest();+ ObjectNode request = updateUserRequest();request.put("UpdateExpression", "SET x = :a");request.set("ExpressionAttributeValues", mapper.createObjectNode().set(":a", attributeValue("N", "1e-131")));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("UpdateItem", request, "eu-west-1"));assertEquals("1 validation error detected: Number underflow. "+ "Attempting to store a number with magnitude smaller than supported range", ex.getMessage());@@ -1649,13 +1649,13 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateItemRejectsAnAttributeUpdatesValueWithTooManyDigits() {createUsersTable("eu-west-1");- var request = updateUserRequest();- var update = mapper.createObjectNode();+ ObjectNode request = updateUserRequest();+ ObjectNode update = mapper.createObjectNode();update.put("Action", "ADD");update.set("Value", attributeValue("N", "123456789012345678901234567890123456789"));request.set("AttributeUpdates", mapper.createObjectNode().set("n", update));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("UpdateItem", request, "eu-west-1"));assertEquals("1 validation error detected: Attempting to store more than 38 significant digits in a Number",ex.getMessage());@@ -1664,15 +1664,15 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid queryRejectsAnOutOfRangeExpressionAttributeValueWithoutTheEnvelope() {createUsersTable("eu-west-1");- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.put("TableName", "Users");request.put("KeyConditionExpression", "userId = :p");request.put("FilterExpression", "n = :a");- var values = singleValue(":p");+ ObjectNode values = singleValue(":p");values.set(":a", attributeValue("N", "1e126"));request.set("ExpressionAttributeValues", values);- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("Query", request, "eu-west-1"));assertEquals("Number overflow. Attempting to store a number with magnitude larger than supported range",ex.getMessage());@@ -1680,14 +1680,14 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateItemRejectsAnAttributeUpdatesValueWithALeafAtLevel33BeforeTheTableLookup() {- var request = updateUserRequest();+ ObjectNode request = updateUserRequest();request.put("TableName", "Missing");- var update = mapper.createObjectNode();+ ObjectNode update = mapper.createObjectNode();update.put("Action", "PUT");update.set("Value", nestedMaps(32));request.set("AttributeUpdates", mapper.createObjectNode().set("data", update));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("UpdateItem", request, "eu-west-1"));assertEquals("ValidationException", ex.getErrorCode());assertEquals(NESTING_MESSAGE, ex.getMessage());@@ -1696,11 +1696,11 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid putItemRejectsAnExpectedValueWithALeafAtLevel33() {createUsersTable("eu-west-1");- var request = putRequest(attributeValue("S", "x"));+ ObjectNode request = putRequest(attributeValue("S", "x"));request.set("Expected", mapper.createObjectNode().set("data",mapper.createObjectNode().set("Value", nestedMaps(32))));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("PutItem", request, "eu-west-1"));assertEquals(NESTING_MESSAGE, ex.getMessage());}@@ -1708,18 +1708,18 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid queryRejectsAQueryFilterValueWithALeafAtLevel33WithoutTheEnvelope() {createUsersTable("eu-west-1");- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.put("TableName", "Users");- var keyCondition = mapper.createObjectNode();+ ObjectNode keyCondition = mapper.createObjectNode();keyCondition.put("ComparisonOperator", "EQ");keyCondition.set("AttributeValueList", mapper.createArrayNode().add(attributeValue("S", "u1")));request.set("KeyConditions", mapper.createObjectNode().set("userId", keyCondition));- var filter = mapper.createObjectNode();+ ObjectNode filter = mapper.createObjectNode();filter.put("ComparisonOperator", "EQ");filter.set("AttributeValueList", mapper.createArrayNode().add(nestedMaps(32)));request.set("QueryFilter", mapper.createObjectNode().set("data", filter));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("Query", request, "eu-west-1"));assertEquals("Nesting Levels have exceeded supported limits: "+ "Attributes in the item have nested levels beyond supported limit", ex.getMessage());@@ -1727,41 +1727,41 @@ class NativeDynamoDbJsonHandlerTest {private void seedUpdateReturnValuesItem() throws Exception {createUsersTable("eu-west-1");- var parent = mapper.createObjectNode();+ ObjectNode parent = mapper.createObjectNode();parent.set("keep", attributeValue("S", "k"));parent.set("child", attributeValue("S", "old"));- var list = mapper.createArrayNode()+ ArrayNode list = mapper.createArrayNode().add(attributeValue("S", "l0")).add(attributeValue("S", "l1")).add(attributeValue("S", "l2"));- var item = item("userId", "u1");+ ObjectNode item = item("userId", "u1");item.set("parent", mapper.createObjectNode().set("M", parent));item.set("l", mapper.createObjectNode().set("L", list));- var putRequest = mapper.createObjectNode();+ ObjectNode putRequest = mapper.createObjectNode();putRequest.put("TableName", "Users");putRequest.set("Item", item);handler.handle("PutItem", putRequest, "eu-west-1");}private JsonNode updateAttributes(String expression, ObjectNode values, String returnValues) throws Exception {- var request = updateUserRequest();+ ObjectNode request = updateUserRequest();request.put("UpdateExpression", expression);if (values != null) {request.set("ExpressionAttributeValues", values);}request.put("ReturnValues", returnValues);- var body = mapper.convertValue(handler.handle("UpdateItem", request, "eu-west-1").getEntity(), JsonNode.class);+ JsonNode body = mapper.convertValue(handler.handle("UpdateItem", request, "eu-west-1").getEntity(), JsonNode.class);return body.get("Attributes");}@Testvoid updateItemUpdatedNewReturnsTheWholeMapWhenTheMapItselfIsSet() throws Exception {seedUpdateReturnValuesItem();- var parent = mapper.createObjectNode();+ ObjectNode parent = mapper.createObjectNode();parent.set("keep", attributeValue("S", "k"));parent.set("child", attributeValue("S", "new"));- var values = mapper.createObjectNode();+ ObjectNode values = mapper.createObjectNode();values.set(":v", mapper.createObjectNode().set("M", parent));- var attributes = updateAttributes("SET parent = :v", values, "UPDATED_NEW");+ JsonNode attributes = updateAttributes("SET parent = :v", values, "UPDATED_NEW");assertEquals("k", attributes.get("parent").get("M").get("keep").get("S").asText());assertEquals("new", attributes.get("parent").get("M").get("child").get("S").asText());}@@ -1769,10 +1769,10 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateItemUpdatedOldReturnsTheWholeOldMapWhenTheMapItselfIsSet() throws Exception {seedUpdateReturnValuesItem();- var values = mapper.createObjectNode();+ ObjectNode values = mapper.createObjectNode();values.set(":v", mapper.createObjectNode().set("M", mapper.createObjectNode().set("child", attributeValue("S", "new"))));- var attributes = updateAttributes("SET parent = :v", values, "UPDATED_OLD");+ JsonNode attributes = updateAttributes("SET parent = :v", values, "UPDATED_OLD");assertEquals("k", attributes.get("parent").get("M").get("keep").get("S").asText());assertEquals("old", attributes.get("parent").get("M").get("child").get("S").asText());}@@ -1781,7 +1781,7 @@ class NativeDynamoDbJsonHandlerTest {void updateItemUpdatedNewReturnsANestedSetEvenWhenTheValueDidNotChange() throws Exception {seedUpdateReturnValuesItem();- var attributes = updateAttributes("SET parent.child = :v", singleValueOf("old"), "UPDATED_NEW");+ JsonNode attributes = updateAttributes("SET parent.child = :v", singleValueOf("old"), "UPDATED_NEW");assertEquals("old", attributes.get("parent").get("M").get("child").get("S").asText());assertFalse(attributes.get("parent").get("M").has("keep"));}@@ -1789,12 +1789,12 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid updateItemUpdatedNewPacksTouchedListElementsInIndexOrder() throws Exception {seedUpdateReturnValuesItem();- var values = mapper.createObjectNode();+ ObjectNode values = mapper.createObjectNode();values.set(":v", attributeValue("S", "L2"));values.set(":w", attributeValue("S", "L0"));- var attributes = updateAttributes("SET l[2] = :v, l[0] = :w", values, "UPDATED_NEW");- var packed = attributes.get("l").get("L");+ JsonNode attributes = updateAttributes("SET l[2] = :v, l[0] = :w", values, "UPDATED_NEW");+ JsonNode packed = attributes.get("l").get("L");assertEquals(2, packed.size());assertEquals("L0", packed.get(0).get("S").asText());assertEquals("L2", packed.get(1).get("S").asText());@@ -1804,7 +1804,7 @@ class NativeDynamoDbJsonHandlerTest {void updateItemUpdatedNewAfterRemovingAListElementReturnsTheElementNowAtThatIndex() throws Exception {seedUpdateReturnValuesItem();- var attributes = updateAttributes("REMOVE l[1]", null, "UPDATED_NEW");+ JsonNode attributes = updateAttributes("REMOVE l[1]", null, "UPDATED_NEW");assertEquals(1, attributes.get("l").get("L").size());assertEquals("l2", attributes.get("l").get("L").get(0).get("S").asText());}@@ -1822,14 +1822,14 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid transactGetItemsRejectsAnOversizedProjectionBeforeTheTableLookup() {- var get = mapper.createObjectNode();+ ObjectNode get = mapper.createObjectNode();get.put("TableName", "Missing");get.set("Key", item("userId", "u1"));get.put("ProjectionExpression", nameOfBytes(4097));- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.set("TransactItems", mapper.createArrayNode().add(mapper.createObjectNode().set("Get", get)));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("TransactGetItems", request, "eu-west-1"));assertEquals("Invalid ProjectionExpression: Expression size has exceeded the maximum allowed size;",ex.getMessage());@@ -1899,11 +1899,11 @@ class NativeDynamoDbJsonHandlerTest {@Testvoid executeStatementRejectsATooDeepParameter() {createUsersTable("eu-west-1");- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.put("Statement", "UPDATE \"Users\" SET deep=? WHERE userId=?");request.set("Parameters", mapper.createArrayNode().add(nestedMaps(33)).add(attributeValue("S", "u1")));- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> handler.handle("ExecuteStatement", request, "eu-west-1"));assertEquals("ValidationException", ex.getErrorCode());assertEquals("Nesting Levels have exceeded supported limits: "@@ -1925,20 +1925,20 @@ class NativeDynamoDbJsonHandlerTest {void executeTransactionCancelsOnAnItemLeftTooDeepWithThatStatementsReason() throws Exception {createUsersTable("eu-west-1");service.putItem("Users", item("userId", "u1"), "eu-west-1");- var fine = mapper.createObjectNode();+ ObjectNode fine = mapper.createObjectNode();fine.put("Statement", "UPDATE \"Users\" SET x=? WHERE userId=?");fine.set("Parameters", mapper.createArrayNode().add(attributeValue("S", "x")).add(attributeValue("S", "u1")));- var deep = mapper.createObjectNode();+ ObjectNode deep = mapper.createObjectNode();deep.put("Statement", "INSERT INTO \"Users\" VALUE {'userId': ?, 'deep': ?}");deep.set("Parameters", mapper.createArrayNode().add(attributeValue("S", "u2")).add(nestedMaps(32)));- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.set("TransactStatements", mapper.createArrayNode().add(fine).add(deep));- var response = handler.handle("ExecuteTransaction", request, "eu-west-1");+ Response response = handler.handle("ExecuteTransaction", request, "eu-west-1");assertEquals(400, response.getStatus());- var body = mapper.convertValue(response.getEntity(), JsonNode.class);+ JsonNode body = mapper.convertValue(response.getEntity(), JsonNode.class);assertEquals("TransactionCanceledException", body.get("__type").asText());- var reasons = body.get("CancellationReasons");+ JsonNode reasons = body.get("CancellationReasons");assertEquals("None", reasons.get(0).get("Code").asText());assertEquals("ValidationError", reasons.get(1).get("Code").asText());assertEquals("Nesting Levels have exceeded supported limits", reasons.get(1).get("Message").asText());diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/ProjectionEvaluatorTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/ProjectionEvaluatorTest.javaindex d7a68f4993..cf1a71f95f 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/ProjectionEvaluatorTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/ProjectionEvaluatorTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.dynamodb;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsException;@@ -42,16 +43,16 @@ class ProjectionEvaluatorTest {@Testvoid projectsMultipleListIndicesCompactedAndIndexOrdered() {- var item = readValue("""+ ObjectNode item = readValue("""{"mylist": {"L": [{"S": "zero"}, {"S": "one"}, {"S": "two"}]}}""");- var result = ProjectionEvaluator.project(item, "#l[2], #l[0]",+ ObjectNode result = ProjectionEvaluator.project(item, "#l[2], #l[0]",readValue("""{"#l": "mylist"}"""));- var list = result.get("mylist").get("L");+ JsonNode list = result.get("mylist").get("L");assertEquals(2, list.size(), "both requested elements must survive");assertEquals("zero", list.get(0).get("S").asText());assertEquals("two", list.get(1).get("S").asText());@@ -59,11 +60,11 @@ class ProjectionEvaluatorTest {@Testvoid mergesTwoScalarPathsUnderOneListIndex() {- var result = ProjectionEvaluator.project(listItem(), "l[0].a, l[0].b", null);+ ObjectNode result = ProjectionEvaluator.project(listItem(), "l[0].a, l[0].b", null);- var list = result.get("l").get("L");+ JsonNode list = result.get("l").get("L");assertEquals(1, list.size());- var element = list.get(0).get("M");+ JsonNode element = list.get(0).get("M");assertEquals("a0", element.get("a").get("S").asText());assertEquals("b0", element.get("b").get("S").asText());assertNull(element.get("m"), "unprojected sibling must be dropped");@@ -71,9 +72,9 @@ class ProjectionEvaluatorTest {@Testvoid mergesScalarSiblingAndNestedMapSiblingUnderOneListIndex() {- var result = ProjectionEvaluator.project(listItem(), "l[0].a, l[0].m.x", null);+ ObjectNode result = ProjectionEvaluator.project(listItem(), "l[0].a, l[0].m.x", null);- var element = result.get("l").get("L").get(0).get("M");+ JsonNode element = result.get("l").get("L").get(0).get("M");assertEquals("a0", element.get("a").get("S").asText());assertEquals("x0", element.get("m").get("M").get("x").get("S").asText());assertNull(element.get("m").get("M").get("y"), "only x was projected inside m");@@ -82,11 +83,11 @@ class ProjectionEvaluatorTest {@Testvoid mergesTwoPathsSharingAnElementOfANestedList() {- var result = ProjectionEvaluator.project(listItem(), "l[0].n[0].p, l[0].n[0].q", null);+ ObjectNode result = ProjectionEvaluator.project(listItem(), "l[0].n[0].p, l[0].n[0].q", null);- var outer = result.get("l").get("L");+ JsonNode outer = result.get("l").get("L");assertEquals(1, outer.size());- var inner = outer.get(0).get("M").get("n").get("L");+ JsonNode inner = outer.get(0).get("M").get("n").get("L");assertEquals(1, inner.size(), "both paths share inner index 0");assertEquals("p00", inner.get(0).get("M").get("p").get("S").asText());assertEquals("q00", inner.get(0).get("M").get("q").get("S").asText());@@ -94,9 +95,9 @@ class ProjectionEvaluatorTest {@Testvoid keepsDistinctInnerListIndicesSeparateUnderOneSharedOuterIndex() {- var result = ProjectionEvaluator.project(listItem(), "l[0].n[0].p, l[0].n[1].q", null);+ ObjectNode result = ProjectionEvaluator.project(listItem(), "l[0].n[0].p, l[0].n[1].q", null);- var inner = result.get("l").get("L").get(0).get("M").get("n").get("L");+ JsonNode inner = result.get("l").get("L").get(0).get("M").get("n").get("L");assertEquals(2, inner.size());assertEquals("p00", inner.get(0).get("M").get("p").get("S").asText());assertNull(inner.get(0).get("M").get("q"));@@ -106,9 +107,9 @@ class ProjectionEvaluatorTest {@Testvoid mergesSharedIndexAndKeepsDistinctIndexSeparateCompacted() {- var result = ProjectionEvaluator.project(listItem(), "l[0].a, l[0].b, l[2].c", null);+ ObjectNode result = ProjectionEvaluator.project(listItem(), "l[0].a, l[0].b, l[2].c", null);- var list = result.get("l").get("L");+ JsonNode list = result.get("l").get("L");assertEquals(2, list.size(), "index 0 (merged) and index 2 compact to two elements");assertEquals("a0", list.get(0).get("M").get("a").get("S").asText());assertEquals("b0", list.get(0).get("M").get("b").get("S").asText());@@ -118,7 +119,7 @@ class ProjectionEvaluatorTest {@Testvoid rejectsNonNumericListIndexAsSyntaxError() {- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> ProjectionEvaluator.project(mapper.createObjectNode(), "l[a]", null));assertEquals("ValidationException", ex.getErrorCode());assertEquals("Invalid ProjectionExpression: Syntax error; token: \"a\", near: \"[a]\"",@@ -127,7 +128,7 @@ class ProjectionEvaluatorTest {@Testvoid rejectsEmptyListIndexAsSyntaxError() {- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> ProjectionEvaluator.project(mapper.createObjectNode(), "l[]", null));assertEquals("ValidationException", ex.getErrorCode());assertEquals("Invalid ProjectionExpression: Syntax error; token: \"]\", near: \"[]\"",@@ -136,7 +137,7 @@ class ProjectionEvaluatorTest {@Testvoid rejectsListIndexAboveTheAllowableRange() {- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> ProjectionEvaluator.project(mapper.createObjectNode(), "l[999999999999999999999]", null));assertEquals("ValidationException", ex.getErrorCode());assertEquals("Invalid ProjectionExpression: List index is not within the allowable range; "@@ -145,7 +146,7 @@ class ProjectionEvaluatorTest {@Testvoid rejectsFirstListIndexPastTheAllowableRange() {- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> ProjectionEvaluator.project(mapper.createObjectNode(), "l[4294967295]", null));assertEquals("ValidationException", ex.getErrorCode());assertEquals("Invalid ProjectionExpression: List index is not within the allowable range; "@@ -154,7 +155,7 @@ class ProjectionEvaluatorTest {@Testvoid rejectsUnicodeDigitListIndexAsSyntaxError() {- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> ProjectionEvaluator.project(mapper.createObjectNode(), "l[123]", null));assertEquals("ValidationException", ex.getErrorCode());assertEquals("Invalid ProjectionExpression: Syntax error; token: \"1\", near: \"[12\"",@@ -163,7 +164,7 @@ class ProjectionEvaluatorTest {@Testvoid rejectsLeadingZeroListIndexAsSyntaxError() {- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> ProjectionEvaluator.project(mapper.createObjectNode(), "l[001]", null));assertEquals("ValidationException", ex.getErrorCode());assertEquals("Invalid ProjectionExpression: Syntax error; token: \"0\", near: \"001\"",@@ -172,7 +173,7 @@ class ProjectionEvaluatorTest {@Testvoid rejectsLongZeroPaddedListIndexAsSyntaxError() {- var ex = assertThrows(AwsException.class,+ AwsException ex = assertThrows(AwsException.class,() -> ProjectionEvaluator.project(mapper.createObjectNode(), "l[0000000000001]", null));assertEquals("ValidationException", ex.getErrorCode());assertEquals("Invalid ProjectionExpression: Syntax error; token: \"0\", near: \"000\"",@@ -181,7 +182,7 @@ class ProjectionEvaluatorTest {@Testvoid allowableIndexBeyondTheListJustDropsTheAttribute() {- var result = ProjectionEvaluator.project(listItem(), "l[4294967294]", null);+ ObjectNode result = ProjectionEvaluator.project(listItem(), "l[4294967294]", null);assertNull(result.get("l"), "an in-range index past the list end matches nothing");}diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2DeregisterAndCopyImageIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2DeregisterAndCopyImageIntegrationTest.javaindex f2da31c22a..4fb1a3439f 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2DeregisterAndCopyImageIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2DeregisterAndCopyImageIntegrationTest.java@@ -8,6 +8,7 @@ import io.github.hectorvent.floci.services.ec2.model.Instance;import io.github.hectorvent.floci.services.ec2.model.NetworkInterface;import io.github.hectorvent.floci.services.ec2.model.Tag;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.specification.RequestSpecification;import jakarta.inject.Inject;import org.junit.jupiter.api.Test;@@ -61,7 +62,7 @@ class Ec2DeregisterAndCopyImageIntegrationTest {"AWS4-HMAC-SHA256 Credential=test/20260205/us-west-2/ec2/aws4_request";private String ec2(String auth, String action, String... formParams) {- var req = given().formParam("Action", action).header("Authorization", auth);+ RequestSpecification req = given().formParam("Action", action).header("Authorization", auth);for (int i = 0; i < formParams.length; i += 2) {req = req.formParam(formParams[i], formParams[i + 1]);}diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.javaindex 0fc16ced82..f157db1856 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java@@ -25,6 +25,8 @@ import java.util.Base64;import java.util.List;import java.util.UUID;import java.util.zip.GZIPOutputStream;+import io.restassured.response.ExtractableResponse;+import io.restassured.response.Response;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;@@ -304,7 +306,7 @@ class Ec2IntegrationTest {* absent from the body rather than compared as a value.*/private void assertSynthesizedOwnership(String ownerScope, String expectedId, String expectedAlias) {- var response = given()+ ExtractableResponse<Response> response = given().formParam("Action", "DescribeImages").formParam("Owner.1", ownerScope).formParam("Filter.1.Name", "name")@@ -346,7 +348,7 @@ class Ec2IntegrationTest {void anOwnerAliasFilterAloneStillAgreesWithTheOwnerId() {// The mirror of the above. Filtering on the alias with no Owner.N left the id at the// Amazon default, so the image reported aws-marketplace beside Amazon's account.- var response = given()+ ExtractableResponse<Response> response = given().formParam("Action", "DescribeImages").formParam("Filter.1.Name", "name").formParam("Filter.1.Value.1", "unmatched-alias-filter-only-*")diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IpamServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IpamServiceTest.javaindex b1a7ee0b7e..68056e2132 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IpamServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IpamServiceTest.java@@ -8,6 +8,7 @@ import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.services.ec2.model.Ipam;import io.github.hectorvent.floci.services.ec2.model.IpamPool;import io.github.hectorvent.floci.services.ec2.model.IpamPoolAllocation;+import io.github.hectorvent.floci.services.ec2.model.IpamPoolCidr;import io.github.hectorvent.floci.services.ec2.model.Tag;import jakarta.enterprise.inject.Instance;import org.junit.jupiter.api.BeforeEach;@@ -238,7 +239,7 @@ class Ec2IpamServiceTest {assertTrue(pool.getIpamPoolId().startsWith("ipam-pool-"));service.provisionIpamPoolCidr(REGION, pool.getIpamPoolId(), "10.0.0.0/8");- var cidrs = service.getIpamPoolCidrs(REGION, pool.getIpamPoolId());+ List<IpamPoolCidr> cidrs = service.getIpamPoolCidrs(REGION, pool.getIpamPoolId());assertEquals(1, cidrs.size());assertEquals("10.0.0.0/8", cidrs.get(0).getCidr());assertEquals("provisioned", cidrs.get(0).getState());diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ModifyVpcEndpointTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ModifyVpcEndpointTest.javaindex 93168f760a..8b18c24bb2 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ModifyVpcEndpointTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ModifyVpcEndpointTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.ec2;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.Test;import jakarta.inject.Inject;@@ -39,7 +40,7 @@ class Ec2ModifyVpcEndpointTest {+ "\"Principal\":\"*\",\"Action\":\"s3:GetObject\",\"Resource\":\"*\"}]}";private String ec2(String action, String... formParams) {- var req = given().formParam("Action", action).header("Authorization", AUTH_HEADER);+ RequestSpecification req = given().formParam("Action", action).header("Authorization", AUTH_HEADER);for (int i = 0; i < formParams.length; i += 2) {req = req.formParam(formParams[i], formParams[i + 1]);}diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceConcurrencyTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceConcurrencyTest.javaindex ddde41a892..c393532b0a 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceConcurrencyTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceConcurrencyTest.java@@ -22,6 +22,7 @@ import java.util.Set;import java.util.concurrent.CountDownLatch;import java.util.concurrent.ExecutorService;import java.util.concurrent.Executors;+import java.util.concurrent.Future;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.Collectors;@@ -242,7 +243,7 @@ class Ec2ServiceConcurrencyTest {}));}start.countDown();- for (var f : futures) {+ for (Future<?> f : futures) {f.get(30, TimeUnit.SECONDS);}pool.shutdownNow();@@ -263,7 +264,7 @@ class Ec2ServiceConcurrencyTest {}start.countDown();Set<String> results = new java.util.HashSet<>();- for (var f : futures) {+ for (Future<String> f : futures) {results.add(f.get(30, TimeUnit.SECONDS));}pool.shutdownNow();diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.javaindex 753e437f95..8bb3282296 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.java@@ -5,8 +5,11 @@ import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RequestContext;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;+import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;+import java.lang.reflect.Field;import java.util.ArrayList;+import io.github.hectorvent.floci.services.ec2.model.PrefixList;import io.github.hectorvent.floci.services.ec2.portforward.Ec2PortForwardManager;import io.github.hectorvent.floci.services.ec2.model.Address;import io.github.hectorvent.floci.services.ec2.model.BlockDeviceMapping;@@ -1258,9 +1261,9 @@ class Ec2ServiceTest {@SuppressWarnings("unchecked")private static <T> void putViaReflection(Ec2Service service, String fieldName, String key, T value)throws Exception {- var field = Ec2Service.class.getDeclaredField(fieldName);+ Field field = Ec2Service.class.getDeclaredField(fieldName);field.setAccessible(true);- var backend = (io.github.hectorvent.floci.core.storage.StorageBackend<String, T>) field.get(service);+ StorageBackend<String, T> backend = (StorageBackend<String, T>) field.get(service);backend.put(key, value);}@@ -2747,7 +2750,7 @@ class Ec2ServiceTest {void legacyDescribePrefixListsProjectsTheSameAwsManagedData() {Ec2Service service = prefixListService();- var legacy = service.describePrefixLists("us-east-1", List.of(),+ List<PrefixList> legacy = service.describePrefixLists("us-east-1", List.of(),Map.of("prefix-list-name", List.of("com.amazonaws.us-east-1.s3")));assertEquals(1, legacy.size());diff --git a/src/test/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryDataPlaneTest.java b/src/test/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryDataPlaneTest.javaindex 2ac2ff38f8..0b74aaa391 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryDataPlaneTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryDataPlaneTest.java@@ -45,7 +45,7 @@ class EcrRegistryDataPlaneTest {@Testvoid hostnameStyleManifestWriteUsesInternalRegistryNamespace() {- var request = EcrRegistryDataPlane.requestFor(+ EcrRegistryDataPlane.RegistryRequest request = EcrRegistryDataPlane.requestFor("000000000000.dkr.ecr.us-east-1.localhost:4566","/v2/platform/api/manifests/v1", null, "hostname").orElseThrow();@@ -101,7 +101,7 @@ class EcrRegistryDataPlaneTest {@Testvoid digestManifestWriteDoesNotAcquireAnImmutableTagLock() {- var request = EcrRegistryDataPlane.requestFor(+ EcrRegistryDataPlane.RegistryRequest request = EcrRegistryDataPlane.requestFor("000000000000.dkr.ecr.us-east-1.localhost:4566","/v2/platform/api/manifests/sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",null, "hostname").orElseThrow();@@ -111,7 +111,7 @@ class EcrRegistryDataPlaneTest {@Testvoid pathStyleRequestRetainsItsExistingInternalNamespace() {- var request = EcrRegistryDataPlane.requestFor("localhost:4566",+ EcrRegistryDataPlane.RegistryRequest request = EcrRegistryDataPlane.requestFor("localhost:4566","/v2/000000000000/us-east-1/platform/api/blobs/uploads/", "mount=sha256:abc", "path").orElseThrow();assertEquals("platform/api", request.repositoryName());@@ -121,7 +121,7 @@ class EcrRegistryDataPlaneTest {@Testvoid mirrorNamespaceRoutesAnInNetworkK3sPullThroughTheSameDataPlane() {- var request = EcrRegistryDataPlane.requestFor("floci:4566", "/v2/platform/api/manifests/v1",+ EcrRegistryDataPlane.RegistryRequest request = EcrRegistryDataPlane.requestFor("floci:4566", "/v2/platform/api/manifests/v1","ns=000000000000.dkr.ecr.us-east-1.localhost%3A4566", "hostname").orElseThrow();assertEquals("000000000000", request.accountId());@@ -162,9 +162,9 @@ class EcrRegistryDataPlaneTest {@Testvoid registryPingDoesNotAcquireARepositoryNamespace() {- var hostnameRequest = EcrRegistryDataPlane.requestFor(+ EcrRegistryDataPlane.RegistryRequest hostnameRequest = EcrRegistryDataPlane.requestFor("000000000000.dkr.ecr.us-east-1.localhost:4566", "/v2/", null, "hostname").orElseThrow();- var pathRequest = EcrRegistryDataPlane.requestFor("localhost:4566", "/v2/", null, "path").orElseThrow();+ EcrRegistryDataPlane.RegistryRequest pathRequest = EcrRegistryDataPlane.requestFor("localhost:4566", "/v2/", null, "path").orElseThrow();assertEquals("/v2/", hostnameRequest.backendUri());assertEquals("/v2/", pathRequest.backendUri());@@ -172,7 +172,7 @@ class EcrRegistryDataPlaneTest {@Testvoid uploadContinuationRetainsTheClientRepositoryNamespace() {- var request = EcrRegistryDataPlane.requestFor(+ EcrRegistryDataPlane.RegistryRequest request = EcrRegistryDataPlane.requestFor("000000000000.dkr.ecr.us-east-1.localhost:4566","/v2/platform/api/blobs/uploads/", null, "hostname").orElseThrow();diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsJsonHandlerTaskDefinitionPersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsJsonHandlerTaskDefinitionPersistenceTest.javaindex 057b65e6a1..e9c8b5b5b5 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsJsonHandlerTaskDefinitionPersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsJsonHandlerTaskDefinitionPersistenceTest.java@@ -11,8 +11,10 @@ import io.github.hectorvent.floci.core.storage.PersistentStorage;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.ecs.container.EcsContainerManager;import io.github.hectorvent.floci.services.ecs.container.HostVolumePolicy;+import io.github.hectorvent.floci.services.ecs.model.EcsServiceModel;import io.github.hectorvent.floci.services.ecs.model.FirelensConfiguration;import io.github.hectorvent.floci.services.ecs.model.LaunchType;+import io.github.hectorvent.floci.services.ecs.model.LogConfiguration;import io.github.hectorvent.floci.services.ecs.model.TaskDefinition;import jakarta.ws.rs.core.Response;import org.junit.jupiter.api.Test;@@ -89,7 +91,7 @@ class EcsJsonHandlerTaskDefinitionPersistenceTest {assertEquals("ARM64", td.getRuntimePlatform().cpuArchitecture());assertEquals("LINUX", td.getRuntimePlatform().operatingSystemFamily());- var logConfiguration = td.getContainerDefinitions().getFirst().getLogConfiguration();+ LogConfiguration logConfiguration = td.getContainerDefinitions().getFirst().getLogConfiguration();assertNotNull(logConfiguration, "logConfiguration must survive a restart");assertEquals("awslogs", logConfiguration.logDriver());assertEquals("/ecs/restart-family", logConfiguration.options().get("awslogs-group"));@@ -119,7 +121,7 @@ class EcsJsonHandlerTaskDefinitionPersistenceTest {""");handler.handle("RegisterTaskDefinition", registerReq, REGION);- var created = service.createService(null, "force-svc", "force-fam:1", 0,+ EcsServiceModel created = service.createService(null, "force-svc", "force-fam:1", 0,LaunchType.FARGATE, List.of(), null, REGION);String firstId = created.getDeploymentId();diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServiceDaemonSchedulingTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServiceDaemonSchedulingTest.javaindex 2dc5e9d2ff..2f8cb559d6 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServiceDaemonSchedulingTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServiceDaemonSchedulingTest.java@@ -57,7 +57,7 @@ class EcsServiceDaemonSchedulingTest {assertEquals(2, running.size());assertEquals(Set.of(a.getContainerInstanceArn(), b.getContainerInstanceArn()),running.stream().map(EcsTask::getContainerInstanceArn).collect(Collectors.toSet()));- var svc = service.describeServices("daemon-cluster", List.of("daemon-svc"), REGION).getFirst();+ EcsServiceModel svc = service.describeServices("daemon-cluster", List.of("daemon-svc"), REGION).getFirst();assertEquals(2, svc.getDesiredCount(), "desiredCount follows the instance count, as AWS reports it");assertEquals(2, svc.getRunningCount());@@ -93,7 +93,7 @@ class EcsServiceDaemonSchedulingTest {List.of(), null, null, "DAEMON", null, null, REGION);service.reconcileServices();- var svc = service.describeServices("daemon-fail", List.of("daemon-svc"), REGION).getFirst();+ EcsServiceModel svc = service.describeServices("daemon-fail", List.of("daemon-svc"), REGION).getFirst();assertEquals(1, svc.getDesiredCount());assertEquals(0, svc.getRunningCount(), "a task that failed to start is not running");assertEquals(0, runningTasks(service).size());diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServiceRolloutTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServiceRolloutTest.javaindex c766724793..a494c0e299 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServiceRolloutTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServiceRolloutTest.java@@ -88,7 +88,7 @@ class EcsServiceRolloutTest {service.createCluster("pin-cluster", REGION);TaskDefinition rev1 = registerTaskDef(service, "pin-fam", "app:1");- var svc = service.createService("pin-cluster", "pin-svc", "pin-fam", 0,+ EcsServiceModel svc = service.createService("pin-cluster", "pin-svc", "pin-fam", 0,LaunchType.FARGATE, List.of(), null, REGION);assertEquals(rev1.getTaskDefinitionArn(), svc.getTaskDefinition());@@ -99,7 +99,7 @@ class EcsServiceRolloutTest {EcsService service = newMockModeService();service.createCluster("legacy-cluster", REGION);TaskDefinition rev1 = registerTaskDef(service, "legacy-fam", "app:1");- var svc = service.createService("legacy-cluster", "legacy-svc", "legacy-fam", 1,+ EcsServiceModel svc = service.createService("legacy-cluster", "legacy-svc", "legacy-fam", 1,LaunchType.FARGATE, List.of(), null, REGION);service.reconcileServices();assertEquals(1, runningTasks(service).size());@@ -137,7 +137,7 @@ class EcsServiceRolloutTest {EcsService service = newMockModeService();service.createCluster("force-cluster", REGION);TaskDefinition rev1 = registerTaskDef(service, "force-fam", "app:1");- var created = service.createService("force-cluster", "force-svc", "force-fam", 1,+ EcsServiceModel created = service.createService("force-cluster", "force-svc", "force-fam", 1,LaunchType.FARGATE, List.of(), null, REGION);String firstDeploymentId = created.getDeploymentId();assertNotNull(firstDeploymentId, "createService assigns a deploymentId");@@ -148,7 +148,7 @@ class EcsServiceRolloutTest {assertEquals(firstDeploymentId, before.getFirst().getDeploymentId());// Same task definition, force flag set.- var updated = service.updateService("force-cluster", "force-svc", null, null, null,+ EcsServiceModel updated = service.updateService("force-cluster", "force-svc", null, null, null,null, true, REGION);assertNotEquals(firstDeploymentId, updated.getDeploymentId(),"forceNewDeployment mints a new deployment id");diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerSecurityGroupTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerSecurityGroupTest.javaindex 31b162e1bd..f5930b6311 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerSecurityGroupTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerSecurityGroupTest.java@@ -1,6 +1,9 @@package io.github.hectorvent.floci.services.ecs.container;import com.github.dockerjava.api.DockerClient;+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;+import com.github.dockerjava.api.command.InspectVolumeCmd;+import com.github.dockerjava.api.command.InspectVolumeResponse;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;@@ -207,12 +210,12 @@ class EcsContainerManagerSecurityGroupTest {when(lifecycleManager.create(any())).thenReturn("router-id");when(lifecycleManager.startCreated(anyString(), any())).thenReturn(new ContainerInfo("router-id", Map.of()));- var inspectVolumeCmd = mock(com.github.dockerjava.api.command.InspectVolumeCmd.class);- var volume = mock(com.github.dockerjava.api.command.InspectVolumeResponse.class);+ InspectVolumeCmd inspectVolumeCmd = mock(InspectVolumeCmd.class);+ InspectVolumeResponse volume = mock(InspectVolumeResponse.class);when(dockerClient.inspectVolumeCmd(anyString())).thenReturn(inspectVolumeCmd);when(inspectVolumeCmd.exec()).thenReturn(volume);when(volume.getMountpoint()).thenReturn("/var/lib/docker/volumes/floci-ecs-firelens-abc123/_data");- var copyCmd = mock(com.github.dockerjava.api.command.CopyArchiveToContainerCmd.class, RETURNS_SELF);+ CopyArchiveToContainerCmd copyCmd = mock(CopyArchiveToContainerCmd.class, RETURNS_SELF);when(dockerClient.copyArchiveToContainerCmd("router-id")).thenReturn(copyCmd);ContainerDefinition router = new ContainerDefinition();diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/SecretsManagerSelectorTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/SecretsManagerSelectorTest.javaindex 00727f3729..852c3454c5 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/SecretsManagerSelectorTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/SecretsManagerSelectorTest.java@@ -17,7 +17,7 @@ class SecretsManagerSelectorTest {@Testvoid plainArnPassesThroughVerbatim() {- var sel = SecretsManagerSelector.parse(BASE);+ SecretsManagerSelector sel = SecretsManagerSelector.parse(BASE);assertEquals(BASE, sel.secretId());assertNull(sel.jsonKey());assertNull(sel.versionStage());@@ -27,7 +27,7 @@ class SecretsManagerSelectorTest {@Testvoid jsonKeyOnlySelector() {// CDK Secret.fromSecretsManager(secret, 'token') emits ":token::".- var sel = SecretsManagerSelector.parse(BASE + ":token::");+ SecretsManagerSelector sel = SecretsManagerSelector.parse(BASE + ":token::");assertEquals(BASE, sel.secretId());assertEquals("token", sel.jsonKey());assertNull(sel.versionStage());@@ -37,7 +37,7 @@ class SecretsManagerSelectorTest {@Testvoid emptyJsonKeyWithVersionIdMeansWholeSecret() {// CDK fromSecretsManagerVersion(secret, {versionId}) with no field emits ":::id".- var sel = SecretsManagerSelector.parse(BASE + ":::v123");+ SecretsManagerSelector sel = SecretsManagerSelector.parse(BASE + ":::v123");assertEquals(BASE, sel.secretId());assertNull(sel.jsonKey());assertNull(sel.versionStage());@@ -46,7 +46,7 @@ class SecretsManagerSelectorTest {@Testvoid emptyJsonKeyWithVersionStage() {- var sel = SecretsManagerSelector.parse(BASE + "::AWSPREVIOUS:");+ SecretsManagerSelector sel = SecretsManagerSelector.parse(BASE + "::AWSPREVIOUS:");assertNull(sel.jsonKey());assertEquals("AWSPREVIOUS", sel.versionStage());assertNull(sel.versionId());@@ -54,7 +54,7 @@ class SecretsManagerSelectorTest {@Testvoid fullSelector() {- var sel = SecretsManagerSelector.parse(BASE + ":token:AWSPREVIOUS:v123");+ SecretsManagerSelector sel = SecretsManagerSelector.parse(BASE + ":token:AWSPREVIOUS:v123");assertEquals(BASE, sel.secretId());assertEquals("token", sel.jsonKey());assertEquals("AWSPREVIOUS", sel.versionStage());@@ -64,7 +64,7 @@ class SecretsManagerSelectorTest {@Testvoid partialArnBaseIsRebuiltWithoutSuffix() {String partial = "arn:aws:secretsmanager:us-east-2:000000000000:secret:app/config";- var sel = SecretsManagerSelector.parse(partial + ":token::");+ SecretsManagerSelector sel = SecretsManagerSelector.parse(partial + ":token::");assertEquals(partial, sel.secretId());assertEquals("token", sel.jsonKey());}diff --git a/src/test/java/io/github/hectorvent/floci/services/eks/EksOidcServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/eks/EksOidcServiceTest.javaindex 8cdd917f2f..4d468e56ea 100644--- a/src/test/java/io/github/hectorvent/floci/services/eks/EksOidcServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/eks/EksOidcServiceTest.java@@ -87,7 +87,7 @@ class EksOidcServiceTest {// not be the owner, and an unresolved issuer is treated as a third-party provider — so the// token would be accepted with no validation at all.StorageBackend<String, ClusterOidcKey> raw = new InMemoryStorage<>();- var accountAware = new AccountAwareStorageBackend<>(raw, null, "000000000000");+ AccountAwareStorageBackend<ClusterOidcKey> accountAware = new AccountAwareStorageBackend<>(raw, null, "000000000000");EksOidcService service = new EksOidcService(new StorageFactory(null, null) {@Override@SuppressWarnings("unchecked")diff --git a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2ServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2ServiceTest.javaindex f8b9897108..966f80a232 100644--- a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2ServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2ServiceTest.java@@ -17,6 +17,7 @@ import io.github.hectorvent.floci.services.elbv2.model.Rule;import io.github.hectorvent.floci.services.elbv2.model.RuleCondition;import io.github.hectorvent.floci.services.elbv2.model.TargetDescription;import io.github.hectorvent.floci.services.elbv2.model.TargetGroup;+import io.github.hectorvent.floci.services.elbv2.model.TargetHealth;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.extension.ExtendWith;@@ -362,7 +363,7 @@ class ElbV2ServiceTest {target.setId("i-1234567890abcdef0");target.setPort(9999);- var health = service.describeTargetHealth(REGION, tgArn, List.of(target)).getFirst();+ TargetHealth health = service.describeTargetHealth(REGION, tgArn, List.of(target)).getFirst();assertEquals("unused", health.getState());assertEquals("Target.NotRegistered", health.getReason());diff --git a/src/test/java/io/github/hectorvent/floci/services/eventbridge/RulePersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/eventbridge/RulePersistenceTest.javaindex b252162bd7..4cd0da37e4 100644--- a/src/test/java/io/github/hectorvent/floci/services/eventbridge/RulePersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/eventbridge/RulePersistenceTest.java@@ -32,11 +32,11 @@ class RulePersistenceTest {rule.setScheduleExpression("rate(5 minutes)");rule.setState(RuleState.ENABLED);- var writer = new PersistentStorage<String, Rule>(+ PersistentStorage<String, Rule> writer = new PersistentStorage<>(filePath, new TypeReference<Map<String, Rule>>() {});writer.put(key, rule);- var reader = new PersistentStorage<String, Rule>(+ PersistentStorage<String, Rule> reader = new PersistentStorage<>(filePath, new TypeReference<Map<String, Rule>>() {});reader.load();@@ -72,7 +72,7 @@ class RulePersistenceTest {""".formatted(key);Files.writeString(filePath, legacyJson);- var store = new PersistentStorage<String, Rule>(+ PersistentStorage<String, Rule> store = new PersistentStorage<>(filePath, new TypeReference<Map<String, Rule>>() {});store.load();diff --git a/src/test/java/io/github/hectorvent/floci/services/eventbridge/model/InputTransformerTest.java b/src/test/java/io/github/hectorvent/floci/services/eventbridge/model/InputTransformerTest.javaindex d68834d324..d38e84bbf1 100644--- a/src/test/java/io/github/hectorvent/floci/services/eventbridge/model/InputTransformerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/eventbridge/model/InputTransformerTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.eventbridge.model;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import org.junit.jupiter.api.Test;@@ -12,7 +13,7 @@ class InputTransformerTest {@Testvoid fromJson_parsesPathsMapAndTemplate() throws Exception {- var node = M.readTree("{\"InputPathsMap\":{\"e\":\"$.detail.eventName\"},"+ JsonNode node = M.readTree("{\"InputPathsMap\":{\"e\":\"$.detail.eventName\"},"+ "\"InputTemplate\":\"{\\\"e\\\":<e>}\"}");InputTransformer t = InputTransformer.fromJson(node);assertEquals("$.detail.eventName", t.getInputPathsMap().get("e"));diff --git a/src/test/java/io/github/hectorvent/floci/services/floci/ui/FlociUiManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/floci/ui/FlociUiManagerTest.javaindex 341d327b5f..482740e4b6 100644--- a/src/test/java/io/github/hectorvent/floci/services/floci/ui/FlociUiManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/floci/ui/FlociUiManagerTest.java@@ -23,6 +23,7 @@ import com.github.dockerjava.api.model.Container;import org.junit.jupiter.api.Test;import java.io.IOException;+import java.io.OutputStream;import java.net.BindException;import java.net.InetSocketAddress;import java.nio.charset.StandardCharsets;@@ -1056,7 +1057,7 @@ class FlociUiManagerTest {server.createContext(path, exchange -> {exchange.getResponseHeaders().set("Content-Type", "application/json");exchange.sendResponseHeaders(200, body.length);- try (var output = exchange.getResponseBody()) {+ try (OutputStream output = exchange.getResponseBody()) {output.write(body);}});diff --git a/src/test/java/io/github/hectorvent/floci/services/glue/GlueServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/glue/GlueServiceTest.javaindex 6b5a438754..7166a0cc61 100644--- a/src/test/java/io/github/hectorvent/floci/services/glue/GlueServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/glue/GlueServiceTest.java@@ -319,7 +319,7 @@ class GlueServiceTest {plain.setStorageDescriptor(sd);glueService.createTable("db1", plain);- var tables = glueService.getTables("db1");+ List<Table> tables = glueService.getTables("db1");assertEquals(2, tables.size());for (Table t : tables) {diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/AssumeRoleWithSamlValidationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/AssumeRoleWithSamlValidationIntegrationTest.javaindex 3c48a730ad..6b3520e0c8 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/AssumeRoleWithSamlValidationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/AssumeRoleWithSamlValidationIntegrationTest.java@@ -28,6 +28,7 @@ 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;@@ -366,7 +367,7 @@ class AssumeRoleWithSamlValidationIntegrationTest {}private static String encoded(Document document) throws Exception {- 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/test/java/io/github/hectorvent/floci/services/iam/IamListEntitiesForPolicyIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamListEntitiesForPolicyIntegrationTest.javaindex 1b40aa8c30..a1864693d0 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/IamListEntitiesForPolicyIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamListEntitiesForPolicyIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.iam;import io.github.hectorvent.floci.core.common.XmlParser;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.Test;import java.util.List;@@ -27,7 +28,7 @@ class IamListEntitiesForPolicyIntegrationTest {"AWS4-HMAC-SHA256 Credential=test/20260205/us-east-1/iam/aws4_request";private String iam(String action, String... kv) {- var req = given()+ RequestSpecification req = given().contentType("application/x-www-form-urlencoded").header("Authorization", IAM_AUTH).formParam("Action", action);diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/IamServiceLinkedRoleIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamServiceLinkedRoleIntegrationTest.javaindex 50950db334..0c0257794d 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/IamServiceLinkedRoleIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamServiceLinkedRoleIntegrationTest.java@@ -5,6 +5,7 @@ import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.matchesRegex;import static org.hamcrest.Matchers.startsWith;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;@@ -484,7 +485,7 @@ class IamServiceLinkedRoleIntegrationTest {}private static void refusedAsUnmodifiable(String action, String... formParams) {- var request = given().header("Authorization", AUTH_HEADER).formParam("Action", action);+ RequestSpecification request = given().header("Authorization", AUTH_HEADER).formParam("Action", action);for (int i = 0; i < formParams.length; i += 2) {request = request.formParam(formParams[i], formParams[i + 1]);}diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/IamUpdateGroupConsumerTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamUpdateGroupConsumerTest.javaindex 72fe30199c..4097b99077 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/IamUpdateGroupConsumerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamUpdateGroupConsumerTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.iam;import io.quarkus.test.junit.QuarkusTest;import io.restassured.response.Response;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;@@ -22,7 +23,7 @@ class IamUpdateGroupConsumerTest {"AWS4-HMAC-SHA256 Credential=test/20260227/us-east-1/iam/aws4_request";private static Response call(String action, String... formParams) {- var request = given().formParam("Action", action).header("Authorization", AUTH_HEADER);+ RequestSpecification request = given().formParam("Action", action).header("Authorization", AUTH_HEADER);for (int i = 0; i < formParams.length; i += 2) {request = request.formParam(formParams[i], formParams[i + 1]);}diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/InstanceProfileTagsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/InstanceProfileTagsIntegrationTest.javaindex 4abadbc268..e4b1014e21 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/InstanceProfileTagsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/InstanceProfileTagsIntegrationTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.iam;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.Test;import java.util.UUID;@@ -68,7 +69,7 @@ class InstanceProfileTagsIntegrationTest {private static io.restassured.specification.RequestSpecification tagRequest(String profile,int from, int to) {- var request = given()+ RequestSpecification request = given().contentType("application/x-www-form-urlencoded").formParam("Action", "TagInstanceProfile").formParam("InstanceProfileName", profile)@@ -139,7 +140,7 @@ class InstanceProfileTagsIntegrationTest {String profile = "untag-limit-" + UUID.randomUUID().toString().substring(0, 8);createProfile(profile);- var request = given()+ RequestSpecification request = given().contentType("application/x-www-form-urlencoded").formParam("Action", "UntagInstanceProfile").formParam("InstanceProfileName", profile)diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/ResourceArnBuilderTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/ResourceArnBuilderTest.javaindex 29287bdeb7..d13da58115 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/ResourceArnBuilderTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/ResourceArnBuilderTest.java@@ -222,7 +222,7 @@ class ResourceArnBuilderTest {@Testvoid dynamoDbBuildsArnFromTableCreationParameters() {setJsonBody("{\"TableCreationParameters\":{\"TableName\":\"ImportTarget\"},\"InputFormat\":\"DYNAMODB_JSON\"}");- var arn = builder.build("dynamodb", ctx, "us-east-1", "000000000000");+ String arn = builder.build("dynamodb", ctx, "us-east-1", "000000000000");assertEquals("arn:aws:dynamodb:us-east-1:000000000000:table/ImportTarget", arn);}diff --git a/src/test/java/io/github/hectorvent/floci/services/inspector2/Inspector2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/inspector2/Inspector2IntegrationTest.javaindex 4b2d9029f2..e380a9f107 100644--- a/src/test/java/io/github/hectorvent/floci/services/inspector2/Inspector2IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/inspector2/Inspector2IntegrationTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.inspector2;import io.github.hectorvent.floci.services.organizations.OrganizationsService;+import io.github.hectorvent.floci.services.organizations.model.Handshake;import io.quarkus.test.junit.QuarkusTest;import jakarta.inject.Inject;import org.junit.jupiter.api.Test;@@ -151,7 +152,7 @@ class Inspector2IntegrationTest {private void createOrganization(String managementAccountId, String... members) {organizationsService.createOrganization(managementAccountId, "ALL");for (String member : members) {- var handshake = organizationsService.inviteAccountToOrganization(+ Handshake handshake = organizationsService.inviteAccountToOrganization(managementAccountId, member, "ACCOUNT", null);organizationsService.acceptHandshake(member, handshake.getId());}diff --git a/src/test/java/io/github/hectorvent/floci/services/iot/IotIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iot/IotIntegrationTest.javaindex fb0ab0b467..e73b887f99 100644--- a/src/test/java/io/github/hectorvent/floci/services/iot/IotIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iot/IotIntegrationTest.java@@ -1,6 +1,9 @@package io.github.hectorvent.floci.services.iot;import io.quarkus.test.junit.QuarkusTest;+import org.bouncycastle.openssl.jcajce.JcaPEMWriter;+import org.bouncycastle.pkcs.PKCS10CertificationRequest;+import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;@@ -812,11 +815,11 @@ class IotIntegrationTest {java.security.KeyPairGenerator kpg = java.security.KeyPairGenerator.getInstance("RSA");kpg.initialize(2048);java.security.KeyPair kp = kpg.generateKeyPair();- var csr = new org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder(+ PKCS10CertificationRequest csr = new JcaPKCS10CertificationRequestBuilder(new org.bouncycastle.asn1.x500.X500Name("CN=round-trip"), kp.getPublic()).build(new org.bouncycastle.operator.jcajce.JcaContentSignerBuilder("SHA256withRSA").build(kp.getPrivate()));java.io.StringWriter out = new java.io.StringWriter();- try (var w = new org.bouncycastle.openssl.jcajce.JcaPEMWriter(out)) {+ try (JcaPEMWriter w = new JcaPEMWriter(out)) {w.writeObject(csr);}return out.toString();diff --git a/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttBrokerServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttBrokerServiceTest.javaindex a7faee6c81..0394f01a05 100644--- a/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttBrokerServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttBrokerServiceTest.java@@ -205,7 +205,7 @@ class IotMqttBrokerServiceTest {@Testvoid aClientCertificateFromAnyIssuerCompletesTheHandshake() throws Exception {broker.startIfEnabled();- var device = GENERATOR.generateSelfSignedCertificate("device", List.of(), KeyAlgorithm.RSA_2048);+ CertificateGenerator.GeneratedCertificate device = GENERATOR.generateSelfSignedCertificate("device", List.of(), KeyAlgorithm.RSA_2048);X509Certificate served = handshake(keyManagers(device));diff --git a/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttMutualTlsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttMutualTlsIntegrationTest.javaindex 2f869008f7..9ac9ba49fe 100644--- a/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttMutualTlsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttMutualTlsIntegrationTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.iot;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.config.CertificateMetadata;import io.github.hectorvent.floci.config.FlociCertificateAuthority;+import io.github.hectorvent.floci.services.acm.CertificateGenerator;import io.github.hectorvent.floci.services.acm.model.KeyAlgorithm;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.QuarkusTestProfile;@@ -365,7 +366,7 @@ class IotMqttMutualTlsIntegrationTest {}FlociCertificateAuthority ca = FlociCertificateAuthority.loadOrCreate(TLS_DIR);List<String> sans = List.of("localhost", "127.0.0.1", "*.localhost.floci.io");- var leaf = ca.issueServerCertificate("localhost", sans, KeyAlgorithm.RSA_2048, null);+ CertificateGenerator.GeneratedCertificate leaf = ca.issueServerCertificate("localhost", sans, KeyAlgorithm.RSA_2048, null);Files.writeString(TLS_DIR.resolve("floci-server.crt"), leaf.certificatePem());Files.writeString(TLS_DIR.resolve("floci-server.key"), leaf.privateKeyPem());Files.writeString(TLS_DIR.resolve("floci-server.metadata.json"),diff --git a/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttTlsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttTlsIntegrationTest.javaindex 9965ea187b..e758f9f317 100644--- a/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttTlsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttTlsIntegrationTest.java@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.config.CertificateMetadata;import io.github.hectorvent.floci.config.FlociCertificateAuthority;import io.github.hectorvent.floci.config.TlsCertificateManager;+import io.github.hectorvent.floci.services.acm.CertificateGenerator;import io.github.hectorvent.floci.services.acm.model.KeyAlgorithm;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.QuarkusTestProfile;@@ -376,7 +377,7 @@ class IotMqttTlsIntegrationTest {}FlociCertificateAuthority ca = FlociCertificateAuthority.loadOrCreate(TLS_DIR);List<String> sans = List.of("localhost", "127.0.0.1", "*.localhost.floci.io");- var leaf = ca.issueServerCertificate("localhost", sans, KeyAlgorithm.RSA_2048, null);+ CertificateGenerator.GeneratedCertificate leaf = ca.issueServerCertificate("localhost", sans, KeyAlgorithm.RSA_2048, null);Files.writeString(TLS_DIR.resolve("floci-server.crt"), leaf.certificatePem());Files.writeString(TLS_DIR.resolve("floci-server.key"), leaf.privateKeyPem());Files.writeString(TLS_DIR.resolve("floci-server.metadata.json"),diff --git a/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttWebSocketIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttWebSocketIntegrationTest.javaindex 2720d69a79..8d82c0c5f9 100644--- a/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttWebSocketIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iot/IotMqttWebSocketIntegrationTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.iot;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.config.CertificateMetadata;import io.github.hectorvent.floci.config.FlociCertificateAuthority;+import io.github.hectorvent.floci.services.acm.CertificateGenerator;import io.github.hectorvent.floci.services.acm.model.KeyAlgorithm;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.QuarkusTestProfile;@@ -492,7 +493,7 @@ public class IotMqttWebSocketIntegrationTest {}FlociCertificateAuthority ca = FlociCertificateAuthority.loadOrCreate(TLS_DIR);List<String> sans = List.of("localhost", "127.0.0.1", "*.localhost.floci.io");- var leaf = ca.issueServerCertificate("localhost", sans, KeyAlgorithm.RSA_2048, null);+ CertificateGenerator.GeneratedCertificate leaf = ca.issueServerCertificate("localhost", sans, KeyAlgorithm.RSA_2048, null);Files.writeString(TLS_DIR.resolve("floci-server.crt"), leaf.certificatePem());Files.writeString(TLS_DIR.resolve("floci-server.key"), leaf.privateKeyPem());Files.writeString(TLS_DIR.resolve("floci-server.metadata.json"),diff --git a/src/test/java/io/github/hectorvent/floci/services/iot/ReloadingKeyManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/iot/ReloadingKeyManagerTest.javaindex eb74350258..5e042028e7 100644--- a/src/test/java/io/github/hectorvent/floci/services/iot/ReloadingKeyManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iot/ReloadingKeyManagerTest.java@@ -142,7 +142,7 @@ class ReloadingKeyManagerTest {@Testvoid keyManagerOfLoadsThePemKeyStoreOfTheOptions() {- var leaf = new CertificateGenerator().generateSelfSignedCertificate("localhost", List.of("localhost"), KeyAlgorithm.RSA_2048);+ CertificateGenerator.GeneratedCertificate leaf = new CertificateGenerator().generateSelfSignedCertificate("localhost", List.of("localhost"), KeyAlgorithm.RSA_2048);PemKeyCertOptions options = new PemKeyCertOptions().addCertValue(Buffer.buffer(leaf.certificatePem())).addKeyValue(Buffer.buffer(leaf.privateKeyPem()));diff --git a/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisIntegrationTest.javaindex fc04e18d19..89995f8c3d 100644--- a/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisIntegrationTest.java@@ -121,7 +121,7 @@ class KinesisIntegrationTest {.statusCode(200).extract().asString();- var matcher = CREATION_TIMESTAMP_PATTERN.matcher(responseBody);+ Matcher matcher = CREATION_TIMESTAMP_PATTERN.matcher(responseBody);assertTrue(matcher.find(), "timestamp must be serialized as a plain JSON decimal: " + responseBody);String timestampLexeme = matcher.group(1);BigDecimal timestamp = new BigDecimal(timestampLexeme);diff --git a/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisJsonHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisJsonHandlerTest.javaindex 31ce69432f..d851a742cb 100644--- a/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisJsonHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisJsonHandlerTest.java@@ -139,7 +139,7 @@ class KinesisJsonHandlerTest {}private void assertPlainDecimalTimestamp(ObjectNode description, String expected) throws Exception {- var timestamp = description.get("StreamCreationTimestamp");+ JsonNode timestamp = description.get("StreamCreationTimestamp");assertTrue(timestamp.isNumber());assertEquals(new BigDecimal(expected), timestamp.decimalValue());diff --git a/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisServiceTest.javaindex 6c43f810e0..c674aa5562 100644--- a/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisServiceTest.java@@ -119,7 +119,7 @@ class KinesisServiceTest {"TRIM_HORIZON", null, REGION);Map<String, Object> result = kinesisService.getRecords(iterator, 10, REGION);- var records = (List<?>) result.get("Records");+ List<?> records = (List<?>) result.get("Records");assertEquals(1, records.size());}@@ -132,7 +132,7 @@ class KinesisServiceTest {String iterator = kinesisService.getShardIterator("my-stream", shardId, "LATEST", null, REGION);Map<String, Object> result = kinesisService.getRecords(iterator, 10, REGION);- var records = (List<?>) result.get("Records");+ List<?> records = (List<?>) result.get("Records");assertTrue(records.isEmpty());assertEquals(0L, ((Number) result.get("MillisBehindLatest")).longValue());}@@ -148,7 +148,7 @@ class KinesisServiceTest {kinesisService.putRecord("my-stream", "after".getBytes(StandardCharsets.UTF_8), "pk", REGION);Map<String, Object> result = kinesisService.getRecords(iterator, 10, REGION);- var records = (List<?>) result.get("Records");+ List<?> records = (List<?>) result.get("Records");assertEquals(1, records.size());assertEquals("after", new String(((KinesisRecord) records.getFirst()).getData(), StandardCharsets.UTF_8));}@@ -166,7 +166,7 @@ class KinesisServiceTest {kinesisService.putRecord("my-stream", "tailed".getBytes(StandardCharsets.UTF_8), "pk", REGION);Map<String, Object> second = kinesisService.getRecords((String) first.get("NextShardIterator"), 10, REGION);- var records = (List<?>) second.get("Records");+ List<?> records = (List<?>) second.get("Records");assertEquals(1, records.size());assertEquals("tailed", new String(((KinesisRecord) records.getFirst()).getData(), StandardCharsets.UTF_8));}@@ -203,7 +203,7 @@ class KinesisServiceTest {Map<String, Object> result = kinesisService.getRecords(iterator, 10, REGION);- var records = (List<?>) result.get("Records");+ List<?> records = (List<?>) result.get("Records");assertEquals(2, records.size());assertEquals(0L, ((Number) result.get("MillisBehindLatest")).longValue());}@@ -229,7 +229,7 @@ class KinesisServiceTest {Map<String, Object> result = service.getRecords(iterator, 2, REGION);- var returned = (List<?>) result.get("Records");+ List<?> returned = (List<?>) result.get("Records");assertEquals(2, returned.size());// Last returned = records[1] at +1500ms, tip = records[2] at +4000ms, delta = 2500msassertEquals(2500L, ((Number) result.get("MillisBehindLatest")).longValue());diff --git a/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2JsonHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2JsonHandlerTest.javaindex b91a659c18..6f17c2a281 100644--- a/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2JsonHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2JsonHandlerTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.kinesisanalytics;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.config.EmulatorConfig;@@ -96,7 +97,7 @@ class KinesisAnalyticsV2JsonHandlerTest {Response resp = handler.handle("ListApplications", MAPPER.createObjectNode(), REGION);assertThat(resp.getStatus(), is(200));- var summaries = entity(resp).get("ApplicationSummaries");+ JsonNode summaries = entity(resp).get("ApplicationSummaries");assertEquals(2, summaries.size());}@@ -115,7 +116,7 @@ class KinesisAnalyticsV2JsonHandlerTest {del.put("CreateTimestamp", createTs);assertThat(handler.handle("DeleteApplication", del, REGION).getStatus(), is(200));- var summaries = entity(handler.handle("ListApplications", MAPPER.createObjectNode(), REGION))+ JsonNode summaries = entity(handler.handle("ListApplications", MAPPER.createObjectNode(), REGION)).get("ApplicationSummaries");assertEquals(0, summaries.size());}@@ -145,7 +146,7 @@ class KinesisAnalyticsV2JsonHandlerTest {describe.put("ApplicationName", "coded");ObjectNode detail = (ObjectNode) entity(handler.handle("DescribeApplication", describe, REGION)).get("ApplicationDetail");- var loc = detail.get("ApplicationConfigurationDescription")+ JsonNode loc = detail.get("ApplicationConfigurationDescription").get("ApplicationCodeConfigurationDescription").get("CodeContentDescription").get("S3ApplicationCodeLocationDescription");assertEquals("arn:aws:s3:::flink-code", loc.get("BucketARN").asText());@@ -182,7 +183,7 @@ class KinesisAnalyticsV2JsonHandlerTest {describe.put("ApplicationName", "envprops");ObjectNode detail = (ObjectNode) entity(handler.handle("DescribeApplication", describe, REGION)).get("ApplicationDetail");- var groups = detail.get("ApplicationConfigurationDescription")+ JsonNode groups = detail.get("ApplicationConfigurationDescription").get("EnvironmentPropertyDescriptions").get("PropertyGroupDescriptions");assertEquals(1, groups.size());assertEquals("ProducerConfigProperties", groups.get(0).get("PropertyGroupId").asText());@@ -275,7 +276,7 @@ class KinesisAnalyticsV2JsonHandlerTest {ObjectNode detail = (ObjectNode) entity(updated).get("ApplicationDetail");assertEquals(2L, detail.get("ApplicationVersionId").asLong());- var loc = detail.get("ApplicationConfigurationDescription")+ JsonNode loc = detail.get("ApplicationConfigurationDescription").get("ApplicationCodeConfigurationDescription").get("CodeContentDescription").get("S3ApplicationCodeLocationDescription");assertEquals("arn:aws:s3:::flink-code-v2", loc.get("BucketARN").asText());@@ -306,7 +307,7 @@ class KinesisAnalyticsV2JsonHandlerTest {listReq.put("ResourceARN", arn);Response listed = handler.handle("ListTagsForResource", listReq, REGION);assertThat(listed.getStatus(), is(200));- var tags = entity(listed).get("Tags");+ JsonNode tags = entity(listed).get("Tags");assertEquals(1, tags.size());assertEquals("env", tags.get(0).get("Key").asText());assertEquals("dev", tags.get(0).get("Value").asText());@@ -357,7 +358,7 @@ class KinesisAnalyticsV2JsonHandlerTest {Response listed = handler.handle("ListApplicationSnapshots",MAPPER.createObjectNode().put("ApplicationName", "streaming"), REGION);assertThat(listed.getStatus(), is(200));- var summaries = entity(listed).get("SnapshotSummaries");+ JsonNode summaries = entity(listed).get("SnapshotSummaries");assertEquals(1, summaries.size());assertEquals("before-upgrade", summaries.get(0).get("SnapshotName").asText());@@ -367,7 +368,7 @@ class KinesisAnalyticsV2JsonHandlerTest {deleteSnap.put("SnapshotCreationTimestamp", creationTimestamp);assertThat(handler.handle("DeleteApplicationSnapshot", deleteSnap, REGION).getStatus(), is(200));- var afterDelete = entity(handler.handle("ListApplicationSnapshots",+ JsonNode afterDelete = entity(handler.handle("ListApplicationSnapshots",MAPPER.createObjectNode().put("ApplicationName", "streaming"), REGION)).get("SnapshotSummaries");assertEquals(0, afterDelete.size());}@@ -417,8 +418,8 @@ class KinesisAnalyticsV2JsonHandlerTest {.thenReturn(AccountAwareStorageBackend.inMemory("000000000000"));EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var kaConfig = Mockito.mock(EmulatorConfig.KinesisAnalyticsServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.KinesisAnalyticsServiceConfig kaConfig = Mockito.mock(EmulatorConfig.KinesisAnalyticsServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.kinesisAnalytics()).thenReturn(kaConfig);when(kaConfig.mock()).thenReturn(true);diff --git a/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2ServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2ServiceTest.javaindex fa819c519c..b7d6b5e8cc 100644--- a/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2ServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2ServiceTest.java@@ -88,8 +88,8 @@ class KinesisAnalyticsV2ServiceTest {.create(Mockito.anyString(), Mockito.anyString(), Mockito.any());EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var kaConfig = Mockito.mock(EmulatorConfig.KinesisAnalyticsServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.KinesisAnalyticsServiceConfig kaConfig = Mockito.mock(EmulatorConfig.KinesisAnalyticsServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.kinesisAnalytics()).thenReturn(kaConfig);when(kaConfig.mock()).thenReturn(true);@@ -687,8 +687,8 @@ class KinesisAnalyticsV2ServiceTest {.create(Mockito.anyString(), Mockito.anyString(), Mockito.any());EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var kaConfig = Mockito.mock(EmulatorConfig.KinesisAnalyticsServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.KinesisAnalyticsServiceConfig kaConfig = Mockito.mock(EmulatorConfig.KinesisAnalyticsServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.kinesisAnalytics()).thenReturn(kaConfig);when(kaConfig.mock()).thenReturn(false);@@ -759,8 +759,8 @@ class KinesisAnalyticsV2ServiceTest {.create(Mockito.anyString(), Mockito.anyString(), Mockito.any());EmulatorConfig config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var kaConfig = Mockito.mock(EmulatorConfig.KinesisAnalyticsServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.KinesisAnalyticsServiceConfig kaConfig = Mockito.mock(EmulatorConfig.KinesisAnalyticsServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.kinesisAnalytics()).thenReturn(kaConfig);when(kaConfig.mock()).thenReturn(mock);diff --git a/src/test/java/io/github/hectorvent/floci/services/kms/KmsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/kms/KmsIntegrationTest.javaindex 9edda88f4c..cb3bed93d2 100644--- a/src/test/java/io/github/hectorvent/floci/services/kms/KmsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/kms/KmsIntegrationTest.java@@ -192,7 +192,7 @@ class KmsIntegrationTest {@Testvoid updateKeyDescriptionRoundTripThroughJsonHandler() {- var key = given()+ JsonPath key = given().header("X-Amz-Target", "TrentService.CreateKey").contentType(KMS_CONTENT_TYPE).body("""@@ -2788,7 +2788,7 @@ class KmsIntegrationTest {String keyId = createRsaEncryptionKey();String plaintext = Base64.getEncoder().encodeToString("secret payload".getBytes(StandardCharsets.UTF_8));- var encryptResponse = given()+ JsonPath encryptResponse = given().header("X-Amz-Target", "TrentService.Encrypt").contentType(KMS_CONTENT_TYPE).body("{\"KeyId\":\"%s\",\"Plaintext\":\"%s\",\"EncryptionAlgorithm\":\"RSAES_OAEP_SHA_256\"}"@@ -2836,9 +2836,9 @@ class KmsIntegrationTest {.body("EncryptionAlgorithms", equalTo(List.of("RSAES_OAEP_SHA_1", "RSAES_OAEP_SHA_256"))).extract().path("PublicKey");- var publicKey = java.security.KeyFactory.getInstance("RSA").generatePublic(+ PublicKey publicKey = KeyFactory.getInstance("RSA").generatePublic(new java.security.spec.X509EncodedKeySpec(Base64.getDecoder().decode(publicKeyBase64)));- var cipher = javax.crypto.Cipher.getInstance("RSA/ECB/OAEPPadding");+ Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPPadding");cipher.init(javax.crypto.Cipher.ENCRYPT_MODE, publicKey, new javax.crypto.spec.OAEPParameterSpec("SHA-256", "MGF1", java.security.spec.MGF1ParameterSpec.SHA256,javax.crypto.spec.PSource.PSpecified.DEFAULT));@@ -2931,7 +2931,7 @@ class KmsIntegrationTest {.then().statusCode(200).extract().path("CiphertextBlob");- var reEncryptResponse = given()+ JsonPath reEncryptResponse = given().header("X-Amz-Target", "TrentService.ReEncrypt").contentType(KMS_CONTENT_TYPE).body(("{\"CiphertextBlob\":\"%s\",\"SourceKeyId\":\"%s\",\"DestinationKeyId\":\"%s\","@@ -2989,7 +2989,7 @@ class KmsIntegrationTest {.statusCode(400).body("__type", equalTo("KMSInvalidStateException"));- var parameters = given()+ JsonPath parameters = given().header("X-Amz-Target", "TrentService.GetParametersForImport").contentType(KMS_CONTENT_TYPE).body("{\"KeyId\":\"%s\",\"WrappingAlgorithm\":\"RSAES_OAEP_SHA_256\",\"WrappingKeySpec\":\"RSA_2048\"}"@@ -3089,7 +3089,7 @@ class KmsIntegrationTest {.body("KeyMetadata.KeyState", equalTo("PendingImport")).extract().path("KeyMetadata.KeyId");- var parameters = given()+ JsonPath parameters = given().header("X-Amz-Target", "TrentService.GetParametersForImport").contentType(KMS_CONTENT_TYPE).body(("{\"KeyId\":\"%s\",\"WrappingAlgorithm\":\"RSA_AES_KEY_WRAP_SHA_256\","@@ -3220,7 +3220,7 @@ class KmsIntegrationTest {}private void importFreshMaterial(String keyId) throws Exception {- var parameters = given()+ JsonPath parameters = given().header("X-Amz-Target", "TrentService.GetParametersForImport").contentType(KMS_CONTENT_TYPE).body("{\"KeyId\":\"%s\",\"WrappingAlgorithm\":\"RSAES_OAEP_SHA_256\",\"WrappingKeySpec\":\"RSA_2048\"}"diff --git a/src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.javaindex 62f6c1f65a..8dd76a3682 100644--- a/src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.java@@ -1203,9 +1203,9 @@ class KmsServiceTest {@Testvoid decryptAcceptsCiphertextMadeLocallyWithThePublicKey() throws Exception {KmsKey key = createRsaKey();- var publicKey = KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(+ PublicKey publicKey = KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(Base64.getDecoder().decode(kmsService.getPublicKey(key.getKeyId(), REGION).getPublicKeyEncoded())));- var cipher = javax.crypto.Cipher.getInstance("RSA/ECB/OAEPPadding");+ Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPPadding");cipher.init(javax.crypto.Cipher.ENCRYPT_MODE, publicKey, new javax.crypto.spec.OAEPParameterSpec("SHA-256", "MGF1", MGF1ParameterSpec.SHA256, javax.crypto.spec.PSource.PSpecified.DEFAULT));byte[] localCiphertext = cipher.doFinal(PLAINTEXT);diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaPermissionTagLayerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaPermissionTagLayerIntegrationTest.javaindex 214f6eefad..95c964fbb7 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaPermissionTagLayerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaPermissionTagLayerIntegrationTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.lambda;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;@@ -139,7 +140,7 @@ class LambdaPermissionTagLayerIntegrationTest {// Policy is a JSON string — parse it and verify statementsObjectMapper om = new ObjectMapper();String policyJson = om.readTree(response).get("Policy").asText();- var policy = om.readTree(policyJson);+ JsonNode policy = om.readTree(policyJson);assert policy.get("Statement").size() == 2;}@@ -177,7 +178,7 @@ class LambdaPermissionTagLayerIntegrationTest {ObjectMapper om = new ObjectMapper();String policyJson = om.readTree(response).get("Policy").asText();- var policy = om.readTree(policyJson);+ JsonNode policy = om.readTree(policyJson);assert policy.get("Statement").size() == 1;}diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncherTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncherTest.javaindex 75d2711e94..cac5997e7c 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncherTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncherTest.java@@ -43,10 +43,12 @@ import org.mockito.junit.jupiter.MockitoExtension;import io.github.hectorvent.floci.services.cloudwatch.logs.CloudWatchLogsService;+import java.io.ByteArrayOutputStream;import java.io.IOException;import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;+import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.Optional;@@ -1527,7 +1529,7 @@ class ContainerLauncherTest {* returns for a directory: the directory itself as a leading entry, then each name as a direct* child, executable. */private static byte[] tarOf(String... binaryNames) throws IOException {- var entries = new java.util.LinkedHashMap<String, Boolean>();+ LinkedHashMap<String, Boolean> entries = new LinkedHashMap<>();for (String name : binaryNames) {entries.put(name, true);}@@ -1539,12 +1541,12 @@ class ContainerLauncherTest {* exercised. Names containing "/" are written as-is (not prefixed), to model entries nested* more than one level below the extensions directory. */private static byte[] tarOfRaw(java.util.Map<String, Boolean> nameToExecutable) throws IOException {- var bos = new java.io.ByteArrayOutputStream();+ ByteArrayOutputStream bos = new ByteArrayOutputStream();try (TarArchiveOutputStream tar = new TarArchiveOutputStream(bos)) {TarArchiveEntry dir = new TarArchiveEntry("extensions/");tar.putArchiveEntry(dir);tar.closeArchiveEntry();- for (var e : nameToExecutable.entrySet()) {+ for (Map.Entry<String, Boolean> e : nameToExecutable.entrySet()) {TarArchiveEntry entry = new TarArchiveEntry("extensions/" + e.getKey());entry.setMode(e.getValue() ? 0100755 : 0100644); // executable vs. non-executable regular fileentry.setSize(0);@@ -1825,7 +1827,7 @@ class ContainerLauncherTest {@Testvoid launchFunction_extensionDiscovery_filtersNonExecutableAndNestedEntries() throws Exception {- var entries = new java.util.LinkedHashMap<String, Boolean>();+ LinkedHashMap<String, Boolean> entries = new LinkedHashMap<>();entries.put("lambda-adapter", true); // direct child, executable: launchedentries.put("README.md", false); // direct child, not executable: skippedentries.put("nested/inner-binary", true); // nested (not a direct child): skippeddiff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/LambdaRuntimeLauncherProducerTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/LambdaRuntimeLauncherProducerTest.javaindex aa10c7380f..b251151e30 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/LambdaRuntimeLauncherProducerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/LambdaRuntimeLauncherProducerTest.java@@ -35,7 +35,7 @@ class LambdaRuntimeLauncherProducerTest {@BeforeEachvoid setUp() {- var services = mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.ServicesConfig services = mock(EmulatorConfig.ServicesConfig.class);lambda = mock(EmulatorConfig.LambdaServiceConfig.class);when(config.services()).thenReturn(services);when(services.lambda()).thenReturn(lambda);diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/EksTokenMinterTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/EksTokenMinterTest.javaindex 4ea87bb430..d0e93bfcd2 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/EksTokenMinterTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/EksTokenMinterTest.java@@ -17,6 +17,7 @@ import java.time.ZoneOffset;import java.util.Arrays;import java.util.Base64;import java.util.Map;+import java.util.function.Supplier;import java.util.function.UnaryOperator;import java.util.stream.Collectors;@@ -87,7 +88,7 @@ class EksTokenMinterTest {@Testvoid parsesClusterNameAndRegionFromTheGeneratedShape() throws Exception {- var args = EksTokenMinter.parseArgs(execNode("""+ EksTokenMinter.ExecArgs args = EksTokenMinter.parseArgs(execNode("""command: awsargs: [--region, us-west-2, eks, get-token, --cluster-name, my-cluster, --output, json]"""), name -> {@@ -100,7 +101,7 @@ class EksTokenMinterTest {@Testvoid parsesClusterNameAndExplicitRegion() throws Exception {- var args = EksTokenMinter.parseArgs(execNode("""+ EksTokenMinter.ExecArgs args = EksTokenMinter.parseArgs(execNode("""command: awsargs: [eks, get-token, --cluster-name, my-cluster, --region, eu-west-1]"""), name -> {@@ -113,7 +114,7 @@ class EksTokenMinterTest {@Testvoid fallsBackToAwsRegionEnvVar() throws Exception {- var args = EksTokenMinter.parseArgs(execNode("""+ EksTokenMinter.ExecArgs args = EksTokenMinter.parseArgs(execNode("""command: awsargs: [eks, get-token, --cluster-name, my-cluster]"""), name -> "AWS_REGION".equals(name) ? "ap-south-1" : null);@@ -123,7 +124,7 @@ class EksTokenMinterTest {@Testvoid fallsBackToAwsDefaultRegionEnvVarWhenAwsRegionIsUnset() throws Exception {- var args = EksTokenMinter.parseArgs(execNode("""+ EksTokenMinter.ExecArgs args = EksTokenMinter.parseArgs(execNode("""command: awsargs: [eks, get-token, --cluster-name, my-cluster]"""), name -> "AWS_DEFAULT_REGION".equals(name) ? "ca-central-1" : null);@@ -189,7 +190,7 @@ class EksTokenMinterTest {// AWS CLI's argument parser accepts any unambiguous prefix of a long option, and// role-arn is the only get-token option starting with "role", so these are just as// valid to a real invocation as the --role form update-kubeconfig actually generates.- for (var abbreviation : new String[]{"--role-a", "--role-ar"}) {+ for (String abbreviation : new String[]{"--role-a", "--role-ar"}) {assertThatThrownBy(() -> EksTokenMinter.parseArgs(execNode("""command: awsargs: [eks, get-token, --cluster-name, my-cluster, %s, arn:aws:iam::111122223333:role/x]@@ -211,12 +212,12 @@ class EksTokenMinterTest {@Testvoid mintedTokenDecodesToAWellFormedPresignedGetCallerIdentityUrl() throws Exception {- var token = EksTokenMinter.mint("my-cluster", "us-west-2", CREDENTIALS);+ String token = EksTokenMinter.mint("my-cluster", "us-west-2", CREDENTIALS);assertThat(token).startsWith("k8s-aws-v1.");- var url = decode(token);- var uri = URI.create(url);- var query = parseQuery(uri);+ String url = decode(token);+ URI uri = URI.create(url);+ Map<String, String> query = parseQuery(uri);assertThat(uri.getScheme()).isEqualTo("https");assertThat(uri.getHost()).isEqualTo("sts.us-west-2.amazonaws.com");@@ -237,14 +238,14 @@ class EksTokenMinterTest {// it): canonical request -> string to sign -> HMAC-derived signing key -> signature.// Structural assertions elsewhere only prove the token has the right shape; this proves// the actual signature bytes are what the spec says they should be for these inputs.- var credentials = new EksTokenMinter.AwsCredentials(+ EksTokenMinter.AwsCredentials credentials = new EksTokenMinter.AwsCredentials("AKIAIOSFODNN7EXAMPLE","wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","FQoGZXIvYXdzEXAMPLESESSIONTOKENvaluevaluevalue");- var clock = Clock.fixed(Instant.parse("2024-01-15T12:00:00Z"), ZoneOffset.UTC);+ Clock clock = Clock.fixed(Instant.parse("2024-01-15T12:00:00Z"), ZoneOffset.UTC);- var token = EksTokenMinter.mint("my-cluster", "us-west-2", credentials, clock);- var query = parseQuery(URI.create(decode(token)));+ String token = EksTokenMinter.mint("my-cluster", "us-west-2", credentials, clock);+ Map<String, String> query = parseQuery(URI.create(decode(token)));assertThat(query.get("X-Amz-Date")).isEqualTo("20240115T120000Z");assertThat(query.get("X-Amz-Credential"))@@ -255,16 +256,16 @@ class EksTokenMinterTest {@Testvoid includesSecurityTokenWhenSessionTokenIsPresent() throws Exception {- var credentials = new EksTokenMinter.AwsCredentials("AKIAEXAMPLE", "secret", "session-token");- var query = parseQuery(URI.create(decode(EksTokenMinter.mint("my-cluster", "us-west-2", credentials))));+ EksTokenMinter.AwsCredentials credentials = new EksTokenMinter.AwsCredentials("AKIAEXAMPLE", "secret", "session-token");+ Map<String, String> query = parseQuery(URI.create(decode(EksTokenMinter.mint("my-cluster", "us-west-2", credentials))));assertThat(query.get("X-Amz-Security-Token")).isEqualTo("session-token");}@Testvoid signatureIsBoundToTheClusterName() throws Exception {- var forClusterA = signatureOf(EksTokenMinter.mint("cluster-a", "us-west-2", CREDENTIALS));- var forClusterB = signatureOf(EksTokenMinter.mint("cluster-b", "us-west-2", CREDENTIALS));+ String forClusterA = signatureOf(EksTokenMinter.mint("cluster-a", "us-west-2", CREDENTIALS));+ String forClusterB = signatureOf(EksTokenMinter.mint("cluster-b", "us-west-2", CREDENTIALS));// The whole point of x-k8s-aws-id being a signed header: a token minted for one// cluster must not verify against another, so the two signatures must differ.@@ -273,56 +274,56 @@ class EksTokenMinterTest {@Testvoid signsChinaRegionsAgainstTheChinaStsSuffix() throws Exception {- var uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "cn-north-1", CREDENTIALS)));+ URI uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "cn-north-1", CREDENTIALS)));assertThat(uri.getHost()).isEqualTo("sts.cn-north-1.amazonaws.com.cn");}@Testvoid signsGovCloudRegionsAgainstTheStandardStsSuffix() throws Exception {- var uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "us-gov-west-1", CREDENTIALS)));+ URI uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "us-gov-west-1", CREDENTIALS)));assertThat(uri.getHost()).isEqualTo("sts.us-gov-west-1.amazonaws.com");}@Testvoid signsIsoRegionsAgainstTheIsoStsSuffix() throws Exception {- var uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "us-iso-east-1", CREDENTIALS)));+ URI uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "us-iso-east-1", CREDENTIALS)));assertThat(uri.getHost()).isEqualTo("sts.us-iso-east-1.c2s.ic.gov");}@Testvoid signsIsoBRegionsAgainstTheIsoBStsSuffix() throws Exception {- var uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "us-isob-east-1", CREDENTIALS)));+ URI uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "us-isob-east-1", CREDENTIALS)));assertThat(uri.getHost()).isEqualTo("sts.us-isob-east-1.sc2s.sgov.gov");}@Testvoid signsIsoERegionsAgainstTheIsoEStsSuffix() throws Exception {- var uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "eu-isoe-west-1", CREDENTIALS)));+ URI uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "eu-isoe-west-1", CREDENTIALS)));assertThat(uri.getHost()).isEqualTo("sts.eu-isoe-west-1.cloud.adc-e.uk");}@Testvoid signsIsoFRegionsAgainstTheIsoFStsSuffix() throws Exception {- var uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "us-isof-south-1", CREDENTIALS)));+ URI uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "us-isof-south-1", CREDENTIALS)));assertThat(uri.getHost()).isEqualTo("sts.us-isof-south-1.csp.hci.ic.gov");}@Testvoid signsEuscRegionsAgainstTheEuscStsSuffix() throws Exception {- var uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "eusc-de-east-1", CREDENTIALS)));+ URI uri = URI.create(decode(EksTokenMinter.mint("my-cluster", "eusc-de-east-1", CREDENTIALS)));assertThat(uri.getHost()).isEqualTo("sts.eusc-de-east-1.amazonaws.eu");}@Testvoid execEnvSuppliesCredentialsAheadOfTheProcessEnvironment() throws Exception {- var supplier = EksTokenMinter.tokenSupplierIfRecognized(execNode("""+ Supplier<String> supplier = EksTokenMinter.tokenSupplierIfRecognized(execNode("""command: awsargs: [eks, get-token, --cluster-name, my-cluster, --region, us-west-2]env:@@ -332,7 +333,7 @@ class EksTokenMinterTest {value: secret-from-exec-env""")).orElseThrow();- var query = parseQuery(URI.create(decode(supplier.get())));+ Map<String, String> query = parseQuery(URI.create(decode(supplier.get())));// Proves exec.env, not whatever AWS_ACCESS_KEY_ID happens to be in Floci's own// environment, drove credential resolution -- the bug aws eks update-kubeconfig@@ -342,7 +343,7 @@ class EksTokenMinterTest {@Testvoid execEnvProfileTakesPrecedenceOverAmbientStaticKeys(@TempDir Path tempDir) throws Exception {- var credentialsFile = tempDir.resolve("credentials");+ Path credentialsFile = tempDir.resolve("credentials");Files.writeString(credentialsFile, """[work]aws_access_key_id = AKIAFROMPROFILE@@ -359,7 +360,7 @@ class EksTokenMinterTest {default -> null;};- var credentials = EksTokenMinter.resolveCredentials(execEnv, ambientEnv);+ EksTokenMinter.AwsCredentials credentials = EksTokenMinter.resolveCredentials(execEnv, ambientEnv);assertThat(credentials.accessKeyId()).isEqualTo("AKIAFROMPROFILE");}@@ -371,7 +372,7 @@ class EksTokenMinterTest {"AWS_ACCESS_KEY_ID", "AKIAFROMEXECENV","AWS_SECRET_ACCESS_KEY", "secret-from-exec-env");- var credentials = EksTokenMinter.resolveCredentials(execEnv, name -> null);+ EksTokenMinter.AwsCredentials credentials = EksTokenMinter.resolveCredentials(execEnv, name -> null);assertThat(credentials.accessKeyId()).isEqualTo("AKIAFROMEXECENV");}@@ -387,7 +388,7 @@ class EksTokenMinterTest {"AWS_SECRET_ACCESS_KEY", "secret-from-exec-env");UnaryOperator<String> ambientEnv = name -> "AWS_SESSION_TOKEN".equals(name) ? "unrelated-ambient-token" : null;- var credentials = EksTokenMinter.resolveCredentials(execEnv, ambientEnv);+ EksTokenMinter.AwsCredentials credentials = EksTokenMinter.resolveCredentials(execEnv, ambientEnv);assertThat(credentials.sessionToken()).isNull();}@@ -404,7 +405,7 @@ class EksTokenMinterTest {default -> null;};- var credentials = EksTokenMinter.resolveCredentials(execEnv, ambientEnv);+ EksTokenMinter.AwsCredentials credentials = EksTokenMinter.resolveCredentials(execEnv, ambientEnv);assertThat(credentials.sessionToken()).isNull();}@@ -434,7 +435,7 @@ class EksTokenMinterTest {@Testvoid execEnvSuppliesRegionFallbackAheadOfTheProcessEnvironment() throws Exception {- var supplier = EksTokenMinter.tokenSupplierIfRecognized(execNode("""+ Supplier<String> supplier = EksTokenMinter.tokenSupplierIfRecognized(execNode("""command: awsargs: [eks, get-token, --cluster-name, my-cluster]env:@@ -446,7 +447,7 @@ class EksTokenMinterTest {value: secret-from-exec-env""")).orElseThrow();- var uri = URI.create(decode(supplier.get()));+ URI uri = URI.create(decode(supplier.get()));assertThat(uri.getHost()).isEqualTo("sts.eu-central-1.amazonaws.com");}diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesApiClientKubeconfigTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesApiClientKubeconfigTest.javaindex 6441ac021d..ceebc5ea93 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesApiClientKubeconfigTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesApiClientKubeconfigTest.java@@ -52,9 +52,9 @@ class KubernetesApiClientKubeconfigTest {@Testvoid insecureSkipTlsVerifyTrustsASelfSignedServerCert(@TempDir Path tempDir) throws Exception {startSelfSignedServer();- var kubeconfig = writeKubeconfig(tempDir, true);+ Path kubeconfig = writeKubeconfig(tempDir, true);- var client = new KubernetesApiClient();+ KubernetesApiClient client = new KubernetesApiClient();client.initializeFromKubeconfigForTest(kubeconfig);assertThat(client.getPod("default", "whatever")).isEmpty();@@ -63,9 +63,9 @@ class KubernetesApiClientKubeconfigTest {@Testvoid withoutInsecureSkipTlsVerifyASelfSignedServerCertFailsTheHandshake(@TempDir Path tempDir) throws Exception {startSelfSignedServer();- var kubeconfig = writeKubeconfig(tempDir, false);+ Path kubeconfig = writeKubeconfig(tempDir, false);- var client = new KubernetesApiClient();+ KubernetesApiClient client = new KubernetesApiClient();client.initializeFromKubeconfigForTest(kubeconfig);assertThatThrownBy(() -> client.getPod("default", "whatever"))@@ -73,18 +73,18 @@ class KubernetesApiClientKubeconfigTest {}private void startSelfSignedServer() throws Exception {- var generator = new CertificateGenerator();- var generated = generator.generateSelfSignedCertificate(+ CertificateGenerator generator = new CertificateGenerator();+ CertificateGenerator.GeneratedCertificate generated = generator.generateSelfSignedCertificate("127.0.0.1", List.of("127.0.0.1"), KeyAlgorithm.RSA_2048);X509Certificate cert = Pem.parseCertificate(generated.certificatePem());PrivateKey privateKey = Pem.parsePrivateKey(generated.privateKeyPem());- var keyStore = KeyStore.getInstance(KeyStore.getDefaultType());+ KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());keyStore.load(null, null);keyStore.setKeyEntry("server", privateKey, new char[0], new Certificate[]{cert});- var keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());+ KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());keyManagerFactory.init(keyStore, new char[0]);- var sslContext = SSLContext.getInstance("TLS");+ SSLContext sslContext = SSLContext.getInstance("TLS");sslContext.init(keyManagerFactory.getKeyManagers(), null, null);server = HttpsServer.create(new InetSocketAddress("127.0.0.1", 0), 0);@@ -97,8 +97,8 @@ class KubernetesApiClientKubeconfigTest {}private Path writeKubeconfig(Path tempDir, boolean insecureSkipTlsVerify) throws Exception {- var port = server.getAddress().getPort();- var config = """+ int port = server.getAddress().getPort();+ String config = """apiVersion: v1kind: Configcurrent-context: test@@ -117,7 +117,7 @@ class KubernetesApiClientKubeconfigTest {user:token: test-token""".formatted(port, insecureSkipTlsVerify);- var path = tempDir.resolve("config");+ Path path = tempDir.resolve("config");Files.writeString(path, config);return path;}diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesFlociAddressResolverTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesFlociAddressResolverTest.javaindex adf65916e1..29fed83cb6 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesFlociAddressResolverTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesFlociAddressResolverTest.java@@ -27,8 +27,8 @@ class KubernetesFlociAddressResolverTest {@BeforeEachvoid setUp() {- var services = mock(EmulatorConfig.ServicesConfig.class);- var lambda = mock(EmulatorConfig.LambdaServiceConfig.class);+ EmulatorConfig.ServicesConfig services = mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.LambdaServiceConfig lambda = mock(EmulatorConfig.LambdaServiceConfig.class);kubernetes = mock(EmulatorConfig.LambdaServiceConfig.KubernetesExecutor.class);tls = mock(EmulatorConfig.TlsConfig.class);when(config.services()).thenReturn(services);diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesPodLauncherTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesPodLauncherTest.javaindex 919994a2c2..d6597b5d5d 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesPodLauncherTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/KubernetesPodLauncherTest.java@@ -1,6 +1,8 @@package io.github.hectorvent.floci.services.lambda.launcher.kubernetes;+import io.fabric8.kubernetes.api.model.ConfigMap;import io.fabric8.kubernetes.api.model.EnvVar;+import io.fabric8.kubernetes.api.model.Pod;import io.fabric8.kubernetes.api.model.PodBuilder;import io.fabric8.kubernetes.api.model.PodStatusBuilder;import io.fabric8.kubernetes.client.KubernetesClient;@@ -84,10 +86,10 @@ class KubernetesPodLauncherTest {@BeforeEachvoid setUp() {config = mock(EmulatorConfig.class);- var services = mock(EmulatorConfig.ServicesConfig.class);- var lambda = mock(EmulatorConfig.LambdaServiceConfig.class);- var kubernetes = mock(EmulatorConfig.LambdaServiceConfig.KubernetesExecutor.class);- var tls = mock(EmulatorConfig.TlsConfig.class);+ EmulatorConfig.ServicesConfig services = mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.LambdaServiceConfig lambda = mock(EmulatorConfig.LambdaServiceConfig.class);+ EmulatorConfig.LambdaServiceConfig.KubernetesExecutor kubernetes = mock(EmulatorConfig.LambdaServiceConfig.KubernetesExecutor.class);+ EmulatorConfig.TlsConfig tls = mock(EmulatorConfig.TlsConfig.class);lenient().when(config.services()).thenReturn(services);lenient().when(services.lambda()).thenReturn(lambda);lenient().when(lambda.kubernetes()).thenReturn(kubernetes);@@ -134,14 +136,14 @@ class KubernetesPodLauncherTest {/** The mock server's cert is self-signed and generated per run; trust it, not the JVM default. */private static HttpClient trustAllHttpClient() {try {- var trustAll = new X509TrustManager() {+ X509TrustManager trustAll = new X509TrustManager() {public void checkClientTrusted(X509Certificate[] chain, String authType) { }public void checkServerTrusted(X509Certificate[] chain, String authType) { }public X509Certificate[] getAcceptedIssuers() {return new X509Certificate[0];}};- var context = SSLContext.getInstance("TLS");+ SSLContext context = SSLContext.getInstance("TLS");context.init(null, new TrustManager[]{trustAll}, new SecureRandom());return HttpClient.newBuilder().sslContext(context).build();} catch (Exception e) {@@ -150,7 +152,7 @@ class KubernetesPodLauncherTest {}private LambdaFunction function() {- var fn = new LambdaFunction();+ LambdaFunction fn = new LambdaFunction();fn.setFunctionName("my-fn");fn.setAccountId("000000000000");fn.setFunctionArn("arn:aws:lambda:us-east-1:000000000000:function:my-fn");@@ -167,7 +169,7 @@ class KubernetesPodLauncherTest {Awaitility.await().atMost(Duration.ofSeconds(5)).until(() -> client.pods().inNamespace("default").list().getItems().stream().anyMatch(p -> p.getMetadata().getName().startsWith(namePrefix)));- var pod = client.pods().inNamespace("default").list().getItems().stream()+ Pod pod = client.pods().inNamespace("default").list().getItems().stream().filter(p -> p.getMetadata().getName().startsWith(namePrefix)).findFirst().orElseThrow();pod.setStatus(new PodStatusBuilder().withPhase(phase).build());@@ -181,7 +183,7 @@ class KubernetesPodLauncherTest {// Docker-launched one: without the owning account it resolves to the emulator's// default account and reads the wrong partition.markPodPhaseInBackground("floci-lambda-my-fn-", "Running");- var fn = function();+ LambdaFunction fn = function();fn.setAccountId("222222222222");fn.setFunctionArn("arn:aws:lambda:us-east-1:222222222222:function:my-fn");@@ -203,15 +205,15 @@ class KubernetesPodLauncherTest {"AWS_ACCESS_KEY_ID=000000000000","AWS_SECRET_ACCESS_KEY=test","AWS_SESSION_TOKEN=test"));- var fn = function();+ LambdaFunction fn = function();fn.setEnvironment(Map.of("AWS_ACCESS_KEY_ID", "user-partial-key"));launcher.launch(fn);- var pod = client.pods().inNamespace("default").list().getItems().stream()+ Pod pod = client.pods().inNamespace("default").list().getItems().stream().filter(p -> p.getMetadata().getName().startsWith("floci-lambda-my-fn-")).findFirst().orElseThrow();- var envVars = pod.getSpec().getContainers().getFirst().getEnv();+ List<EnvVar> envVars = pod.getSpec().getContainers().getFirst().getEnv();assertThat(envVars).extracting(EnvVar::getName, EnvVar::getValue).contains(tuple("AWS_ACCESS_KEY_ID", "000000000000")).doesNotContain(tuple("AWS_ACCESS_KEY_ID", "user-partial-key"));@@ -221,13 +223,13 @@ class KubernetesPodLauncherTest {void launchCreatesPodAndReturnsHandle() {markPodPhaseInBackground("floci-lambda-my-fn-", "Running");- var handle = launcher.launch(function());+ ContainerHandle handle = launcher.launch(function());assertThat(handle).isNotNull();assertThat(handle.getFunctionName()).isEqualTo("my-fn");assertThat(handle.getContainerId()).startsWith("floci-lambda-my-fn-");- var pod = client.pods().inNamespace("default").withName(handle.getContainerId()).get();+ Pod pod = client.pods().inNamespace("default").withName(handle.getContainerId()).get();assertThat(pod).isNotNull();assertThat(pod.getMetadata().getLabels()).containsEntry("app.kubernetes.io/managed-by", "floci");@@ -245,16 +247,16 @@ class KubernetesPodLauncherTest {@Testvoid downloadUrlCarriesTheOwningAccountForNonDefaultAccounts() {- var fn = function();+ LambdaFunction fn = function();fn.setAccountId("111122223333");fn.setFunctionArn("arn:aws:lambda:us-east-1:111122223333:function:my-fn");markPodPhaseInBackground("floci-lambda-my-fn-", "Running");- var handle = launcher.launch(fn);+ ContainerHandle handle = launcher.launch(fn);// The init container fetches unauthenticated, so the download URL must carry the// owning account or the object resolves under the default account and 404s.- var pod = client.pods().inNamespace("default").withName(handle.getContainerId()).get();+ Pod pod = client.pods().inNamespace("default").withName(handle.getContainerId()).get();assertThat(pod.getSpec().getInitContainers().getFirst().getCommand().get(2)).contains("snapshots/111122223333/my-fn?X-Amz-Credential=111122223333%2F");}@@ -279,9 +281,9 @@ class KubernetesPodLauncherTest {// the cleanup delete can never confirm the pod is gone. The pod could still reach// Running later and poll AWS_LAMBDA_RUNTIME_API, so the port must stay reserved// instead of going back to the pool for another environment.- var failingApiClient = spy(apiClient);+ KubernetesApiClient failingApiClient = spy(apiClient);doThrow(new RuntimeException("kube api down")).when(failingApiClient).deletePod(anyString(), anyString());- var failingLauncher = new KubernetesPodLauncher(failingApiClient, config,+ KubernetesPodLauncher failingLauncher = new KubernetesPodLauncher(failingApiClient, config,runtimeApiServerFactory, imageResolver, addressResolver, awsEnv, layerService,new LambdaPodSpecFactory(config), logStreamer, s3Service);markPodPhaseInBackground("floci-lambda-my-fn-", "Failed");@@ -310,7 +312,7 @@ class KubernetesPodLauncherTest {@Testvoid hotReloadIsRejectedBeforeAllocatingAnything() {- var fn = function();+ LambdaFunction fn = function();fn.setHotReloadHostPath("/tmp/code");assertThatThrownBy(() -> launcher.launch(fn))@@ -332,12 +334,12 @@ class KubernetesPodLauncherTest {@Testvoid stopDeletesPodAndReleasesRuntimeApiPort() {- var pod = new PodBuilder()+ Pod pod = new PodBuilder().withNewMetadata().withName("floci-lambda-my-fn-abc12345").endMetadata().build();client.pods().inNamespace("default").resource(pod).create();- var handle = new ContainerHandle("floci-lambda-my-fn-abc12345", "my-fn",+ ContainerHandle handle = new ContainerHandle("floci-lambda-my-fn-abc12345", "my-fn",runtimeApiServer, ContainerState.WARM);launcher.stop(handle);@@ -350,11 +352,11 @@ class KubernetesPodLauncherTest {@Testvoid isAliveReflectsPodPhase() {- var running = new PodBuilder()+ Pod running = new PodBuilder().withNewMetadata().withName("pod-running").endMetadata().withStatus(new PodStatusBuilder().withPhase("Running").build()).build();- var pending = new PodBuilder()+ Pod pending = new PodBuilder().withNewMetadata().withName("pod-pending").endMetadata().withStatus(new PodStatusBuilder().withPhase("Pending").build()).build();@@ -368,14 +370,14 @@ class KubernetesPodLauncherTest {@Testvoid orphanSweepDeletesOnlyManagedPods() {- var orphan = new PodBuilder()+ Pod orphan = new PodBuilder().withNewMetadata().withName("floci-lambda-old-fn-dead1234").withLabels(Map.of("app.kubernetes.io/managed-by", "floci","floci.io/service", "lambda")).endMetadata().build();- var unrelated = new PodBuilder()+ Pod unrelated = new PodBuilder().withNewMetadata().withName("some-other-pod").endMetadata().build();client.pods().inNamespace("default").resource(orphan).create();@@ -393,14 +395,14 @@ class KubernetesPodLauncherTest {@Testvoid stopDeletesPodEvenWhenPortReleaseThrows() {- var pod = new PodBuilder()+ Pod pod = new PodBuilder().withNewMetadata().withName("floci-lambda-my-fn-abc12345").endMetadata().build();client.pods().inNamespace("default").resource(pod).create();doThrow(new IllegalStateException("release failed")).when(runtimeApiServerFactory).release(runtimeApiServer);- var streamClosed = new AtomicBoolean();- var handle = new ContainerHandle("floci-lambda-my-fn-abc12345", "my-fn",+ AtomicBoolean streamClosed = new AtomicBoolean();+ ContainerHandle handle = new ContainerHandle("floci-lambda-my-fn-abc12345", "my-fn",runtimeApiServer, ContainerState.WARM);handle.setLogStream(() -> streamClosed.set(true));@@ -413,7 +415,7 @@ class KubernetesPodLauncherTest {@Testvoid failedOrphanSweepIsRetriedWithoutKillingOwnPods() {- var orphan = new PodBuilder()+ Pod orphan = new PodBuilder().withNewMetadata().withName("floci-lambda-old-fn-dead1234").withLabels(Map.of("app.kubernetes.io/managed-by", "floci",@@ -423,20 +425,20 @@ class KubernetesPodLauncherTest {client.pods().inNamespace("default").resource(orphan).create();// First Kubernetes API access (the sweep's pod list) fails once.- var failedOnce = new AtomicBoolean();- var flakyApiClient = spy(apiClient);+ AtomicBoolean failedOnce = new AtomicBoolean();+ KubernetesApiClient flakyApiClient = spy(apiClient);doAnswer(invocation -> {if (failedOnce.compareAndSet(false, true)) {throw new RuntimeException("kube api down");}return invocation.callRealMethod();}).when(flakyApiClient).listPods(anyString(), anyMap());- var retryingLauncher = new KubernetesPodLauncher(flakyApiClient, config,+ KubernetesPodLauncher retryingLauncher = new KubernetesPodLauncher(flakyApiClient, config,runtimeApiServerFactory, imageResolver, addressResolver, awsEnv, layerService,new LambdaPodSpecFactory(config), logStreamer, s3Service);markPodPhaseInBackground("floci-lambda-my-fn-", "Running");- var handle = retryingLauncher.launch(function());+ ContainerHandle handle = retryingLauncher.launch(function());assertThat(client.pods().inNamespace("default").withName("floci-lambda-old-fn-dead1234").get()).as("orphan survives the failed sweep").isNotNull();@@ -462,14 +464,14 @@ class KubernetesPodLauncherTest {void tlsOnPublishesTheCaBundleAsAConfigMapAndTheFunctionEnvWins() throws Exception {String bundlePem = enableTlsWithBundle();markPodPhaseInBackground("floci-lambda-my-fn-", "Running");- var fn = function();+ LambdaFunction fn = function();fn.setEnvironment(Map.of("SSL_CERT_FILE", "/my/own.pem"));- var handle = launcher.launch(fn);+ ContainerHandle handle = launcher.launch(fn);- var configMap = client.configMaps().inNamespace("default").withName(KubernetesPodLauncher.CA_CONFIG_MAP_NAME).get();+ ConfigMap configMap = client.configMaps().inNamespace("default").withName(KubernetesPodLauncher.CA_CONFIG_MAP_NAME).get();assertThat(configMap.getData()).containsEntry(KubernetesPodLauncher.CA_CONFIG_MAP_KEY, bundlePem);- var env = client.pods().inNamespace("default").withName(handle.getContainerId()).get()+ List<EnvVar> env = client.pods().inNamespace("default").withName(handle.getContainerId()).get().getSpec().getContainers().getFirst().getEnv();assertThat(env).extracting(EnvVar::getName, EnvVar::getValue).contains(tuple("SSL_CERT_FILE", "/my/own.pem"),@@ -485,8 +487,8 @@ class KubernetesPodLauncherTest {System.setProperty("floci.tls.enabled", "false");new TlsConfigSource(); // forgets the static directory a TLS-on bootstrap in another test class left behindSystem.clearProperty("floci.tls.enabled");- var tls = mock(EmulatorConfig.TlsConfig.class);- var storage = mock(EmulatorConfig.StorageConfig.class);+ EmulatorConfig.TlsConfig tls = mock(EmulatorConfig.TlsConfig.class);+ EmulatorConfig.StorageConfig storage = mock(EmulatorConfig.StorageConfig.class);when(config.tls()).thenReturn(tls);when(tls.enabled()).thenReturn(true);when(config.storage()).thenReturn(storage);diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/LambdaPodSpecFactoryTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/LambdaPodSpecFactoryTest.javaindex 799b8ce7d9..cb7a3719ae 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/LambdaPodSpecFactoryTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/kubernetes/LambdaPodSpecFactoryTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.lambda.launcher.kubernetes;import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.config.EmulatorConfig;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;@@ -34,8 +35,8 @@ class LambdaPodSpecFactoryTest {@BeforeEachvoid setUp() {- var services = mock(EmulatorConfig.ServicesConfig.class);- var lambda = mock(EmulatorConfig.LambdaServiceConfig.class);+ EmulatorConfig.ServicesConfig services = mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.LambdaServiceConfig lambda = mock(EmulatorConfig.LambdaServiceConfig.class);kubernetes = mock(EmulatorConfig.LambdaServiceConfig.KubernetesExecutor.class);tls = mock(EmulatorConfig.TlsConfig.class);when(config.services()).thenReturn(services);@@ -61,7 +62,7 @@ class LambdaPodSpecFactoryTest {}private static List<JsonNode> elements(JsonNode array) {- var list = new ArrayList<JsonNode>();+ ArrayList<JsonNode> list = new ArrayList<>();array.forEach(list::add);return list;}@@ -71,21 +72,21 @@ class LambdaPodSpecFactoryTest {}private static Map<String, String> stringMap(JsonNode object) {- var map = new LinkedHashMap<String, String>();+ LinkedHashMap<String, String> map = new LinkedHashMap<>();object.fields().forEachRemaining(entry -> map.put(entry.getKey(), entry.getValue().asText()));return map;}@Testvoid zipFunctionPodHasInitContainerTaskVolumeAndEnv() {- var spec = spec(buildZipPod());+ JsonNode spec = spec(buildZipPod());assertThat(spec.path("restartPolicy").asText()).isEqualTo("Never");assertThat(spec.path("terminationGracePeriodSeconds").asLong()).isEqualTo(5L);- var initContainers = elements(spec.path("initContainers"));+ List<JsonNode> initContainers = elements(spec.path("initContainers"));assertThat(initContainers).hasSize(1);- var init = initContainers.getFirst();+ JsonNode init = initContainers.getFirst();assertThat(init.path("image").asText()).isEqualTo("busybox:1.36");assertThat(texts(init.path("command")).get(2)).contains("wget -q -O /tmp/code.zip")@@ -95,7 +96,7 @@ class LambdaPodSpecFactoryTest {.extracting(n -> n.path("name").asText(), n -> n.path("mountPath").asText()).containsExactly(tuple("task", "/var/task"));- var runtime = elements(spec.path("containers")).getFirst();+ JsonNode runtime = elements(spec.path("containers")).getFirst();assertThat(runtime.path("name").asText()).isEqualTo("runtime");assertThat(texts(runtime.path("args"))).containsExactly("index.handler");assertThat(runtime.path("resources").path("limits").path("memory").asText()).isEqualTo("256Mi");@@ -113,7 +114,7 @@ class LambdaPodSpecFactoryTest {@Testvoid standardLabelsAreApplied() {- var labels = stringMap(buildZipPod().path("metadata").path("labels"));+ Map<String, String> labels = stringMap(buildZipPod().path("metadata").path("labels"));assertThat(labels).containsEntry("app.kubernetes.io/managed-by", "floci").containsEntry("floci.io/service", "lambda")@@ -124,7 +125,7 @@ class LambdaPodSpecFactoryTest {void userLabelsAreParsedAndApplied() {when(kubernetes.labels()).thenReturn(Optional.of(List.of("team=platform", "floci.io/env=ci", "empty-ok=")));- var labels = stringMap(buildZipPod().path("metadata").path("labels"));+ Map<String, String> labels = stringMap(buildZipPod().path("metadata").path("labels"));assertThat(labels).containsEntry("team", "platform").containsEntry("floci.io/env", "ci")@@ -137,7 +138,7 @@ class LambdaPodSpecFactoryTest {// such entries must never reach the pod spec.when(kubernetes.labels()).thenReturn(Optional.of(List.of("malformed", "a=b=c", "bad key=x", "team=platform")));- var labels = stringMap(buildZipPod().path("metadata").path("labels"));+ Map<String, String> labels = stringMap(buildZipPod().path("metadata").path("labels"));assertThat(labels).containsEntry("team", "platform").doesNotContainKeys("malformed", "a", "bad key");@@ -145,19 +146,19 @@ class LambdaPodSpecFactoryTest {@Testvoid layersAreDownloadedInOrderIntoOpt() {- var pod = factory.buildPod("floci-lambda-my-fn-abc12345", "my-fn",+ ObjectNode pod = factory.buildPod("floci-lambda-my-fn-abc12345", "my-fn","public.ecr.aws/lambda/nodejs:20",List.of(),"http://10.0.0.5:4566/awslambda-us-east-1-tasks/snapshots/000000000000/my-fn",List.of("http://10.0.0.5:4566/b/layers/1", "http://10.0.0.5:4566/b/layers/2"),false, "index.handler", null, 128, Optional.empty());- var spec = spec(pod);+ JsonNode spec = spec(pod);assertThat(elements(spec.path("volumes"))).extracting(n -> n.path("name").asText()).contains("opt");assertThat(elements(elements(spec.path("containers")).getFirst().path("volumeMounts"))).extracting(n -> n.path("name").asText(), n -> n.path("mountPath").asText()).contains(tuple("opt", "/opt"));- var init = elements(spec.path("initContainers")).getFirst();+ JsonNode init = elements(spec.path("initContainers")).getFirst();assertThat(elements(init.path("volumeMounts"))).extracting(n -> n.path("name").asText(), n -> n.path("mountPath").asText()).contains(tuple("opt", "/opt"));@@ -173,18 +174,18 @@ class LambdaPodSpecFactoryTest {void providedRuntimeCopiesBootstrapIntoVarRuntime() {// The provided.* entrypoint execs /var/runtime/bootstrap with no /var/task// fallback, so the init container must copy it there and restore the exec bit.- var pod = factory.buildPod("floci-lambda-custom-abc12345", "custom",+ ObjectNode pod = factory.buildPod("floci-lambda-custom-abc12345", "custom","public.ecr.aws/lambda/provided:al2023",List.of(),"http://10.0.0.5:4566/awslambda-us-east-1-tasks/snapshots/000000000000/custom",List.of(), true, "bootstrap", null, 128, Optional.empty());- var spec = spec(pod);+ JsonNode spec = spec(pod);assertThat(elements(spec.path("volumes"))).extracting(n -> n.path("name").asText()).contains("runtime");assertThat(elements(elements(spec.path("containers")).getFirst().path("volumeMounts"))).extracting(n -> n.path("name").asText(), n -> n.path("mountPath").asText()).contains(tuple("runtime", "/var/runtime"));- var init = elements(spec.path("initContainers")).getFirst();+ JsonNode init = elements(spec.path("initContainers")).getFirst();assertThat(elements(init.path("volumeMounts"))).extracting(n -> n.path("name").asText()).contains("runtime");@@ -205,7 +206,7 @@ class LambdaPodSpecFactoryTest {void managedLabelsCannotBeOverriddenByUserLabels() {when(kubernetes.labels()).thenReturn(Optional.of(List.of("app.kubernetes.io/managed-by=evil", "floci.io/service=other")));- var labels = stringMap(buildZipPod().path("metadata").path("labels"));+ Map<String, String> labels = stringMap(buildZipPod().path("metadata").path("labels"));assertThat(labels).containsEntry("app.kubernetes.io/managed-by", "floci").containsEntry("floci.io/service", "lambda");@@ -213,7 +214,7 @@ class LambdaPodSpecFactoryTest {@Testvoid dollarSignsInEnvValuesAreEscapedForKubernetesExpansion() {- var pod = factory.buildPod("floci-lambda-my-fn-abc12345", "my-fn",+ ObjectNode pod = factory.buildPod("floci-lambda-my-fn-abc12345", "my-fn","public.ecr.aws/lambda/python:3.12",List.of("SECRET=pa$$word", "TEMPLATE=$(HOME)/x"),"http://10.0.0.5:4566/b/k", List.of(), false, "h", null, 128, Optional.empty());@@ -229,14 +230,14 @@ class LambdaPodSpecFactoryTest {// Downloads stay plain HTTP even in TLS mode (busybox wget cannot TLS-handshake// with Floci); the CA bundle mount is for HTTPS calls made from inside the function.when(tls.enabled()).thenReturn(true);- var pod = factory.buildPod("floci-lambda-my-fn-abc12345", "my-fn",+ ObjectNode pod = factory.buildPod("floci-lambda-my-fn-abc12345", "my-fn","public.ecr.aws/lambda/python:3.12",List.of(),"http://10.0.0.5:4566/awslambda-us-east-1-tasks/snapshots/000000000000/my-fn",List.of(), false, "index.handler", null, 128,Optional.of(KubernetesPodLauncher.CA_CONFIG_MAP_NAME));- var spec = spec(pod);+ JsonNode spec = spec(pod);assertThat(elements(spec.path("volumes"))).anySatisfy(volume -> {assertThat(volume.path("name").asText()).isEqualTo("floci-ca");assertThat(volume.path("configMap").path("name").asText())@@ -256,7 +257,7 @@ class LambdaPodSpecFactoryTest {@Testvoid dollarSignsInCommandAndArgsAreEscapedForKubernetesExpansion() {- var pod = factory.buildPod("floci-lambda-img-abc12345", "img",+ ObjectNode pod = factory.buildPod("floci-lambda-img-abc12345", "img","123456789012.dkr.ecr.us-east-1.amazonaws.com/my-image:latest",List.of(), null, List.of(), false, null,new LambdaPodSpecFactory.ImageConfig(@@ -268,18 +269,18 @@ class LambdaPodSpecFactoryTest {@Testvoid imagePackageTypeHasNoInitContainerAndMapsImageConfig() {- var pod = factory.buildPod("floci-lambda-img-abc12345", "img",+ ObjectNode pod = factory.buildPod("floci-lambda-img-abc12345", "img","123456789012.dkr.ecr.us-east-1.amazonaws.com/my-image:latest",List.of(), null, List.of(), false, null,new LambdaPodSpecFactory.ImageConfig(List.of("/entry.sh"), List.of("arg1", "arg2"), "/work"),512, Optional.empty());- var spec = spec(pod);+ JsonNode spec = spec(pod);assertThat(elements(spec.path("initContainers"))).isEmpty();assertThat(elements(spec.path("volumes"))).isEmpty();- var runtime = elements(spec.path("containers")).getFirst();+ JsonNode runtime = elements(spec.path("containers")).getFirst();assertThat(texts(runtime.path("command"))).containsExactly("/entry.sh");assertThat(texts(runtime.path("args"))).containsExactly("arg1", "arg2");assertThat(runtime.path("workingDir").asText()).isEqualTo("/work");@@ -287,7 +288,7 @@ class LambdaPodSpecFactoryTest {@Testvoid envEntriesSplitOnFirstEquals() {- var pod = factory.buildPod("floci-lambda-my-fn-abc12345", "my-fn",+ ObjectNode pod = factory.buildPod("floci-lambda-my-fn-abc12345", "my-fn","public.ecr.aws/lambda/python:3.12",List.of("KEY=a=b", "EMPTY="),"http://10.0.0.5:4566/b/k", List.of(), false, "h", null, 128, Optional.empty());@@ -301,7 +302,7 @@ class LambdaPodSpecFactoryTest {@Testvoid envEntriesWithEmptyNamesAreDropped() {// The API server rejects a pod whose env var has an empty name.- var pod = factory.buildPod("floci-lambda-my-fn-abc12345", "my-fn",+ ObjectNode pod = factory.buildPod("floci-lambda-my-fn-abc12345", "my-fn","public.ecr.aws/lambda/python:3.12",List.of("=oops", "KEY=1"),"http://10.0.0.5:4566/b/k", List.of(), false, "h", null, 128, Optional.empty());@@ -312,11 +313,11 @@ class LambdaPodSpecFactoryTest {@Testvoid podNameIsDnsSafeAndClamped() {- var name = LambdaPodSpecFactory.podName("My_Function.With.Dots", "abc12345");+ String name = LambdaPodSpecFactory.podName("My_Function.With.Dots", "abc12345");assertThat(name).isEqualTo("floci-lambda-my-function-with-dots-abc12345");assertThat(name).hasSizeLessThanOrEqualTo(63);- var longName = LambdaPodSpecFactory.podName("a".repeat(100), "abc12345");+ String longName = LambdaPodSpecFactory.podName("a".repeat(100), "abc12345");assertThat(longName).hasSizeLessThanOrEqualTo(63).endsWith("-abc12345")diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/zip/ZipExtractorTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/zip/ZipExtractorTest.javaindex 5d273eddc0..53a19511fd 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/zip/ZipExtractorTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/zip/ZipExtractorTest.java@@ -11,6 +11,7 @@ import java.nio.file.Path;import java.nio.file.attribute.PosixFilePermissions;import java.util.ArrayList;import java.util.List;+import java.util.stream.Stream;import java.util.zip.CRC32;import java.util.zip.Deflater;import java.util.zip.ZipException;@@ -446,7 +447,7 @@ class ZipExtractorTest {}private static void assertNoStagingArtefacts(Path codeStore) throws IOException {- try (var entries = Files.list(codeStore)) {+ try (Stream<Path> entries = Files.list(codeStore)) {assertEquals(List.of("fn"), entries.map(p -> p.getFileName().toString()).sorted().toList(),"no staged archive or staging directory may survive extraction, successful or failed");}@@ -536,7 +537,7 @@ class ZipExtractorTest {assertTrue(Files.isRegularFile(target.resolve("index.js")),"a failed install must put the previous package back, not leave the function empty");assertEquals("v1", Files.readString(target.resolve("index.js")));- try (var entries = Files.list(codeStore)) {+ try (Stream<Path> entries = Files.list(codeStore)) {assertEquals(List.of("fn"), entries.map(p -> p.getFileName().toString()).sorted().toList(),"the restored package must not leave a renamed copy behind");}@@ -554,7 +555,7 @@ class ZipExtractorTest {assertEquals("v2", Files.readString(target.resolve("index.js")));assertFalse(Files.exists(target.resolve("removed.js")), "install must replace, not merge");- try (var entries = Files.list(codeStore)) {+ try (Stream<Path> entries = Files.list(codeStore)) {assertEquals(List.of("fn"), entries.map(p -> p.getFileName().toString()).sorted().toList(),"neither the staging tree nor the superseded package may survive");}@@ -583,7 +584,7 @@ class ZipExtractorTest {assertEquals("v2", Files.readString(target.resolve("index.js")),"the new package must be installed even though the old one could not be removed");} finally {- try (var stream = Files.list(codeStore)) {+ try (Stream<Path> stream = Files.list(codeStore)) {for (Path p : stream.toList()) {Path stuck = p.resolve("locked");if (Files.isDirectory(stuck)) {diff --git a/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceCatalogControllerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceCatalogControllerIntegrationTest.javaindex ef7acc1931..b032d74e29 100644--- a/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceCatalogControllerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceCatalogControllerIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.marketplace;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.Response;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;@@ -25,7 +26,7 @@ class MarketplaceCatalogControllerIntegrationTest {.body("ChangeSetId", notNullValue()).body("ChangeSetArn", containsString(":000000000000:AWSMarketplace/ChangeSet/")).extract().path("ChangeSetId");- var described = given().header("Authorization", auth())+ Response described = given().header("Authorization", auth()).get("/DescribeChangeSet?catalog=AWSMarketplace&changeSetId=" + id).then().statusCode(200).body("Status", equalTo("SUCCEEDED")).extract().response();String entityId = described.path("ChangeSet[0].Entity.Identifier");@@ -63,7 +64,7 @@ class MarketplaceCatalogControllerIntegrationTest {String cs = given().contentType("application/json").header("Authorization", auth()).body("{\"Catalog\":\"AWSMarketplace\",\"ChangeSet\":[{\"ChangeType\":\"CreateProduct\",\"Entity\":{\"Type\":\"[email protected]\",\"Identifier\":\"@1\"},\"DetailsDocument\":{}}]}").post("/StartChangeSet").then().statusCode(200).extract().path("ChangeSetId");- var response = given().header("Authorization", auth())+ Response response = given().header("Authorization", auth()).get("/DescribeChangeSet?catalog=AWSMarketplace&changeSetId=" + cs).then().extract().response();String arn = response.path("ChangeSet[0].EntityArn");diff --git a/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceDeploymentIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceDeploymentIntegrationTest.javaindex c907f391b5..04dc7c3673 100644--- a/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceDeploymentIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceDeploymentIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.marketplace;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.Response;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;@@ -18,7 +19,7 @@ class MarketplaceDeploymentIntegrationTest {String body = "{\"agreementId\":\"agr-local\",\"clientToken\":\"12345678901234567890123456789012\","+ "\"deploymentParameter\":{\"name\":\"ApiKey\",\"secretString\":\"local-secret\"},"+ "\"tags\":{\"env\":\"test\"}}";- var response = given().contentType("application/json").header("Authorization", auth()).body(body)+ Response response = given().contentType("application/json").header("Authorization", auth()).body(body).post("/catalogs/AWSMarketplace/products/prod-local/deployment-parameters").then().statusCode(200).body("deploymentParameterId", notNullValue()).body("tags.env", equalTo("test")).extract().response();diff --git a/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceMeteringIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceMeteringIntegrationTest.javaindex 28e976da3c..cc0be35ff1 100644--- a/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceMeteringIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceMeteringIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.marketplace;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.Response;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;@@ -17,7 +18,7 @@ class MarketplaceMeteringIntegrationTest {@Testvoid resolveCustomerIsStableForRegistrationToken() {String body = "{\"RegistrationToken\":\"local-registration-token\"}";- var first = rpc("ResolveCustomer", body).statusCode(200)+ Response first = rpc("ResolveCustomer", body).statusCode(200).body("CustomerAWSAccountId", notNullValue()).body("LicenseArn", notNullValue()).extract().response();rpc("ResolveCustomer", body).statusCode(200)diff --git a/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceReportingServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceReportingServiceTest.javaindex 35294c53c5..d76f645ea7 100644--- a/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceReportingServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/marketplace/MarketplaceReportingServiceTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.marketplace;import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsException;import org.junit.jupiter.api.Test;@@ -14,7 +15,7 @@ class MarketplaceReportingServiceTest {@Testvoid getBuyerDashboardBuildsAccountScopedEmbedUrl() throws Exception {- var response = service.getBuyerDashboard(mapper.readTree("""+ ObjectNode response = service.getBuyerDashboard(mapper.readTree("""{"dashboardIdentifier":"arn:aws:aws-marketplace::123456789012:AWSMarketplace/ReportingData/Agreement_V1/Dashboard/AgreementSummary_V1","embeddingDomains":["https://example.com"]}"""), "123456789012");diff --git a/src/test/java/io/github/hectorvent/floci/services/msk/MskControllerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/msk/MskControllerIntegrationTest.javaindex 9edc5dacdc..19aff81555 100644--- a/src/test/java/io/github/hectorvent/floci/services/msk/MskControllerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/msk/MskControllerIntegrationTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.msk;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.path.json.JsonPath;import org.junit.jupiter.api.Test;import java.nio.charset.StandardCharsets;@@ -628,7 +629,7 @@ class MskControllerIntegrationTest {.when().post("/v1/configurations").then().statusCode(200);- var page1 = given()+ JsonPath page1 = given().when().get("/v1/configurations?maxResults=1").then().statusCode(200).body("configurations", hasSize(1))diff --git a/src/test/java/io/github/hectorvent/floci/services/msk/MskServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/msk/MskServiceTest.javaindex d7f9e47746..3ee325fb31 100644--- a/src/test/java/io/github/hectorvent/floci/services/msk/MskServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/msk/MskServiceTest.java@@ -79,8 +79,8 @@ class MskServiceTest {});config = Mockito.mock(EmulatorConfig.class);- var servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);- var mskConfig = Mockito.mock(EmulatorConfig.MskServiceConfig.class);+ EmulatorConfig.ServicesConfig servicesConfig = Mockito.mock(EmulatorConfig.ServicesConfig.class);+ EmulatorConfig.MskServiceConfig mskConfig = Mockito.mock(EmulatorConfig.MskServiceConfig.class);when(config.services()).thenReturn(servicesConfig);when(servicesConfig.msk()).thenReturn(mskConfig);diff --git a/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallConcurrencyTest.java b/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallConcurrencyTest.javaindex d804dafad7..cdf34fb781 100644--- a/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallConcurrencyTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallConcurrencyTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.networkfirewall;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.AwsException;import io.github.hectorvent.floci.core.storage.InMemoryStorage;@@ -87,7 +88,7 @@ class NetworkFirewallConcurrencyTest {create.put("FirewallName", NAME);create.put("VpcId", "vpc-0123456789abcdef0");create.put("SubnetChangeProtection", false);- var mappings = create.putArray("SubnetMappings");+ ArrayNode mappings = create.putArray("SubnetMappings");for (int caller = 0; caller < CALLERS; caller++) {mappings.addObject().put("SubnetId", String.format("subnet-%017d", caller));}diff --git a/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsIntegrationTest.javaindex 3e9f48842b..2570abb247 100644--- a/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.organizations;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.path.json.JsonPath;import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.MethodOrderer;@@ -275,7 +276,7 @@ class OrganizationsIntegrationTest {@Test@Order(20)void createAccount() {- var response = organizations("CreateAccount",+ JsonPath response = organizations("CreateAccount","{\"Email\":\"[email protected]\",\"AccountName\":\"Dev\"}").when().post("/")diff --git a/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsInvalidEffectivePolicyIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsInvalidEffectivePolicyIntegrationTest.javaindex 3bbf212f1c..3807d66cab 100644--- a/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsInvalidEffectivePolicyIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsInvalidEffectivePolicyIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.organizations;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.path.json.JsonPath;import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.MethodOrderer;@@ -134,7 +135,7 @@ class OrganizationsInvalidEffectivePolicyIntegrationTest {@Test@Order(7)void createMemberAccount() {- var response = organizations("CreateAccount", "{\"Email\":\"[email protected]\",\"AccountName\":\"Member\"}")+ JsonPath response = organizations("CreateAccount", "{\"Email\":\"[email protected]\",\"AccountName\":\"Member\"}").when().post("/").then()diff --git a/src/test/java/io/github/hectorvent/floci/services/pipes/PipesServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/pipes/PipesServiceTest.javaindex 49c04adfab..d61a87d8c3 100644--- a/src/test/java/io/github/hectorvent/floci/services/pipes/PipesServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/pipes/PipesServiceTest.java@@ -128,7 +128,7 @@ class PipesServiceTest {@Testvoid createPipeWithSelfManagedKafkaSourceRequiresTopicParameters() throws Exception {- var mapper = new com.fasterxml.jackson.databind.ObjectMapper();+ ObjectMapper mapper = new ObjectMapper();AwsException ex = assertThrows(AwsException.class, () ->pipesService.createPipe("smk-pipe","smk://localhost:9092",diff --git a/src/test/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManagerTest.javaindex 6f4d92ee96..96721ed75c 100644--- a/src/test/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManagerTest.java@@ -10,10 +10,14 @@ import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager;import io.github.hectorvent.floci.core.common.docker.ContainerLogStreamer;import io.github.hectorvent.floci.core.common.docker.ContainerSpec;import io.github.hectorvent.floci.core.common.docker.DockerHostResolver;+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;+import org.mockito.ArgumentCaptor;import org.mockito.InOrder;+import java.io.InputStream;import java.nio.file.Files;import java.nio.file.Path;import java.time.Instant;@@ -30,6 +34,7 @@ import com.github.dockerjava.api.command.PauseContainerCmd;import com.github.dockerjava.api.command.UnpauseContainerCmd;import com.github.dockerjava.api.model.Bind;import io.github.hectorvent.floci.services.rds.model.DatabaseEngine;+import org.mockito.Mockito;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;@@ -254,17 +259,17 @@ class RdsContainerManagerTest {manager.start("db1", "vol1", DatabaseEngine.MYSQL, "mysql:8.0", "admin", "password", "db");verify(copyCmd).withRemotePath("/docker-entrypoint-initdb.d");- var tarCaptor = org.mockito.ArgumentCaptor.forClass(java.io.InputStream.class);+ ArgumentCaptor<InputStream> tarCaptor = ArgumentCaptor.forClass(InputStream.class);verify(copyCmd).withTarInputStream(tarCaptor.capture());- try (var tar = new org.apache.commons.compress.archivers.tar.TarArchiveInputStream(tarCaptor.getValue())) {- var entry = tar.getNextEntry();+ try (TarArchiveInputStream tar = new TarArchiveInputStream(tarCaptor.getValue())) {+ TarArchiveEntry entry = tar.getNextEntry();assertEquals("floci-master-grants.sql", entry.getName());assertEquals(RdsContainerManager.mysqlMasterGrantSql("admin"),new String(tar.readAllBytes(), java.nio.charset.StandardCharsets.UTF_8));}// The script lands on the created container before it starts, so the entrypoint's// one-time init phase is the thing that runs it.- var order = org.mockito.Mockito.inOrder(dockerClient, lifecycleManager);+ InOrder order = Mockito.inOrder(dockerClient, lifecycleManager);order.verify(dockerClient).copyArchiveToContainerCmd("container-id");order.verify(lifecycleManager).startCreated(org.mockito.ArgumentMatchers.eq("container-id"), any());}@@ -320,7 +325,7 @@ class RdsContainerManagerTest {manager.start("db1", "vol1", DatabaseEngine.MYSQL, "mysql:8.0", "root", "password", "db");assertFalse(Files.exists(dbPath));- var spec = org.mockito.ArgumentCaptor.forClass(ContainerSpec.class);+ ArgumentCaptor<ContainerSpec> spec = ArgumentCaptor.forClass(ContainerSpec.class);verify(lifecycleManager).create(spec.capture());Bind bind = spec.getValue().binds().getFirst();assertEquals(dbPath.toString(), bind.getPath());@@ -353,7 +358,7 @@ class RdsContainerManagerTest {manager.start(runtimeId, "db1", null,DatabaseEngine.MYSQL, "mysql:8.0", "root", "password", "db");- var spec = org.mockito.ArgumentCaptor.forClass(ContainerSpec.class);+ ArgumentCaptor<ContainerSpec> spec = ArgumentCaptor.forClass(ContainerSpec.class);verify(lifecycleManager).create(spec.capture());assertEquals(dbPath.toString(), spec.getValue().binds().getFirst().getPath());assertEquals("floci-aws-rds-db1", spec.getValue().name());@@ -382,7 +387,7 @@ class RdsContainerManagerTest {manager.start("arn:aws:rds:us-west-2:222222222222:db:db1", "db1", null,DatabaseEngine.MYSQL, "mysql:8.0", "root", "password", "db");- var spec = org.mockito.ArgumentCaptor.forClass(ContainerSpec.class);+ ArgumentCaptor<ContainerSpec> spec = ArgumentCaptor.forClass(ContainerSpec.class);verify(lifecycleManager).create(spec.capture());assertEquals(Map.of("io.floci", "aws",@@ -412,7 +417,7 @@ class RdsContainerManagerTest {manager.start("db1", "vol1", DatabaseEngine.MYSQL, "mysql:8.0", "root", "password", "db");- var spec = org.mockito.ArgumentCaptor.forClass(ContainerSpec.class);+ ArgumentCaptor<ContainerSpec> spec = ArgumentCaptor.forClass(ContainerSpec.class);verify(lifecycleManager).create(spec.capture());assertEquals(Map.of("io.floci", "aws",@@ -1092,7 +1097,7 @@ class RdsContainerManagerTest {manager.start("db1", "volume-a", DatabaseEngine.MYSQL, "mysql:8.0", "root", "password", "db");- var spec = org.mockito.ArgumentCaptor.forClass(ContainerSpec.class);+ ArgumentCaptor<ContainerSpec> spec = ArgumentCaptor.forClass(ContainerSpec.class);verify(lifecycleManager).removeIfExistsStrict("floci-rds-volume-a");verify(lifecycleManager).create(spec.capture());assertEquals("floci-aws-rds-volume-a", spec.getValue().name());@@ -1123,7 +1128,7 @@ class RdsContainerManagerTest {manager.start(null, "db1", "db1", "floci-rds-db1",DatabaseEngine.MYSQL, "mysql:8.0", "root", "password", "db");- var spec = org.mockito.ArgumentCaptor.forClass(ContainerSpec.class);+ ArgumentCaptor<ContainerSpec> spec = ArgumentCaptor.forClass(ContainerSpec.class);verify(lifecycleManager).create(spec.capture());assertEquals("floci-aws-rds-db1", spec.getValue().name(),"the container is renamed to the current prefix");@@ -1158,7 +1163,7 @@ class RdsContainerManagerTest {null, "db1", null, DatabaseEngine.MYSQL,"mysql:8.0", "root", "password", "db");- var spec = org.mockito.ArgumentCaptor.forClass(ContainerSpec.class);+ ArgumentCaptor<ContainerSpec> spec = ArgumentCaptor.forClass(ContainerSpec.class);verify(lifecycleManager).removeIfExistsStrict("floci-rds-db1");verify(lifecycleManager).create(spec.capture());assertEquals("floci-aws-rds-db1", spec.getValue().name());diff --git a/src/test/java/io/github/hectorvent/floci/services/rds/model/DbClusterPersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/model/DbClusterPersistenceTest.javaindex 2294c632f0..1710239fba 100644--- a/src/test/java/io/github/hectorvent/floci/services/rds/model/DbClusterPersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rds/model/DbClusterPersistenceTest.java@@ -7,6 +7,7 @@ import org.junit.jupiter.api.io.TempDir;import java.nio.file.Path;import java.util.Map;+import java.util.Optional;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertTrue;@@ -23,15 +24,15 @@ class DbClusterPersistenceTest {cluster.setServerlessV2MaxCapacity(16.0);cluster.setServerlessV2SecondsUntilAutoPause(600);- var writer = new PersistentStorage<String, DbCluster>(+ PersistentStorage<String, DbCluster> writer = new PersistentStorage<>(file, new TypeReference<Map<String, DbCluster>>() {});writer.put(cluster.getDbClusterIdentifier(), cluster);- var reader = new PersistentStorage<String, DbCluster>(+ PersistentStorage<String, DbCluster> reader = new PersistentStorage<>(file, new TypeReference<Map<String, DbCluster>>() {});reader.load();- var restored = reader.get(cluster.getDbClusterIdentifier());+ Optional<DbCluster> restored = reader.get(cluster.getDbClusterIdentifier());assertTrue(restored.isPresent());assertEquals("aurora-postgresql", restored.get().getEngineIdentifier());assertEquals(0.0, restored.get().getServerlessV2MinCapacity());diff --git a/src/test/java/io/github/hectorvent/floci/services/rds/proxy/PostgresProtocolHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/proxy/PostgresProtocolHandlerTest.javaindex 9174b65eea..7b61cae3c2 100644--- a/src/test/java/io/github/hectorvent/floci/services/rds/proxy/PostgresProtocolHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rds/proxy/PostgresProtocolHandlerTest.java@@ -14,6 +14,7 @@ import java.io.ByteArrayOutputStream;import java.io.DataInputStream;import java.io.DataOutputStream;import java.io.IOException;+import java.io.InputStream;import java.net.ServerSocket;import java.net.Socket;import java.nio.charset.StandardCharsets;@@ -1160,7 +1161,7 @@ class PostgresProtocolHandlerTest {private static SSLSocket verifyingClientSocket(Socket socket, Path caCertFile, String advertisedHost)throws Exception {X509Certificate ca;- try (var in = Files.newInputStream(caCertFile)) {+ try (InputStream in = Files.newInputStream(caCertFile)) {ca = (X509Certificate) CertificateFactory.getInstance("X.509").generateCertificate(in);}KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());diff --git a/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessServiceTest.javaindex 0f5f71a769..17f4ccd60d 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshiftserverless/RedshiftServerlessServiceTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.redshiftserverless;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.common.PaginatedResult;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;@@ -148,7 +149,7 @@ class RedshiftServerlessServiceTest {service.listNamespaces(REGION, null, null).items().stream().map(Namespace::getNamespaceName).toList());- var firstPage = service.listNamespaces(REGION, 1, null);+ PaginatedResult<Namespace> firstPage = service.listNamespaces(REGION, 1, null);assertEquals(List.of("alpha-ns"), firstPage.items().stream().map(Namespace::getNamespaceName).toList());assertEquals(List.of("beta-ns"), service.listNamespaces(REGION, 1, firstPage.nextToken()).items().stream().map(Namespace::getNamespaceName).toList());diff --git a/src/test/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2IntegrationTest.javaindex 0ecbe1f59d..3e4570e571 100644--- a/src/test/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2IntegrationTest.java@@ -6,6 +6,7 @@ import io.github.hectorvent.floci.core.common.AwsPartitions;import io.github.hectorvent.floci.core.common.AwsRegions;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.Response;import org.junit.jupiter.api.AfterEach;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.MethodOrderer;@@ -481,7 +482,7 @@ class ResourceExplorer2IntegrationTest {@Testvoid searchWithEmptyQueryReturnsAllResources() {- var response = given()+ Response response = given().header("Authorization", AUTH).contentType("application/json").body("""@@ -1308,7 +1309,7 @@ class ResourceExplorer2IntegrationTest {: "{\"MaxResults\": 1, \"NextToken\": \"" + nextToken+ "\", \"Filters\": {\"FilterString\": \"" + BOUNDED_SCOPE + "\"}}";- var response = given()+ Response response = given().header("Authorization", AUTH).contentType("application/json").body(body)@@ -1446,7 +1447,7 @@ class ResourceExplorer2IntegrationTest {.statusCode(200).extract().path("Resources");- for (var resource : resources) {+ for (Map<String, Object> resource : resources) {assertNotNull(resource.get("Arn"), "Resource missing Arn: " + resource);assertNotNull(resource.get("ResourceType"), "Resource missing ResourceType: " + resource);assertNotNull(resource.get("Service"), "Resource missing Service: " + resource);@@ -1484,7 +1485,7 @@ class ResourceExplorer2IntegrationTest {.then().extract().path("Resources");- for (var resource : resources) {+ for (Map<String, Object> resource : resources) {String service = (String) resource.get("Service");String resourceType = (String) resource.get("ResourceType");assertTrue(@@ -1504,7 +1505,7 @@ class ResourceExplorer2IntegrationTest {.then().extract().path("Resources");- for (var resource : resources) {+ for (Map<String, Object> resource : resources) {String arn = (String) resource.get("Arn");String service = (String) resource.get("Service");Arn parsed = AwsArnUtils.parse(arn);diff --git a/src/test/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2PaginationTest.java b/src/test/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2PaginationTest.javaindex 8e01d2c844..b18232b14a 100644--- a/src/test/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2PaginationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/resourceexplorer2/ResourceExplorer2PaginationTest.java@@ -26,7 +26,7 @@ class ResourceExplorer2PaginationTest {@Testvoid firstPageStartsAtZero() {- var b = ResourceExplorer2Service.pageBounds(50, 10, null, CAP);+ ResourceExplorer2Service.PageBounds b = ResourceExplorer2Service.pageBounds(50, 10, null, CAP);assertEquals(0, b.start());assertEquals(10, b.end());assertEquals(50, b.total());@@ -34,7 +34,7 @@ class ResourceExplorer2PaginationTest {@Testvoid secondPageOffsetsByToken() {- var b = ResourceExplorer2Service.pageBounds(50, 10, token(10), CAP);+ ResourceExplorer2Service.PageBounds b = ResourceExplorer2Service.pageBounds(50, 10, token(10), CAP);assertEquals(10, b.start());assertEquals(20, b.end());assertEquals(50, b.total());@@ -42,14 +42,14 @@ class ResourceExplorer2PaginationTest {@Testvoid lastPageIsPartial() {- var b = ResourceExplorer2Service.pageBounds(25, 10, token(20), CAP);+ ResourceExplorer2Service.PageBounds b = ResourceExplorer2Service.pageBounds(25, 10, token(20), CAP);assertEquals(20, b.start());assertEquals(25, b.end());}@Testvoid nullMaxResultsDefaultsTo100() {- var b = ResourceExplorer2Service.pageBounds(200, null, null, CAP);+ ResourceExplorer2Service.PageBounds b = ResourceExplorer2Service.pageBounds(200, null, null, CAP);assertEquals(100, b.end());}@@ -57,7 +57,7 @@ class ResourceExplorer2PaginationTest {void offsetBeyondSizeClampsToEmptyPageInsteadOfThrowing() {// The live result set can shrink between calls; a stale offset must not produce// subList(fromIndex > toIndex) which would throw and 500.- var b = ResourceExplorer2Service.pageBounds(10, 100, token(999), CAP);+ ResourceExplorer2Service.PageBounds b = ResourceExplorer2Service.pageBounds(10, 100, token(999), CAP);assertEquals(10, b.start());assertEquals(10, b.end());assertEquals(0, b.end() - b.start());@@ -77,7 +77,7 @@ class ResourceExplorer2PaginationTest {@Testvoid totalIsCappedAt1000() {- var b = ResourceExplorer2Service.pageBounds(1500, 1000, null, CAP);+ ResourceExplorer2Service.PageBounds b = ResourceExplorer2Service.pageBounds(1500, 1000, null, CAP);assertEquals(1000, b.total());assertEquals(0, b.start());assertEquals(1000, b.end());@@ -85,7 +85,7 @@ class ResourceExplorer2PaginationTest {@Testvoid paginationStaysWithinTheCap() {- var b = ResourceExplorer2Service.pageBounds(1500, 100, token(950), CAP);+ ResourceExplorer2Service.PageBounds b = ResourceExplorer2Service.pageBounds(1500, 100, token(950), CAP);assertEquals(1000, b.total());assertEquals(950, b.start());assertEquals(1000, b.end());@@ -93,7 +93,7 @@ class ResourceExplorer2PaginationTest {@Testvoid offsetBeyondCapClampsToEmpty() {- var b = ResourceExplorer2Service.pageBounds(1500, 100, token(1200), CAP);+ ResourceExplorer2Service.PageBounds b = ResourceExplorer2Service.pageBounds(1500, 100, token(1200), CAP);assertEquals(1000, b.total());assertEquals(1000, b.start());assertEquals(1000, b.end());diff --git a/src/test/java/io/github/hectorvent/floci/services/resourceexplorer2/query/QueryParserTest.java b/src/test/java/io/github/hectorvent/floci/services/resourceexplorer2/query/QueryParserTest.javaindex 5574164eb5..ff70396bcc 100644--- a/src/test/java/io/github/hectorvent/floci/services/resourceexplorer2/query/QueryParserTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/resourceexplorer2/query/QueryParserTest.java@@ -6,6 +6,8 @@ import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.NullAndEmptySource;import org.junit.jupiter.params.provider.ValueSource;+import java.util.List;+import static org.junit.jupiter.api.Assertions.*;class QueryParserTest {@@ -84,7 +86,7 @@ class QueryParserTest {ParsedQuery query = QueryParser.parse("service:ec2");assertTrue(query.keywords().isEmpty());assertEquals(1, query.filters().size());- var filter = query.filters().getFirst();+ ParsedQuery.Filter filter = query.filters().getFirst();assertEquals(FilterAttribute.SERVICE, filter.attribute());assertEquals(1, filter.values().size());assertEquals("ec2", filter.values().getFirst().value());@@ -102,7 +104,7 @@ class QueryParserTest {@Testvoid resourceTypeFilter() {ParsedQuery query = QueryParser.parse("resourcetype:s3:bucket");- var filter = query.filters().getFirst();+ ParsedQuery.Filter filter = query.filters().getFirst();assertEquals(FilterAttribute.RESOURCE_TYPE, filter.attribute());assertEquals("s3:bucket", filter.values().getFirst().value());}@@ -185,7 +187,7 @@ class QueryParserTest {@Testvoid twoValuesCommaOr() {ParsedQuery query = QueryParser.parse("region:us-east-1,us-west-2");- var filter = query.filters().getFirst();+ ParsedQuery.Filter filter = query.filters().getFirst();assertEquals(2, filter.values().size());assertEquals("us-east-1", filter.values().get(0).value());assertEquals("us-west-2", filter.values().get(1).value());@@ -194,7 +196,7 @@ class QueryParserTest {@Testvoid threeValuesCommaOr() {ParsedQuery query = QueryParser.parse("resourcetype:rds:db,s3:bucket,dynamodb:table");- var filter = query.filters().getFirst();+ ParsedQuery.Filter filter = query.filters().getFirst();assertEquals(3, filter.values().size());assertEquals("rds:db", filter.values().get(0).value());assertEquals("s3:bucket", filter.values().get(1).value());@@ -204,7 +206,7 @@ class QueryParserTest {@Testvoid doubleCommaProducesEmptySegment() {ParsedQuery query = QueryParser.parse("region:us-east-1,,us-west-2");- var filter = query.filters().getFirst();+ ParsedQuery.Filter filter = query.filters().getFirst();assertEquals(3, filter.values().size());assertEquals("us-east-1", filter.values().get(0).value());assertEquals("", filter.values().get(1).value());@@ -218,7 +220,7 @@ class QueryParserTest {@Testvoid negatedFilter() {ParsedQuery query = QueryParser.parse("-service:ec2");- var filter = query.filters().getFirst();+ ParsedQuery.Filter filter = query.filters().getFirst();assertTrue(filter.negated());assertEquals(FilterAttribute.SERVICE, filter.attribute());assertEquals("ec2", filter.values().getFirst().value());@@ -227,7 +229,7 @@ class QueryParserTest {@Testvoid negatedFilterWithCommaOr() {ParsedQuery query = QueryParser.parse("-region:us-east-1,us-west-2");- var filter = query.filters().getFirst();+ ParsedQuery.Filter filter = query.filters().getFirst();assertTrue(filter.negated());assertEquals(2, filter.values().size());}@@ -239,7 +241,7 @@ class QueryParserTest {@Testvoid wildcardSuffix() {ParsedQuery query = QueryParser.parse("region:us*");- var value = query.filters().getFirst().values().getFirst();+ ParsedQuery.FilterValue value = query.filters().getFirst().values().getFirst();assertEquals("us", value.value());assertTrue(value.prefixMatch());}@@ -247,7 +249,7 @@ class QueryParserTest {@Testvoid wildcardWithCommaOr() {ParsedQuery query = QueryParser.parse("resourcetype:ec2:*,s3:bucket");- var values = query.filters().getFirst().values();+ List<ParsedQuery.FilterValue> values = query.filters().getFirst().values();assertEquals("ec2:", values.get(0).value());assertTrue(values.get(0).prefixMatch());assertEquals("s3:bucket", values.get(1).value());@@ -261,7 +263,7 @@ class QueryParserTest {@Testvoid escapedCommaInFilterValue() {ParsedQuery query = QueryParser.parse("tag.key:comma\\,literal");- var filter = query.filters().getFirst();+ ParsedQuery.Filter filter = query.filters().getFirst();assertEquals(1, filter.values().size());assertEquals("comma,literal", filter.values().getFirst().value());}@@ -289,7 +291,7 @@ class QueryParserTest {@Testvoid escapedWildcardIsLiteralNotAPrefixMatch() {ParsedQuery query = QueryParser.parse("tag.value:literal\\*");- var value = query.filters().getFirst().values().getFirst();+ ParsedQuery.FilterValue value = query.filters().getFirst().values().getFirst();assertEquals("literal*", value.value());assertFalse(value.prefixMatch());}@@ -306,7 +308,7 @@ class QueryParserTest {void aQuotedPhraseNeutralisesEveryOperatorInside() {// Nothing in the quotes is an operator: no negation, no comma-OR, no wildcard.ParsedQuery query = QueryParser.parse("tag.key:\"-a,b*\"");- var filter = query.filters().getFirst();+ ParsedQuery.Filter filter = query.filters().getFirst();assertFalse(filter.negated());assertEquals(1, filter.values().size());assertEquals("-a,b*", filter.values().getFirst().value());@@ -356,17 +358,17 @@ class QueryParserTest {assertEquals(0, query.keywords().size());assertEquals(3, query.filters().size());- var regionFilter = query.filters().stream()+ ParsedQuery.Filter regionFilter = query.filters().stream().filter(f -> f.attribute() == FilterAttribute.REGION).findFirst().orElseThrow();assertTrue(regionFilter.values().getFirst().prefixMatch());assertEquals("us", regionFilter.values().getFirst().value());assertFalse(regionFilter.negated());- var serviceFilter = query.filters().stream()+ ParsedQuery.Filter serviceFilter = query.filters().stream().filter(f -> f.attribute() == FilterAttribute.SERVICE).findFirst().orElseThrow();assertEquals("ec2", serviceFilter.values().getFirst().value());- var tagFilter = query.filters().stream()+ ParsedQuery.Filter tagFilter = query.filters().stream().filter(f -> f.attribute() == FilterAttribute.TAG).findFirst().orElseThrow();assertTrue(tagFilter.negated());assertEquals("stage=prod", tagFilter.values().getFirst().value());diff --git a/src/test/java/io/github/hectorvent/floci/services/route53/Route53VpcAssociationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/route53/Route53VpcAssociationIntegrationTest.javaindex b84db56c62..c13c0b3d58 100644--- a/src/test/java/io/github/hectorvent/floci/services/route53/Route53VpcAssociationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/route53/Route53VpcAssociationIntegrationTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.route53;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.services.route53.model.HostedZone;import io.github.hectorvent.floci.services.route53.model.VpcAssociation;import io.quarkus.test.junit.QuarkusTest;import jakarta.inject.Inject;@@ -516,7 +517,7 @@ class Route53VpcAssociationIntegrationTest {.post("/2013-04-01/hostedzone/" + zoneId + "/associatevpc").then().statusCode(200);- var zone = service.listHostedZonesByVpc(spokeVpc, "us-east-1").stream()+ HostedZone zone = service.listHostedZonesByVpc(spokeVpc, "us-east-1").stream().filter(candidate -> candidate.getId().equals(zoneId)).findFirst().orElseThrow();zone.getVpcAssociations().stream()@@ -544,7 +545,7 @@ class Route53VpcAssociationIntegrationTest {String zoneId = createPrivateZoneForAccount(ZONE_ACCOUNT, "legacy-zone.internal.", "vpc-assoc-legacy-zone", zoneVpc);- var legacyZone = service.listHostedZonesByVpc(zoneVpc, "us-east-1").stream()+ HostedZone legacyZone = service.listHostedZonesByVpc(zoneVpc, "us-east-1").stream().filter(candidate -> candidate.getId().equals(zoneId)).findFirst().orElseThrow();legacyZone.setOwnerAccountId(null);diff --git a/src/test/java/io/github/hectorvent/floci/services/rum/RumControllerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/rum/RumControllerIntegrationTest.javaindex a16e03619d..ef25ee464c 100644--- a/src/test/java/io/github/hectorvent/floci/services/rum/RumControllerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rum/RumControllerIntegrationTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.rum;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;@@ -323,7 +324,7 @@ class RumControllerIntegrationTest {}private static Response list(String authorization, String maxResults, String nextToken) {- var request = given()+ RequestSpecification request = given().header("Authorization", authorization);if (maxResults != null) {request.queryParam("maxResults", maxResults);diff --git a/src/test/java/io/github/hectorvent/floci/services/rum/RumServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/rum/RumServiceTest.javaindex 3e4476772f..e13138a05e 100644--- a/src/test/java/io/github/hectorvent/floci/services/rum/RumServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rum/RumServiceTest.java@@ -191,7 +191,7 @@ class RumServiceTest {@Testvoid appMonitorConfigurationCanBeReloadedFromPersistentStorage(@TempDir Path tempDir) throws Exception {Path file = tempDir.resolve("rum.json");- var firstStore = new PersistentStorage<String, AppMonitor>(+ PersistentStorage<String, AppMonitor> firstStore = new PersistentStorage<>(file, new TypeReference<Map<String, AppMonitor>>() {});firstStore.load();@@ -206,7 +206,7 @@ class RumServiceTest {}"""));- var reloadedStore = new PersistentStorage<String, AppMonitor>(+ PersistentStorage<String, AppMonitor> reloadedStore = new PersistentStorage<>(file, new TypeReference<Map<String, AppMonitor>>() {});reloadedStore.load();diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3NotificationModelTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3NotificationModelTest.javaindex e1f681400c..7fdc03e27c 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3NotificationModelTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3NotificationModelTest.java@@ -16,34 +16,34 @@ class S3NotificationModelTest {@Testvoid matchesKeyWithNullFilterRulesFromJacksonDeserialization() {- var qn = new QueueNotification("id", "arn:aws:sqs:us-east-1:000000000000:q",+ QueueNotification qn = new QueueNotification("id", "arn:aws:sqs:us-east-1:000000000000:q",List.of("s3:ObjectCreated:*"), null);assertTrue(qn.matchesKey("anything"));- var tn = new TopicNotification("id", "arn:aws:sns:us-east-1:000000000000:t",+ TopicNotification tn = new TopicNotification("id", "arn:aws:sns:us-east-1:000000000000:t",List.of("s3:ObjectCreated:*"), null);assertTrue(tn.matchesKey("anything"));- var ln = new LambdaNotification("id", "arn:aws:lambda:us-east-1:000000000000:function:test",+ LambdaNotification ln = new LambdaNotification("id", "arn:aws:lambda:us-east-1:000000000000:function:test",List.of("s3:ObjectCreated:*"), null);assertTrue(ln.matchesKey("anything"));}@Testvoid matchesKeyWithEmptyFilterRulesMatchesAll() {- var qn = new QueueNotification("id", "arn", List.of("s3:ObjectCreated:*"));+ QueueNotification qn = new QueueNotification("id", "arn", List.of("s3:ObjectCreated:*"));assertTrue(qn.matchesKey("anything"));}@Testvoid matchesKeyEnforcesAllRules() {- var qn = new QueueNotification("id", "arn", List.of("s3:ObjectCreated:*"),+ QueueNotification qn = new QueueNotification("id", "arn", List.of("s3:ObjectCreated:*"),List.of(new FilterRule("prefix", "images/"), new FilterRule("suffix", ".jpg")));assertTrue(qn.matchesKey("images/photo.jpg"));assertFalse(qn.matchesKey("images/photo.png"));assertFalse(qn.matchesKey("docs/photo.jpg"));- var ln = new LambdaNotification("id", "arn", List.of("s3:ObjectCreated:*"),+ LambdaNotification ln = new LambdaNotification("id", "arn", List.of("s3:ObjectCreated:*"),List.of(new FilterRule("prefix", "images/"), new FilterRule("suffix", ".jpg")));assertTrue(ln.matchesKey("images/photo.jpg"));assertFalse(ln.matchesKey("images/photo.png"));diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceAnnotationsTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceAnnotationsTest.javaindex 23a16f7300..e9d76f0c7f 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceAnnotationsTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceAnnotationsTest.java@@ -13,6 +13,7 @@ import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;import java.util.List;+import java.util.stream.Stream;import static org.junit.jupiter.api.Assertions.*;@@ -395,7 +396,7 @@ class S3ServiceAnnotationsTest {// root is empty for every account partition.Path accountsRoot = tempDir.resolve("s3").resolve(".accounts");if (Files.isDirectory(accountsRoot)) {- try (var accounts = Files.list(accountsRoot)) {+ try (Stream<Path> accounts = Files.list(accountsRoot)) {for (Path account : accounts.toList()) {Path annotationsRoot = account.resolve(".annotations");assertFalse(Files.exists(annotationsRoot),@@ -473,7 +474,7 @@ class S3ServiceAnnotationsTest {s3Service.deleteObject(BUCKET, "docs/readme.txt");// The annotations are gone, including the payload files on disk.- try (var stream = Files.walk(tempDir.resolve("s3").resolve(".accounts")+ try (Stream<Path> stream = Files.walk(tempDir.resolve("s3").resolve(".accounts").resolve("000000000000").resolve(".annotations"))) {List<java.nio.file.Path> files = stream.filter(Files::isRegularFile).toList();assertTrue(files.isEmpty(), "annotation payload files should be removed, found: " + files);@@ -558,7 +559,7 @@ class S3ServiceAnnotationsTest {"disk-backed", null);assertEquals("on disk", readPayload("disk-backed"));// The .s3ann file exists under the account-scoped .annotations root.- try (var stream = Files.walk(tempDir.resolve("s3").resolve(".accounts")+ try (Stream<Path> stream = Files.walk(tempDir.resolve("s3").resolve(".accounts").resolve("000000000000").resolve(".annotations"))) {List<java.nio.file.Path> files = stream.filter(Files::isRegularFile).toList();assertEquals(1, files.size());diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3VirtualHostIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3VirtualHostIntegrationTest.javaindex 457459ae7b..ae22fd565b 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3VirtualHostIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3VirtualHostIntegrationTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.s3;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.Response;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;@@ -302,7 +303,7 @@ class S3VirtualHostIntegrationTest {@Order(20)void createMultipartUploadViaVirtualHost() {String key = "virtual-multipart.zip";- var response = given()+ Response response = given().header("Host", HOST).header("Authorization","AWS4-HMAC-SHA256 Credential=test/20260912/us-east-1/s3/aws4_request, Signature=fake")diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3WebsiteIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3WebsiteIntegrationTest.javaindex f6425bca05..43212cb764 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3WebsiteIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3WebsiteIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.s3;import io.quarkus.test.junit.QuarkusTest;import io.restassured.RestAssured;+import io.restassured.response.Response;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;@@ -382,7 +383,7 @@ class S3WebsiteIntegrationTest {.then().statusCode(200);- var getResponse = given()+ Response getResponse = given().header("Host", websiteHost()).when().get("/missing-page");diff --git a/src/test/java/io/github/hectorvent/floci/services/s3tables/S3TablesServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/s3tables/S3TablesServiceTest.javaindex b77b3e3e53..5e81894eba 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3tables/S3TablesServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3tables/S3TablesServiceTest.java@@ -12,6 +12,10 @@ import org.junit.jupiter.api.Test;import java.util.List;import java.util.Map;+import java.util.concurrent.CountDownLatch;+import java.util.concurrent.ExecutorService;+import java.util.concurrent.Executors;+import java.util.concurrent.Future;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertNotEquals;@@ -154,14 +158,14 @@ class S3TablesServiceTest {void allowsOnlyOneConcurrentMetadataUpdatePerVersionToken() throws Exception {String arn = createBucketWithNamespace("analytics");S3Table created = createTable(arn, "analytics", "events");- var ready = new java.util.concurrent.CountDownLatch(2);- var start = new java.util.concurrent.CountDownLatch(1);- var executor = java.util.concurrent.Executors.newFixedThreadPool(2);+ CountDownLatch ready = new CountDownLatch(2);+ CountDownLatch start = new CountDownLatch(1);+ ExecutorService executor = Executors.newFixedThreadPool(2);try {- var first = executor.submit(() -> updateMetadataWithToken(arn, created.getVersionToken(),+ Future<String> first = executor.submit(() -> updateMetadataWithToken(arn, created.getVersionToken(),"s3://warehouse/events/metadata/v2.json", ready, start));- var second = executor.submit(() -> updateMetadataWithToken(arn, created.getVersionToken(),+ Future<String> second = executor.submit(() -> updateMetadataWithToken(arn, created.getVersionToken(),"s3://warehouse/events/metadata/v3.json", ready, start));assertEquals(true, ready.await(5, java.util.concurrent.TimeUnit.SECONDS));diff --git a/src/test/java/io/github/hectorvent/floci/services/securityhub/SecurityHubOrganizationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/securityhub/SecurityHubOrganizationIntegrationTest.javaindex 1beb78e5a8..48d2883737 100644--- a/src/test/java/io/github/hectorvent/floci/services/securityhub/SecurityHubOrganizationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/securityhub/SecurityHubOrganizationIntegrationTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.securityhub;import io.github.hectorvent.floci.services.organizations.OrganizationsService;+import io.github.hectorvent.floci.services.organizations.model.Handshake;import jakarta.inject.Inject;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.Test;@@ -146,7 +147,7 @@ class SecurityHubOrganizationIntegrationTest {private void createOrganization(String managementAccountId, String... members) {organizationsService.createOrganization(managementAccountId, "ALL");for (String member : members) {- var handshake = organizationsService.inviteAccountToOrganization(+ Handshake handshake = organizationsService.inviteAccountToOrganization(managementAccountId, member, "ACCOUNT", null);organizationsService.acceptHandshake(member, handshake.getId());}diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesBulkV1IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesBulkV1IntegrationTest.javaindex 0809ae01b8..74cd87ba5f 100644--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesBulkV1IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesBulkV1IntegrationTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.ses;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;@@ -217,7 +218,7 @@ class SesBulkV1IntegrationTest {@Test@Order(8)void sendBulkTemplatedEmail_destinationsExceeds50_returnsMessageRejected() {- var spec = given()+ RequestSpecification spec = given().contentType("application/x-www-form-urlencoded").header("Authorization", AUTH).formParam("Action", "SendBulkTemplatedEmail")@@ -266,7 +267,7 @@ class SesBulkV1IntegrationTest {@Order(10)void sendBulkTemplatedEmail_nonObjectTemplateData_returnsInvalidParameterValue(String label, String defaultTemplateData, String replacementTemplateData) {- var spec = given()+ RequestSpecification spec = given().contentType("application/x-www-form-urlencoded").header("Authorization", AUTH).formParam("Action", "SendBulkTemplatedEmail")@@ -295,7 +296,7 @@ class SesBulkV1IntegrationTest {@Test@Order(9)void sendBulkTemplatedEmail_recipientsExceeds50_returnsMessageRejected() {- var spec = given()+ RequestSpecification spec = given().contentType("application/x-www-form-urlencoded").header("Authorization", AUTH).formParam("Action", "SendBulkTemplatedEmail")diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesEventPayloadTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesEventPayloadTest.javaindex 0fec434140..3422918f4e 100644--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesEventPayloadTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesEventPayloadTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.ses;+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;@@ -111,7 +112,7 @@ class SesEventPayloadTest {void send_emailTagsTolerateNullValueAndDuplicateKey() {ObjectNode node = SesEventPayload.build(mapper, SesRecipientEvent.of("SEND", Cause.SIMULATOR, List.of()), "msg-1", "[email protected]", null, "000000000000", "", List.of("[email protected]"), List.of(), List.of(), List.of("[email protected]"), "cs", List.of(new MessageTag("k", null), new MessageTag("k", "v2")), List.of(), ts);- var arr = node.get("mail").get("tags").get("k");+ JsonNode arr = node.get("mail").get("tags").get("k");assertEquals(2, arr.size(), "duplicate keys append into the same array");assertEquals("", arr.get(0).asText());assertEquals("v2", arr.get(1).asText());diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesTenantServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesTenantServiceTest.javaindex 7ceb28b30e..085eed2a1a 100644--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesTenantServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesTenantServiceTest.java@@ -6,6 +6,7 @@ import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.services.ses.model.Tag;import io.github.hectorvent.floci.services.ses.model.Tenant;import io.github.hectorvent.floci.services.ses.model.TenantResourceAssociation;+import io.github.hectorvent.floci.services.ses.model.TenantSuppressionAttributes;import io.github.hectorvent.floci.testing.MutableClock;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;@@ -323,10 +324,10 @@ class SesTenantServiceTest {service.associate(tenant, SesTenantService.parseResourceArn("arn:aws:ses:" + REGION + ":" + ACCOUNT + ":configuration-set/cs", ACCOUNT, REGION),REGION, () -> {});- var all = service.listTenantResources(tenant, null, REGION);+ List<TenantResourceAssociation> all = service.listTenantResources(tenant, null, REGION);assertEquals(List.of("configuration-set", "identity", "template"),all.stream().map(a -> a.resourceType()).toList());- var filtered = service.listTenantResources(tenant, "identity", REGION);+ List<TenantResourceAssociation> filtered = service.listTenantResources(tenant, "identity", REGION);assertEquals(1, filtered.size());assertEquals("identity", filtered.get(0).resourceType());}@@ -337,7 +338,7 @@ class SesTenantServiceTest {Tenant b = service.createTenant("beta", List.of(), ACCOUNT, REGION);service.associate(a, identityRef("example.com"), REGION, () -> {});service.associate(b, identityRef("example.com"), REGION, () -> {});- var tenants = service.listResourceTenants(identityRef("example.com"), REGION);+ List<TenantResourceAssociation> tenants = service.listResourceTenants(identityRef("example.com"), REGION);assertEquals(2, tenants.size());assertEquals("acme", tenants.get(0).tenantName());assertEquals(a.tenantId(), tenants.get(0).tenantId());@@ -413,7 +414,7 @@ class SesTenantServiceTest {void putSuppressionAttributes_setsAndClears() {service.createTenant("acme", List.of(), ACCOUNT, REGION);service.putSuppressionAttributes("acme", List.of("BOUNCE", "COMPLAINT"), "TENANT", REGION);- var attrs = service.getTenant("acme", REGION).suppressionAttributes();+ TenantSuppressionAttributes attrs = service.getTenant("acme", REGION).suppressionAttributes();assertEquals(List.of("BOUNCE", "COMPLAINT"), attrs.suppressedReasons());assertEquals("TENANT", attrs.suppressionScope());@@ -426,7 +427,7 @@ class SesTenantServiceTest {void putSuppressionAttributes_emptyReasonListWithScope_isValidState() {service.createTenant("acme", List.of(), ACCOUNT, REGION);service.putSuppressionAttributes("acme", List.of(), "TENANT", REGION);- var attrs = service.getTenant("acme", REGION).suppressionAttributes();+ TenantSuppressionAttributes attrs = service.getTenant("acme", REGION).suppressionAttributes();assertEquals(List.of(), attrs.suppressedReasons());assertEquals("TENANT", attrs.suppressionScope());}diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesTestRenderV2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesTestRenderV2IntegrationTest.javaindex 18087c997a..fb03958208 100644--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesTestRenderV2IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesTestRenderV2IntegrationTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.ses;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;@@ -116,7 +117,7 @@ class SesTestRenderV2IntegrationTest {@MethodSource("malformedRenderBodies")@Order(7)void testRenderEmailTemplate_malformedBody_returns400(String label, String body) {- var spec = given()+ RequestSpecification spec = given().contentType("application/json").header("Authorization", AUTH_HEADER);if (body != null) {diff --git a/src/test/java/io/github/hectorvent/floci/services/signin/SigninIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/signin/SigninIntegrationTest.javaindex 0f6b9e5be3..0ddd2b73cf 100644--- a/src/test/java/io/github/hectorvent/floci/services/signin/SigninIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/signin/SigninIntegrationTest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.signin;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.Response;import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.Test;@@ -357,7 +358,7 @@ class SigninIntegrationTest {String location = authorize(verifier, state);String code = queryParams(URI.create(location).getRawQuery()).get("code");- var response = request()+ Response response = request().contentType("application/json").body(Map.of("clientId", CLIENT_ID,@@ -419,7 +420,7 @@ class SigninIntegrationTest {.extract().path("refreshToken");- var firstRefresh = request()+ Response firstRefresh = request().contentType("application/json").body(Map.of("clientId", CLIENT_ID,diff --git a/src/test/java/io/github/hectorvent/floci/services/signin/SigninServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/signin/SigninServiceTest.javaindex 556f3c54d4..bf5f8181e9 100644--- a/src/test/java/io/github/hectorvent/floci/services/signin/SigninServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/signin/SigninServiceTest.java@@ -12,6 +12,7 @@ import java.net.URLDecoder;import java.nio.charset.StandardCharsets;import java.security.MessageDigest;import java.time.Duration;+import java.time.Instant;import java.util.Base64;import java.util.List;import java.util.Map;@@ -329,9 +330,9 @@ class SigninServiceTest {@Testvoid refreshGrantRetentionNeverOutlivesAbsoluteExpiry() {- var expiresAt = clock.instant().plus(Duration.ofHours(12));- var earlierReplayExpiry = expiresAt.minus(Duration.ofMinutes(1));- var replayExpiresAt = expiresAt.plus(Duration.ofMinutes(14));+ Instant expiresAt = clock.instant().plus(Duration.ofHours(12));+ Instant earlierReplayExpiry = expiresAt.minus(Duration.ofMinutes(1));+ Instant replayExpiresAt = expiresAt.plus(Duration.ofMinutes(14));assertEquals(expiresAt, SigninService.refreshGrantRetentionExpiry(expiresAt, null));assertEquals(earlierReplayExpiry,diff --git a/src/test/java/io/github/hectorvent/floci/services/sns/SnsMobilePushTest.java b/src/test/java/io/github/hectorvent/floci/services/sns/SnsMobilePushTest.javaindex 0752daa619..7b935f7209 100644--- a/src/test/java/io/github/hectorvent/floci/services/sns/SnsMobilePushTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sns/SnsMobilePushTest.java@@ -427,7 +427,7 @@ class SnsMobilePushTest {String topicArn = snsService.createTopic("market-alerts", null, null, REGION).getTopicArn();snsService.subscribe(topicArn, "application", device.getArn(), REGION, Map.of());- var result = snsService.publishBatch(topicArn, List.of(+ SnsService.BatchPublishResult result = snsService.publishBatch(topicArn, List.of(Map.of("Id", "bad", "Message", "{\"GCM\":\"only gcm\"}", "MessageStructure", "json"),Map.of("Id", "good", "Message", "{\"default\":\"ok body\"}", "MessageStructure", "json")),REGION);@@ -454,7 +454,7 @@ class SnsMobilePushTest {String topicArn = snsService.createTopic("market-alerts", null, null, REGION).getTopicArn();snsService.subscribe(topicArn, "application", device.getArn(), REGION, Map.of());- var result = snsService.publishBatch(topicArn, List.of(+ SnsService.BatchPublishResult result = snsService.publishBatch(topicArn, List.of(Map.of("Id", "bad", "Message", "not json at all", "MessageStructure", "json"),Map.of("Id", "good", "Message", "plain text")),REGION);diff --git a/src/test/java/io/github/hectorvent/floci/services/sns/SnsSqsFanoutFifoDeliveryTest.java b/src/test/java/io/github/hectorvent/floci/services/sns/SnsSqsFanoutFifoDeliveryTest.javaindex f0ecb77f6c..3b2cef1856 100644--- a/src/test/java/io/github/hectorvent/floci/services/sns/SnsSqsFanoutFifoDeliveryTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sns/SnsSqsFanoutFifoDeliveryTest.java@@ -91,13 +91,13 @@ class SnsSqsFanoutFifoDeliveryTest {snsService.subscribe(topicArn, "sqs", queueArn, REGION, Map.of());// Act- var entries = List.<Map<String, Object>>of(+ List<Map<String, Object>> entries = List.of(Map.of("Id", "e1", "Message", "batch-msg-1","MessageGroupId", "group-a", "MessageDeduplicationId", "dedup-1"),Map.of("Id", "e2", "Message", "batch-msg-2","MessageGroupId", "group-b", "MessageDeduplicationId", "dedup-2"));- var result = snsService.publishBatch(topicArn, entries, REGION);+ SnsService.BatchPublishResult result = snsService.publishBatch(topicArn, entries, REGION);// AssertassertEquals(2, result.successful().size());@@ -124,11 +124,11 @@ class SnsSqsFanoutFifoDeliveryTest {snsService.subscribe(topicArn, "sqs", queueArn, REGION, Map.of());// Act — no explicit dedup IDs; topic derives them from message content- var entries = List.<Map<String, Object>>of(+ List<Map<String, Object>> entries = List.of(Map.of("Id", "e1", "Message", "cbd-batch-msg-1", "MessageGroupId", "group-a"),Map.of("Id", "e2", "Message", "cbd-batch-msg-2", "MessageGroupId", "group-b"));- var result = snsService.publishBatch(topicArn, entries, REGION);+ SnsService.BatchPublishResult result = snsService.publishBatch(topicArn, entries, REGION);// AssertassertEquals(2, result.successful().size());@@ -268,13 +268,13 @@ class SnsSqsFanoutFifoDeliveryTest {"fifo-batch-group-scope-queue.fifo");// Act: one batch, same dedup ID under two different message groups- var entries = List.<Map<String, Object>>of(+ List<Map<String, Object>> entries = List.of(Map.of("Id", "e1", "Message", "batch-group-one","MessageGroupId", "group-1", "MessageDeduplicationId", "shared-dedup"),Map.of("Id", "e2", "Message", "batch-group-two","MessageGroupId", "group-2", "MessageDeduplicationId", "shared-dedup"));- var result = snsService.publishBatch(topicArn, entries, REGION);+ SnsService.BatchPublishResult result = snsService.publishBatch(topicArn, entries, REGION);// AssertassertEquals(2, result.successful().size());diff --git a/src/test/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminServiceTest.javaindex 5a1c445553..e0547a57b2 100644--- a/src/test/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminServiceTest.java@@ -1,8 +1,10 @@package io.github.hectorvent.floci.services.ssoadmin;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.AwsException;+import io.github.hectorvent.floci.core.common.PaginatedResult;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.services.ssoadmin.model.Assignment;@@ -227,7 +229,7 @@ class SsoAdminServiceTest {ObjectNode tooMany = mapper.createObjectNode();tooMany.put("InstanceArn", service.getInstanceArn());- var attributes = tooMany.putObject("InstanceAccessControlAttributeConfiguration")+ ArrayNode attributes = tooMany.putObject("InstanceAccessControlAttributeConfiguration").putArray("AccessControlAttributes");for (int i = 0; i < 51; i++) {attributes.addObject().put("Key", "Key" + i).putObject("Value").putArray("Source").add("value");@@ -533,7 +535,7 @@ class SsoAdminServiceTest {ObjectNode request = mapper.createObjectNode();request.put("InstanceArn", service.getInstanceArn());request.put("MaxResults", 1);- var firstPage = service.listApplications(request, ACCOUNT_ID);+ PaginatedResult<SsoApplication> firstPage = service.listApplications(request, ACCOUNT_ID);assertEquals(1, firstPage.items().size());assertNotNull(firstPage.nextToken());request.put("NextToken", firstPage.nextToken());@@ -659,14 +661,14 @@ class SsoAdminServiceTest {ObjectNode request = mapper.createObjectNode();request.put("ApplicationArn", application.applicationArn());request.put("MaxResults", 1);- var first = service.listApplicationAccessScopes(request);+ PaginatedResult<ApplicationAccessScope> first = service.listApplicationAccessScopes(request);assertEquals(1, first.items().size());assertEquals("api:read", first.items().get(0).scope());assertEquals(java.util.List.of(service.getInstanceArn()), first.items().get(0).authorizedTargets());assertNotNull(first.nextToken());request.put("NextToken", first.nextToken());- var second = service.listApplicationAccessScopes(request);+ PaginatedResult<ApplicationAccessScope> second = service.listApplicationAccessScopes(request);assertEquals(1, second.items().size());assertEquals("api:write", second.items().get(0).scope());assertNull(second.nextToken());@@ -738,7 +740,7 @@ class SsoAdminServiceTest {new ApplicationAuthenticationMethod(otherApplication.applicationArn(), "IAM", method.deepCopy()));ObjectNode request = mapper.createObjectNode().put("ApplicationArn", application.applicationArn());- var result = service.listApplicationAuthenticationMethods(request);+ PaginatedResult<ApplicationAuthenticationMethod> result = service.listApplicationAuthenticationMethods(request);assertEquals(1, result.items().size());assertEquals("IAM", result.items().get(0).authenticationMethodType());assertEquals(method, result.items().get(0).authenticationMethod());@@ -758,7 +760,7 @@ class SsoAdminServiceTest {method.putObject("Iam").putObject("ActorPolicy").put("Version", "2012-10-17");service.putApplicationAuthenticationMethod(request);- var stored = service.getApplicationAuthenticationMethod(request);+ ApplicationAuthenticationMethod stored = service.getApplicationAuthenticationMethod(request);assertEquals(method, stored.authenticationMethod());method.withObject("Iam").withObject("ActorPolicy").put("Id", "updated");@@ -875,7 +877,7 @@ class SsoAdminServiceTest {new ApplicationGrant(otherApplication.applicationArn(), "refresh_token", refreshToken.deepCopy()));ObjectNode request = mapper.createObjectNode().put("ApplicationArn", application.applicationArn());- var result = service.listApplicationGrants(request);+ PaginatedResult<ApplicationGrant> result = service.listApplicationGrants(request);assertEquals(2, result.items().size());assertEquals("authorization_code", result.items().get(0).grantType());assertEquals("refresh_token", result.items().get(1).grantType());@@ -1041,7 +1043,7 @@ class SsoAdminServiceTest {@Testvoid listApplicationProvidersReturnsCustomProviderAndValidatesPagination() {ObjectNode request = mapper.createObjectNode();- var page = service.listApplicationProviders(request, "us-east-1");+ PaginatedResult<String> page = service.listApplicationProviders(request, "us-east-1");assertEquals(java.util.List.of("arn:aws:sso::aws:applicationProvider/custom"), page.items());assertEquals(null, page.nextToken());@@ -1065,12 +1067,12 @@ class SsoAdminServiceTest {ObjectNode request = mapper.createObjectNode();request.put("ApplicationArn", application.applicationArn());request.put("MaxResults", 1);- var first = service.listApplicationAssignments(request);+ PaginatedResult<ApplicationAssignment> first = service.listApplicationAssignments(request);assertEquals(1, first.items().size());assertNotNull(first.nextToken());request.put("NextToken", first.nextToken());- var second = service.listApplicationAssignments(request);+ PaginatedResult<ApplicationAssignment> second = service.listApplicationAssignments(request);assertEquals(1, second.items().size());assertNull(second.nextToken());@@ -1095,7 +1097,7 @@ class SsoAdminServiceTest {request.put("InstanceArn", service.getInstanceArn());request.put("PrincipalId", PRINCIPAL_ID);request.put("PrincipalType", "USER");- var page = service.listApplicationAssignmentsForPrincipal(request, ACCOUNT_ID);+ PaginatedResult<ApplicationAssignment> page = service.listApplicationAssignmentsForPrincipal(request, ACCOUNT_ID);assertEquals(1, page.items().size());assertEquals(application.applicationArn(), page.items().get(0).applicationArn());assertEquals(PRINCIPAL_ID, page.items().get(0).principalId());@@ -1244,7 +1246,7 @@ class SsoAdminServiceTest {ObjectNode listRequest = mapper.createObjectNode();listRequest.put("InstanceArn", service.getInstanceArn());listRequest.put("MaxResults", 1);- var firstPage = service.listRegions(listRequest);+ PaginatedResult<RegionMetadata> firstPage = service.listRegions(listRequest);assertEquals(1, firstPage.items().size());assertNotNull(firstPage.nextToken());listRequest.put("NextToken", firstPage.nextToken());@@ -1314,7 +1316,7 @@ class SsoAdminServiceTest {ObjectNode create = mapper.createObjectNode();create.put("InstanceArn", service.getInstanceArn());create.put("Name", "TaggedAdmins");- var tags = create.putArray("Tags");+ ArrayNode tags = create.putArray("Tags");tags.addObject().put("Key", "Environment").put("Value", "test");tags.addObject().put("Key", "Owner").put("Value", "platform");PermissionSet permissionSet = service.createPermissionSet(create);@@ -1322,7 +1324,7 @@ class SsoAdminServiceTest {ObjectNode request = mapper.createObjectNode();request.put("ResourceArn", permissionSet.arn());request.put("InstanceArn", service.getInstanceArn());- var page = service.listTagsForResource(request);+ PaginatedResult<Map.Entry<String, String>> page = service.listTagsForResource(request);assertEquals(2, page.items().size());assertEquals("Environment", page.items().get(0).getKey());assertEquals("test", page.items().get(0).getValue());@@ -1335,13 +1337,13 @@ class SsoAdminServiceTest {tag.putArray("Tags").addObject().put("Key", "Environment").put("Value", "prod");service.tagResource(tag);- var updated = service.listTagsForResource(request);+ PaginatedResult<Map.Entry<String, String>> updated = service.listTagsForResource(request);assertEquals(2, updated.items().size());assertEquals("prod", updated.items().get(0).getValue());ObjectNode fillToQuota = mapper.createObjectNode();fillToQuota.put("ResourceArn", permissionSet.arn());- var quotaTags = fillToQuota.putArray("Tags");+ ArrayNode quotaTags = fillToQuota.putArray("Tags");for (int i = 0; i < 73; i++) {quotaTags.addObject().put("Key", "K" + i).put("Value", "v");}@@ -1488,7 +1490,7 @@ class SsoAdminServiceTest {ObjectNode firstRequest = managedPoliciesRequest(permissionSet.arn());firstRequest.put("MaxResults", 1);- var first = service.listManagedPolicies(firstRequest);+ PaginatedResult<Map.Entry<String, String>> first = service.listManagedPolicies(firstRequest);assertEquals(1, first.items().size());assertNotNull(first.nextToken());@@ -1496,7 +1498,7 @@ class SsoAdminServiceTest {ObjectNode secondRequest = managedPoliciesRequest(permissionSet.arn());secondRequest.put("MaxResults", 1);secondRequest.put("NextToken", first.nextToken());- var second = service.listManagedPolicies(secondRequest);+ PaginatedResult<Map.Entry<String, String>> second = service.listManagedPolicies(secondRequest);assertEquals(1, second.items().size());assertNotNull(second.nextToken());@@ -1556,12 +1558,12 @@ class SsoAdminServiceTest {request.put("PrincipalType", "GROUP");request.put("MaxResults", 1);- var firstPage = service.listAssignmentsForPrincipal(request, ACCOUNT_ID);+ PaginatedResult<Assignment> firstPage = service.listAssignmentsForPrincipal(request, ACCOUNT_ID);assertEquals(1, firstPage.items().size());assertNotNull(firstPage.nextToken());request.put("NextToken", firstPage.nextToken());- var secondPage = service.listAssignmentsForPrincipal(request, ACCOUNT_ID);+ PaginatedResult<Assignment> secondPage = service.listAssignmentsForPrincipal(request, ACCOUNT_ID);assertEquals(1, secondPage.items().size());assertTrue(secondPage.nextToken() == null);@@ -1616,7 +1618,7 @@ class SsoAdminServiceTest {listStatus.put("InstanceArn", service.getInstanceArn());listStatus.put("MaxResults", 1);listStatus.putObject("Filter").put("Status", "SUCCEEDED");- var statusPage = service.listPermissionSetProvisioningStatus(listStatus);+ PaginatedResult<PermissionSetProvisioningOperation> statusPage = service.listPermissionSetProvisioningStatus(listStatus);assertEquals(1, statusPage.items().size());assertNotNull(statusPage.nextToken());listStatus.putObject("Filter").put("Status", "INVALID");@@ -1654,7 +1656,7 @@ class SsoAdminServiceTest {request.put("InstanceArn", service.getInstanceArn());request.put("AccountId", ACCOUNT_ID);request.put("MaxResults", 1);- var firstPage = service.listPermissionSetsProvisionedToAccount(request);+ PaginatedResult<String> firstPage = service.listPermissionSetsProvisionedToAccount(request);assertEquals(1, firstPage.items().size());assertNotNull(firstPage.nextToken());@@ -1693,7 +1695,7 @@ class SsoAdminServiceTest {request.put("InstanceArn", service.getInstanceArn());request.put("PermissionSetArn", permissionSet.arn());request.put("MaxResults", 1);- var firstPage = service.listAccountsForProvisionedPermissionSet(request);+ PaginatedResult<String> firstPage = service.listAccountsForProvisionedPermissionSet(request);assertEquals(1, firstPage.items().size());assertNotNull(firstPage.nextToken());@@ -1727,7 +1729,7 @@ class SsoAdminServiceTest {ObjectNode listStatus = mapper.createObjectNode();listStatus.put("InstanceArn", service.getInstanceArn());listStatus.putObject("Filter").put("Status", "SUCCEEDED");- var statusPage = service.listAccountAssignmentCreationStatus(listStatus);+ PaginatedResult<AssignmentOperation> statusPage = service.listAccountAssignmentCreationStatus(listStatus);assertEquals(1, statusPage.items().size());assertEquals(created.requestId(), statusPage.items().get(0).requestId());listStatus.putObject("Filter");@@ -1758,7 +1760,7 @@ class SsoAdminServiceTest {ObjectNode listStatus = mapper.createObjectNode();listStatus.put("InstanceArn", service.getInstanceArn());listStatus.putObject("Filter").put("Status", "SUCCEEDED");- var statusPage = service.listAccountAssignmentDeletionStatus(listStatus);+ PaginatedResult<AssignmentDeletionOperation> statusPage = service.listAccountAssignmentDeletionStatus(listStatus);assertEquals(1, statusPage.items().size());assertEquals(deleted.requestId(), statusPage.items().get(0).requestId());listStatus.putObject("Filter").put("Status", "INVALID");diff --git a/src/test/java/io/github/hectorvent/floci/services/ssooidc/SsoOidcIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ssooidc/SsoOidcIntegrationTest.javaindex 8d6472d3cd..8611400301 100644--- a/src/test/java/io/github/hectorvent/floci/services/ssooidc/SsoOidcIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ssooidc/SsoOidcIntegrationTest.java@@ -1,8 +1,10 @@package io.github.hectorvent.floci.services.ssooidc;import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.services.ssoadmin.SsoAdminService;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.Response;import jakarta.inject.Inject;import org.junit.jupiter.api.Test;@@ -45,7 +47,7 @@ class SsoOidcIntegrationTest {@Testvoid startDeviceAuthorizationUsesRegisteredClient() {- var registration = given()+ Response registration = given().contentType("application/json").body("{\"clientName\":\"Device Integration\",\"clientType\":\"public\","+ "\"grantTypes\":[\"urn:ietf:params:oauth:grant-type:device_code\"]}")@@ -78,14 +80,14 @@ class SsoOidcIntegrationTest {@Testvoid deviceAuthorizationRejectsCallerSelectedPrincipal() {- var registration = given()+ Response registration = given().contentType("application/json").body("{\"clientName\":\"Principal Guard\",\"clientType\":\"public\","+ "\"grantTypes\":[\"urn:ietf:params:oauth:grant-type:device_code\"]}").when().post("/client/register").then().statusCode(200).extract().response();- var authorization = given()+ Response authorization = given().contentType("application/json").body("{\"clientId\":\"" + registration.path("clientId") + "\",\"clientSecret\":\""+ registration.path("clientSecret") + "\",\"startUrl\":\"https://example.awsapps.com/start\"}")@@ -104,7 +106,7 @@ class SsoOidcIntegrationTest {@Testvoid createTokenCompletesDeviceFlowAndRefreshesToken() {- var registration = given()+ Response registration = given().contentType("application/json").body("{\"clientName\":\"Token Integration\",\"clientType\":\"public\","+ "\"grantTypes\":[\"urn:ietf:params:oauth:grant-type:device_code\",\"refresh_token\"]}")@@ -113,7 +115,7 @@ class SsoOidcIntegrationTest {.extract().response();String clientId = registration.path("clientId");String clientSecret = registration.path("clientSecret");- var authorization = given()+ Response authorization = given().contentType("application/json").body("{\"clientId\":\"" + clientId + "\",\"clientSecret\":\"" + clientSecret+ "\",\"startUrl\":\"https://example.awsapps.com/start\"}")@@ -127,7 +129,7 @@ class SsoOidcIntegrationTest {.when().get("/device").then().statusCode(200).body("status", equalTo("authorized"));- var token = given()+ Response token = given().contentType("application/json").body("{\"clientId\":\"" + clientId + "\",\"clientSecret\":\"" + clientSecret+ "\",\"grantType\":\"urn:ietf:params:oauth:grant-type:device_code\","@@ -151,18 +153,18 @@ class SsoOidcIntegrationTest {@Testvoid createTokenWithIamRequiresSigV4AndUsesApplicationPolicy() {String instanceArn = ssoAdminService.getInstanceArn();- var create = mapper.createObjectNode();+ ObjectNode create = mapper.createObjectNode();create.put("InstanceArn", instanceArn);create.put("ApplicationProviderArn", "arn:aws:sso::aws:applicationProvider/custom");create.put("Name", "IAM OIDC Integration");String applicationArn = ssoAdminService.createApplication(create, "000000000000", "us-east-1").applicationArn();- var authentication = mapper.createObjectNode();+ ObjectNode authentication = mapper.createObjectNode();authentication.put("ApplicationArn", applicationArn);authentication.put("AuthenticationMethodType", "IAM");- var policy = authentication.putObject("AuthenticationMethod").putObject("Iam").putObject("ActorPolicy");+ ObjectNode policy = authentication.putObject("AuthenticationMethod").putObject("Iam").putObject("ActorPolicy");policy.put("Version", "2012-10-17");- var statement = policy.putArray("Statement").addObject();+ ObjectNode statement = policy.putArray("Statement").addObject();statement.put("Effect", "Allow");statement.put("Principal", "*");statement.put("Action", "sso-oauth:CreateTokenWithIAM");@@ -170,7 +172,7 @@ class SsoOidcIntegrationTest {ssoAdminService.putApplicationAuthenticationMethod(authentication);String redirectUri = "http://127.0.0.1:8400/iam-callback";- var grant = mapper.createObjectNode();+ ObjectNode grant = mapper.createObjectNode();grant.put("ApplicationArn", applicationArn);grant.put("GrantType", "authorization_code");grant.putObject("Grant").putObject("AuthorizationCode").putArray("RedirectUris").add(redirectUri);diff --git a/src/test/java/io/github/hectorvent/floci/services/ssooidc/SsoOidcServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ssooidc/SsoOidcServiceTest.javaindex ef42f38414..a22a995415 100644--- a/src/test/java/io/github/hectorvent/floci/services/ssooidc/SsoOidcServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ssooidc/SsoOidcServiceTest.java@@ -3,10 +3,15 @@ package io.github.hectorvent.floci.services.ssooidc;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.storage.InMemoryStorage;+import io.github.hectorvent.floci.services.ssooidc.model.AuthorizationCode;+import io.github.hectorvent.floci.services.ssooidc.model.DeviceAuthorization;import io.github.hectorvent.floci.services.ssooidc.model.RegisteredClient;+import io.github.hectorvent.floci.services.ssooidc.model.TokenSession;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;+import java.util.List;+import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertNull;@@ -59,7 +64,7 @@ class SsoOidcServiceTest {request.put("clientId", client.clientId());request.put("clientSecret", client.clientSecret());request.put("startUrl", "https://example.awsapps.com/start");- var authorization = service.startDeviceAuthorization(request);+ DeviceAuthorization authorization = service.startDeviceAuthorization(request);assertEquals(client.clientId(), authorization.clientId());assertEquals(64, authorization.deviceCode().length());@@ -85,7 +90,7 @@ class SsoOidcServiceTest {start.put("clientId", client.clientId());start.put("clientSecret", client.clientSecret());start.put("startUrl", "https://example.awsapps.com/start");- var authorization = service.startDeviceAuthorization(start);+ DeviceAuthorization authorization = service.startDeviceAuthorization(start);ObjectNode token = mapper.createObjectNode();token.put("clientId", client.clientId());@@ -95,10 +100,10 @@ class SsoOidcServiceTest {assertOidcError("authorization_pending", () -> service.createToken(token));assertOidcError("slow_down", () -> service.createToken(token));- var approvedAuthorization = service.startDeviceAuthorization(start);+ DeviceAuthorization approvedAuthorization = service.startDeviceAuthorization(start);service.authorizeDevice(approvedAuthorization.userCode(), "11111111-1111-1111-1111-111111111111");token.put("deviceCode", approvedAuthorization.deviceCode());- var session = service.createToken(token);+ TokenSession session = service.createToken(token);assertEquals("Token Client", client.clientName());assertEquals(64, session.accessToken().length());assertEquals(64, session.refreshToken().length());@@ -122,7 +127,7 @@ class SsoOidcServiceTest {String verifier = "01234567890123456789012345678901234567890123456789";String challenge = java.util.Base64.getUrlEncoder().withoutPadding().encodeToString(sha256(verifier));- var code = service.createAuthorizationCode(client.clientId(),+ AuthorizationCode code = service.createAuthorizationCode(client.clientId(),"http://127.0.0.1:8400/callback", challenge);ObjectNode token = mapper.createObjectNode();@@ -140,7 +145,7 @@ class SsoOidcServiceTest {void createIamTokenSupportsRefreshJwtBearerAndTokenExchangeBranches() {String sourceApplication = "arn:aws:sso::123456789012:application/ssoins-7223b02a5d9f7c8e/apl-1111111111111111";String targetApplication = "arn:aws:sso::123456789012:application/ssoins-7223b02a5d9f7c8e/apl-2222222222222222";- var source = service.issueIamToken(sourceApplication, java.util.List.of("api:read"), true);+ TokenSession source = service.issueIamToken(sourceApplication, List.of("api:read"), true);ObjectNode refresh = mapper.createObjectNode();refresh.put("grantType", "refresh_token");@@ -161,7 +166,7 @@ class SsoOidcServiceTest {exchange.put("subjectToken", source.accessToken());exchange.put("subjectTokenType", "urn:ietf:params:oauth:token-type:access_token");exchange.put("requestedTokenType", "urn:ietf:params:oauth:token-type:access_token");- var exchanged = service.createIamToken(exchange, targetApplication, java.util.List.of("openid"));+ TokenSession exchanged = service.createIamToken(exchange, targetApplication, List.of("openid"));assertEquals(targetApplication, exchanged.clientId());assertNull(exchanged.refreshToken());diff --git a/src/test/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalIntegrationTest.javaindex 1a72e8520d..449a46f935 100644--- a/src/test/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalIntegrationTest.java@@ -1,9 +1,12 @@package io.github.hectorvent.floci.services.ssoportal;import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.services.identitystore.IdentityStoreService;import io.github.hectorvent.floci.services.ssoadmin.SsoAdminService;import io.github.hectorvent.floci.services.ssooidc.SsoOidcService;+import io.github.hectorvent.floci.services.ssooidc.model.DeviceAuthorization;+import io.github.hectorvent.floci.services.ssooidc.model.RegisteredClient;import io.quarkus.test.junit.QuarkusTest;import jakarta.inject.Inject;import org.junit.jupiter.api.Test;@@ -33,16 +36,16 @@ class SsoPortalIntegrationTest {void listAccountsIncludesDirectAndGroupAssignmentsForTokenPrincipal() {String suffix = UUID.randomUUID().toString().substring(0, 8);String storeId = ssoAdminService.getIdentityStoreId();- var userRequest = mapper.createObjectNode();+ ObjectNode userRequest = mapper.createObjectNode();userRequest.put("IdentityStoreId", storeId);userRequest.put("UserName", "portal-" + suffix + "@example.com");String userId = identityStoreService.createUser(userRequest).userId();- var groupRequest = mapper.createObjectNode();+ ObjectNode groupRequest = mapper.createObjectNode();groupRequest.put("IdentityStoreId", storeId);groupRequest.put("DisplayName", "PortalGroup" + suffix);String groupId = identityStoreService.createGroup(groupRequest).groupId();- var membershipRequest = mapper.createObjectNode();+ ObjectNode membershipRequest = mapper.createObjectNode();membershipRequest.put("IdentityStoreId", storeId);membershipRequest.put("GroupId", groupId);membershipRequest.putObject("MemberId").put("UserId", userId);@@ -134,7 +137,7 @@ class SsoPortalIntegrationTest {}private String createPermissionSet(String instanceArn, String name) {- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.put("InstanceArn", instanceArn);request.put("Name", name);return ssoAdminService.createPermissionSet(request).arn();@@ -142,7 +145,7 @@ class SsoPortalIntegrationTest {private void createAssignment(String instanceArn, String accountId, String permissionSetArn,String principalId, String principalType) {- var request = mapper.createObjectNode();+ ObjectNode request = mapper.createObjectNode();request.put("InstanceArn", instanceArn);request.put("TargetId", accountId);request.put("TargetType", "AWS_ACCOUNT");@@ -153,21 +156,21 @@ class SsoPortalIntegrationTest {}private String accessTokenFor(String principalId, String suffix) {- var registration = mapper.createObjectNode();+ ObjectNode registration = mapper.createObjectNode();registration.put("clientName", "Portal Integration " + suffix);registration.put("clientType", "public");registration.putArray("grantTypes").add("urn:ietf:params:oauth:grant-type:device_code");registration.putArray("scopes").add("sso:account:access");- var client = oidcService.registerClient(registration);+ RegisteredClient client = oidcService.registerClient(registration);- var start = mapper.createObjectNode();+ ObjectNode start = mapper.createObjectNode();start.put("clientId", client.clientId());start.put("clientSecret", client.clientSecret());start.put("startUrl", "https://example.awsapps.com/start");- var authorization = oidcService.startDeviceAuthorization(start);+ DeviceAuthorization authorization = oidcService.startDeviceAuthorization(start);oidcService.authorizeDevice(authorization.userCode(), principalId);- var token = mapper.createObjectNode();+ ObjectNode token = mapper.createObjectNode();token.put("clientId", client.clientId());token.put("clientSecret", client.clientSecret());token.put("grantType", "urn:ietf:params:oauth:grant-type:device_code");diff --git a/src/test/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalServiceTest.javaindex 5171e66bd6..fb45a33081 100644--- a/src/test/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ssoportal/SsoPortalServiceTest.java@@ -1,5 +1,7 @@package io.github.hectorvent.floci.services.ssoportal;+import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.common.PaginatedResult;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.services.iam.IamService;import io.github.hectorvent.floci.services.organizations.OrganizationsService;@@ -9,6 +11,9 @@ import io.github.hectorvent.floci.services.ssoadmin.model.PermissionSet;import io.github.hectorvent.floci.services.ssooidc.SsoOidcException;import io.github.hectorvent.floci.services.ssooidc.SsoOidcService;import io.github.hectorvent.floci.services.ssooidc.model.TokenSession;+import io.github.hectorvent.floci.services.ssoportal.model.PortalAccountInfo;+import io.github.hectorvent.floci.services.ssoportal.model.PortalRoleCredentials;+import io.github.hectorvent.floci.services.ssoportal.model.PortalRoleInfo;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.mockito.ArgumentCaptor;@@ -59,13 +64,13 @@ class SsoPortalServiceTest {when(ssoAdminService.permissionSetForPortal(permissionSetArn)).thenReturn(new PermissionSet(permissionSetArn, "PlatformAdmins", null, "PT1H", Map.of(), Map.of(), null, null, Map.of()));- var accounts = service.listAccounts(accessToken, null, null);+ PaginatedResult<PortalAccountInfo> accounts = service.listAccounts(accessToken, null, null);assertEquals(List.of(accountId), accounts.items().stream().map(a -> a.accountId()).toList());- var roles = service.listAccountRoles(accessToken, accountId, null, null);+ PaginatedResult<PortalRoleInfo> roles = service.listAccountRoles(accessToken, accountId, null, null);assertEquals("PlatformAdmins", roles.items().getFirst().roleName());- var credentials = service.getRoleCredentials(accessToken, accountId, "PlatformAdmins");+ PortalRoleCredentials credentials = service.getRoleCredentials(accessToken, accountId, "PlatformAdmins");assertTrue(credentials.accessKeyId().startsWith("ASIA"));assertTrue(credentials.expiration() > System.currentTimeMillis());@@ -90,7 +95,7 @@ class SsoPortalServiceTest {void rejectsInvalidOrExpiredTokens() {when(oidcService.requireAccessToken("bad-token")).thenThrow(new SsoOidcException("invalid_token", "expired", 401));- var error = assertThrows(io.github.hectorvent.floci.core.common.AwsException.class,+ AwsException error = assertThrows(AwsException.class,() -> service.listAccounts("bad-token", null, null));assertEquals("UnauthorizedException", error.getErrorCode());}diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorBranchHistoryEventsTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorBranchHistoryEventsTest.javaindex 72aae4e4bb..107f94e0f1 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorBranchHistoryEventsTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorBranchHistoryEventsTest.java@@ -86,7 +86,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid parallelBranchesPublishTheirStatesOnChainsOfTheirOwn() {- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"P","States":{"P":{"Type":"Parallel","Branches":[{"StartAt":"A1","States":{"A1":{"Type":"Pass","Next":"A2"},"A2":{"Type":"Pass","End":true}}},@@ -104,16 +104,16 @@ class AslExecutorBranchHistoryEventsTest {"PassStateExited", "ExecutionSucceeded"),typesOf(history.subList(11, 16)));- var started = eventOfType(history, "ParallelStateStarted");+ HistoryEvent started = eventOfType(history, "ParallelStateStarted");assertEquals(2L, started.getPreviousEventId());assertNull(started.getDetails());// Each branch's first state starts from ParallelStateStarted, and the branch chains on from// there: A1 exited points at A1 entered, A2 entered at A1 exited.for (String branch : List.of("A", "B")) {- var firstEntered = stateEvent(history, "PassStateEntered", branch + "1");- var firstExited = stateEvent(history, "PassStateExited", branch + "1");- var secondEntered = stateEvent(history, "PassStateEntered", branch + "2");- var secondExited = stateEvent(history, "PassStateExited", branch + "2");+ HistoryEvent firstEntered = stateEvent(history, "PassStateEntered", branch + "1");+ HistoryEvent firstExited = stateEvent(history, "PassStateExited", branch + "1");+ HistoryEvent secondEntered = stateEvent(history, "PassStateEntered", branch + "2");+ HistoryEvent secondExited = stateEvent(history, "PassStateExited", branch + "2");assertEquals(started.getId(), firstEntered.getPreviousEventId());assertEquals(firstEntered.getId(), firstExited.getPreviousEventId());assertEquals(firstExited.getId(), secondEntered.getPreviousEventId());@@ -122,8 +122,8 @@ class AslExecutorBranchHistoryEventsTest {// The Parallel continues from the last event a branch published. ParallelStateSucceeded// points at it and is passed by: ParallelStateExited points at it too.long lastBranchEvent = history.get(10).getId();- var succeeded = eventOfType(history, "ParallelStateSucceeded");- var exited = eventOfType(history, "ParallelStateExited");+ HistoryEvent succeeded = eventOfType(history, "ParallelStateSucceeded");+ HistoryEvent exited = eventOfType(history, "ParallelStateExited");assertEquals(lastBranchEvent, succeeded.getPreviousEventId());assertNull(succeeded.getDetails());assertEquals(lastBranchEvent, exited.getPreviousEventId());@@ -134,7 +134,7 @@ class AslExecutorBranchHistoryEventsTest {/** The shape reported in issue #2868, with the branch that never fails left out. */@Testvoid runtimeErrorInABranchNamesTheBranchStateAndItsEnteredEvent() {- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"P","States":{"P":{"Type":"Parallel","Branches":[{"StartAt":"Fast","States":{"Fast":{"Type":"Pass","Parameters":{"m.$":"$.nope"},"End":true}}}@@ -144,7 +144,7 @@ class AslExecutorBranchHistoryEventsTest {assertEquals(List.of("ExecutionStarted", "ParallelStateEntered", "ParallelStateStarted","PassStateEntered", "ExecutionFailed"), typesOf(history));assertEquals(List.of(0L, 0L, 2L, 3L, 4L), previousEventIdsOf(history));- var failed = history.get(4);+ HistoryEvent failed = history.get(4);assertEquals("States.Runtime", failed.getDetails().get("error"));assertEquals("An error occurred while executing the state 'Fast' (entered at the event id #4). "+ "The JSONPath '$.nope' specified for the field 'm.$' could not be found in the input '{\"x\":\"a\"}'",@@ -153,7 +153,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid failStateInABranchPassesItsCauseThroughAndLeavesAParallelStateFailedEvent() {- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"P","States":{"P":{"Type":"Parallel","Branches":[{"StartAt":"Boom","States":{"Boom":{"Type":"Fail","Error":"MyError","Cause":"my cause"}}}@@ -169,7 +169,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid caughtBranchFailureExitsTheParallelWithTheErrorOutput() {- var history = run("""+ List<HistoryEvent> history = run("""{"QueryLanguage":"JSONata","StartAt":"P","States":{"P":{"Type":"Parallel","Branches":[{"StartAt":"Undef","States":{"Undef":{"Type":"Pass","Output":{"v":"{% $states.input.missing %}"},"End":true}}}@@ -181,19 +181,19 @@ class AslExecutorBranchHistoryEventsTest {"PassStateEntered", "EvaluationFailed", "ParallelStateFailed", "ParallelStateExited","PassStateEntered", "PassStateExited", "ExecutionSucceeded"), typesOf(history));assertEquals(List.of(0L, 0L, 2L, 3L, 4L, 5L, 6L, 7L, 8L, 9L), previousEventIdsOf(history));- var cause = "An error occurred while executing the state 'Undef' (entered at the event id #4). "+ String cause = "An error occurred while executing the state 'Undef' (entered at the event id #4). "+ "The JSONata expression '$states.input.missing' specified for the field 'Output/v' "+ "returned nothing (undefined).";assertEquals(Map.of("error", "States.QueryEvaluationError", "cause", cause, "location", "Output/v","state", "Undef"), history.get(4).getDetails());- var errorOutput = "{\"Error\":\"States.QueryEvaluationError\",\"Cause\":\"" + cause.replace("\"", "\\\"") + "\"}";+ String errorOutput = "{\"Error\":\"States.QueryEvaluationError\",\"Cause\":\"" + cause.replace("\"", "\\\"") + "\"}";assertEquals(errorOutput, history.get(6).getDetails().get("output"));assertEquals(errorOutput, history.get(9).getDetails().get("output"));}@Testvoid retriedParallelStartsAgainAndFailsOnceItsRetryIsUsedUp() {- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"P","States":{"P":{"Type":"Parallel","Branches":[{"StartAt":"Boom","States":{"Boom":{"Type":"Fail","Error":"MyError","Cause":"my cause"}}}@@ -208,7 +208,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid parallelOwnFailureIsAttributedToTheParallelAfterItsBranchesSucceeded() {- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"P","States":{"P":{"Type":"Parallel","Branches":[{"StartAt":"Ok","States":{"Ok":{"Type":"Pass","End":true}}}@@ -226,9 +226,9 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid taskFailureEndingABranchIsRecordedAsAbortedAndPassesItsCauseThrough() {- var mocks = new MockedTestCase("branch-history-test", "Case", Map.of("Send", List.of(+ MockedTestCase mocks = new MockedTestCase("branch-history-test", "Case", Map.of("Send", List.of(new MockedResponseStep(0, 0, null, "SQS.QueueDoesNotExistException", "The specified queue does not exist."))));- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"P","States":{"P":{"Type":"Parallel","Branches":[{"StartAt":"Send","States":{"Send":{"Type":"Task","Resource":"arn:aws:states:::sqs:sendMessage",@@ -249,7 +249,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid mapIterationsPublishTheirStatesUnderIterationEvents() {- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"M","States":{"M":{"Type":"Map","ItemsPath":"$.items","ItemProcessor":{"ProcessorConfig":{"Mode":"INLINE"},"StartAt":"I1","States":{"I1":{"Type":"Pass","Next":"I2"},"I2":{"Type":"Pass","End":true}}},@@ -261,18 +261,18 @@ class AslExecutorBranchHistoryEventsTest {assertEquals(20, history.size(), typesOf(history).toString());assertIdsAreConsecutive(history);assertEquals(List.of("ExecutionStarted", "MapStateEntered", "MapStateStarted"), typesOf(history.subList(0, 3)));- var started = history.get(2);+ HistoryEvent started = history.get(2);assertEquals(2L, started.getPreviousEventId());assertEquals(Map.of("length", 2), started.getDetails());for (int index = 0; index < 2; index++) {- var iterationStarted = iterationEvent(history, "MapIterationStarted", index);- var iterationSucceeded = iterationEvent(history, "MapIterationSucceeded", index);- var input = String.valueOf(index + 1);- var firstEntered = stateEventWithInput(history, "PassStateEntered", "I1", input);- var firstExited = stateEventWithOutput(history, "PassStateExited", "I1", input);- var secondEntered = stateEventWithInput(history, "PassStateEntered", "I2", input);- var secondExited = stateEventWithOutput(history, "PassStateExited", "I2", input);+ HistoryEvent iterationStarted = iterationEvent(history, "MapIterationStarted", index);+ HistoryEvent iterationSucceeded = iterationEvent(history, "MapIterationSucceeded", index);+ String input = String.valueOf(index + 1);+ HistoryEvent firstEntered = stateEventWithInput(history, "PassStateEntered", "I1", input);+ HistoryEvent firstExited = stateEventWithOutput(history, "PassStateExited", "I1", input);+ HistoryEvent secondEntered = stateEventWithInput(history, "PassStateEntered", "I2", input);+ HistoryEvent secondExited = stateEventWithOutput(history, "PassStateExited", "I2", input);assertEquals(Map.of("name", "M", "index", index), iterationStarted.getDetails());assertEquals(started.getId(), iterationStarted.getPreviousEventId());assertEquals(iterationStarted.getId(), firstEntered.getPreviousEventId());@@ -294,7 +294,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid mapOverNoItemsExitsFromItsStartedEvent() {- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"M","States":{"M":{"Type":"Map","ItemsPath":"$.items","ItemProcessor":{"StartAt":"I","States":{"I":{"Type":"Pass","End":true}}},"End":true}}}@@ -307,7 +307,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid runtimeErrorInABranchTaskLeavesNoAbortedEvent() {- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"P","States":{"P":{"Type":"Parallel","Branches":[{"StartAt":"Send","States":{"Send":{"Type":"Task","Resource":"arn:aws:states:::sqs:sendMessage",@@ -322,7 +322,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid mapIterationFailureLeavesIterationAndStateFailedEventsBehind() {- var history = run("""+ List<HistoryEvent> history = run("""{"QueryLanguage":"JSONata","StartAt":"M","States":{"M":{"Type":"Map","Items":"{% $states.input.items %}","MaxConcurrency":1,"ItemProcessor":{"ProcessorConfig":{"Mode":"INLINE"},"StartAt":"Undef",@@ -336,7 +336,7 @@ class AslExecutorBranchHistoryEventsTest {// MapIterationFailed points at the iteration's last event and is passed by: MapStateFailed// points at that same event.assertEquals(List.of(0L, 0L, 2L, 3L, 4L, 5L, 6L, 6L, 8L), previousEventIdsOf(history));- var cause = "An error occurred while executing the state 'Undef' (entered at the event id #5). "+ String cause = "An error occurred while executing the state 'Undef' (entered at the event id #5). "+ "The JSONata expression '$states.input.missing' specified for the field 'Output/v' "+ "returned nothing (undefined).";assertEquals("Undef", history.get(5).getDetails().get("state"));@@ -347,7 +347,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid runtimeErrorInAMapIterationLeavesNoFailedEvents() {- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"M","States":{"M":{"Type":"Map","ItemsPath":"$.items","MaxConcurrency":1,"ItemProcessor":{"ProcessorConfig":{"Mode":"INLINE"},"StartAt":"Fast",@@ -365,7 +365,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid distributedMapNamesItsRunAndPublishesNoItemEvents() {- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"D","States":{"D":{"Type":"Map","ItemsPath":"$.items","ItemProcessor":{"ProcessorConfig":{"Mode":"DISTRIBUTED","ExecutionType":"STANDARD"},@@ -377,14 +377,14 @@ class AslExecutorBranchHistoryEventsTest {"MapRunSucceeded", "MapStateSucceeded", "MapStateExited", "ExecutionSucceeded"), typesOf(history));// The parent chain stays at MapRunStarted: MapStateExited points at it, past both Succeeded events.assertEquals(List.of(0L, 0L, 2L, 3L, 4L, 5L, 4L, 7L), previousEventIdsOf(history));- var mapRunArn = (String) history.get(3).getDetails().get("mapRunArn");+ String mapRunArn = (String) history.get(3).getDetails().get("mapRunArn");assertTrue(mapRunArn.startsWith("arn:aws:states:us-east-1:000000000000:mapRun:branch-history-test/"), mapRunArn);assertEquals("[1,2]", history.get(6).getDetails().get("output"));}@Testvoid nestedMapInsideAParallelBranchChainsToTheBranch() {- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"P","States":{"P":{"Type":"Parallel","Branches":[{"StartAt":"M","States":{"M":{"Type":"Map","ItemsPath":"$.items","ItemProcessor":{@@ -397,11 +397,11 @@ class AslExecutorBranchHistoryEventsTest {assertEquals("SUCCEEDED", status(history), typesOf(history).toString());assertEquals(20, history.size(), typesOf(history).toString());assertIdsAreConsecutive(history);- var parallelStarted = eventOfType(history, "ParallelStateStarted");- var mapEntered = eventOfType(history, "MapStateEntered");- var mapStarted = eventOfType(history, "MapStateStarted");- var mapSucceeded = eventOfType(history, "MapStateSucceeded");- var mapExited = eventOfType(history, "MapStateExited");+ HistoryEvent parallelStarted = eventOfType(history, "ParallelStateStarted");+ HistoryEvent mapEntered = eventOfType(history, "MapStateEntered");+ HistoryEvent mapStarted = eventOfType(history, "MapStateStarted");+ HistoryEvent mapSucceeded = eventOfType(history, "MapStateSucceeded");+ HistoryEvent mapExited = eventOfType(history, "MapStateExited");assertEquals(parallelStarted.getId(), mapEntered.getPreviousEventId());assertEquals(parallelStarted.getId(), stateEvent(history, "PassStateEntered", "B1").getPreviousEventId());assertEquals(mapEntered.getId(), mapStarted.getPreviousEventId());@@ -412,7 +412,7 @@ class AslExecutorBranchHistoryEventsTest {iterationEvent(history, "MapIterationSucceeded", 1).getId());assertEquals(lastIterationEvent, mapSucceeded.getPreviousEventId());assertEquals(lastIterationEvent, mapExited.getPreviousEventId());- var parallelExited = eventOfType(history, "ParallelStateExited");+ HistoryEvent parallelExited = eventOfType(history, "ParallelStateExited");long lastBranchEvent = Math.max(mapExited.getId(), stateEvent(history, "PassStateExited", "B1").getId());assertEquals(lastBranchEvent, eventOfType(history, "ParallelStateSucceeded").getPreviousEventId());assertEquals(lastBranchEvent, parallelExited.getPreviousEventId());@@ -421,7 +421,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid jsonataFailureRecordsAnEvaluationFailedEventPerAttempt() {- var history = run("""+ List<HistoryEvent> history = run("""{"QueryLanguage":"JSONata","StartAt":"Send","States":{"Send":{"Type":"Task","Resource":"arn:aws:states:::sqs:sendMessage","Arguments":{"QueueUrl":"https://sqs.us-east-1.amazonaws.com/000000000000/q","MessageBody":"{% $states.input.missing %}"},@@ -431,10 +431,10 @@ class AslExecutorBranchHistoryEventsTest {assertEquals(List.of("ExecutionStarted", "TaskStateEntered", "EvaluationFailed", "EvaluationFailed","ExecutionFailed"), typesOf(history));assertEquals(List.of(0L, 0L, 2L, 3L, 4L), previousEventIdsOf(history));- var cause = "An error occurred while executing the state 'Send' (entered at the event id #2). "+ String cause = "An error occurred while executing the state 'Send' (entered at the event id #2). "+ "The JSONata expression '$states.input.missing' specified for the field 'Arguments/MessageBody' "+ "returned nothing (undefined).";- var expected = Map.of("error", "States.QueryEvaluationError", "cause", cause,+ Map<String, String> expected = Map.of("error", "States.QueryEvaluationError", "cause", cause,"location", "Arguments/MessageBody", "state", "Send");assertEquals(expected, history.get(2).getDetails());assertEquals(expected, history.get(3).getDetails());@@ -443,7 +443,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid mapItemsExpressionFailureIsRecordedBeforeTheMapStarts() {- var history = run("""+ List<HistoryEvent> history = run("""{"QueryLanguage":"JSONata","StartAt":"Fan","States":{"Fan":{"Type":"Map","Items":"{% $states.input.missing %}","ItemProcessor":{"ProcessorConfig":{"Mode":"INLINE"},"StartAt":"I","States":{"I":{"Type":"Pass","End":true}}},@@ -462,7 +462,7 @@ class AslExecutorBranchHistoryEventsTest {*/@Testvoid catchClauseOutputFailureIsRecordedFromBeforeTheStateFailedEvent() {- var history = run("""+ List<HistoryEvent> history = run("""{"QueryLanguage":"JSONata","StartAt":"P","States":{"P":{"Type":"Parallel","Branches":[{"StartAt":"Boom","States":{"Boom":{"Type":"Fail","Error":"MyError","Cause":"my cause"}}}@@ -475,7 +475,7 @@ class AslExecutorBranchHistoryEventsTest {assertEquals(List.of("ExecutionStarted", "ParallelStateEntered", "ParallelStateStarted", "FailStateEntered","ParallelStateFailed", "EvaluationFailed", "ParallelStateFailed", "ExecutionFailed"), typesOf(history));assertEquals(List.of(0L, 0L, 2L, 3L, 4L, 4L, 6L, 7L), previousEventIdsOf(history));- var cause = "An error occurred while executing the state 'P' (entered at the event id #2). "+ String cause = "An error occurred while executing the state 'P' (entered at the event id #2). "+ "The JSONata expression '$states.input.missing' specified for the field 'Catch[1]/Output/v' "+ "returned nothing (undefined).";assertEquals(Map.of("error", "States.QueryEvaluationError", "cause", cause,@@ -485,7 +485,7 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid choiceWithNoMatchingRuleAndNoDefaultFailsAsAwsDoes() {- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"C","States":{"C":{"Type":"Choice","Choices":[{"Variable":"$.x","StringEquals":"never","Next":"Done"}]},"Done":{"Type":"Pass","End":true}}}@@ -500,9 +500,9 @@ class AslExecutorBranchHistoryEventsTest {@Testvoid catchInsideABranchTakesItsNextEvenOnAnEndState() {- var mocks = new MockedTestCase("branch-history-test", "Case", Map.of("Send", List.of(+ MockedTestCase mocks = new MockedTestCase("branch-history-test", "Case", Map.of("Send", List.of(new MockedResponseStep(0, 0, null, "MyError", "boom"))));- var history = run("""+ List<HistoryEvent> history = run("""{"StartAt":"P","States":{"P":{"Type":"Parallel","Branches":[{"StartAt":"Send","States":{@@ -519,7 +519,7 @@ class AslExecutorBranchHistoryEventsTest {}private static String status(List<HistoryEvent> history) {- var last = history.get(history.size() - 1).getType();+ String last = history.get(history.size() - 1).getType();return switch (last) {case "ExecutionSucceeded" -> "SUCCEEDED";case "ExecutionFailed" -> "FAILED";@@ -536,10 +536,10 @@ class AslExecutorBranchHistoryEventsTest {}private static void assertIdsAreConsecutive(List<HistoryEvent> history) {- for (var i = 0; i < history.size(); i++) {+ for (int i = 0; i < history.size(); i++) {assertEquals(i + 1L, history.get(i).getId(), "unexpected id at index " + i);}- var referenced = history.stream().map(HistoryEvent::getPreviousEventId).collect(Collectors.toSet());+ Set<Long> referenced = history.stream().map(HistoryEvent::getPreviousEventId).collect(Collectors.toSet());referenced.remove(0L);assertTrue(referenced.stream().allMatch(id -> id < history.size()),"previousEventId points past the history: " + Set.copyOf(referenced));@@ -590,21 +590,21 @@ class AslExecutorBranchHistoryEventsTest {/** Runs the definition the way StartExecution does: the history already holds ExecutionStarted as event 1. */private List<HistoryEvent> run(String definition, String input, MockedTestCase mocks) {- var stateMachine = new StateMachine();+ StateMachine stateMachine = new StateMachine();stateMachine.setName("branch-history-test");stateMachine.setStateMachineArn("arn:aws:states:%s:%s:stateMachine:branch-history-test".formatted(REGION, ACCOUNT));stateMachine.setRoleArn("arn:aws:iam::%s:role/test-role".formatted(ACCOUNT));stateMachine.setDefinition(definition);- var execution = new Execution();+ Execution execution = new Execution();execution.setName("branch-history-execution");execution.setExecutionArn("arn:aws:states:%s:%s:execution:branch-history-test:branch-history-execution".formatted(REGION, ACCOUNT));execution.setStateMachineArn(stateMachine.getStateMachineArn());execution.setInput(input);- var history = new ArrayList<HistoryEvent>();- var started = new HistoryEvent();+ ArrayList<HistoryEvent> history = new ArrayList<>();+ HistoryEvent started = new HistoryEvent();started.setId(1L);started.setPreviousEventId(0L);started.setType("ExecutionStarted");diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorHttpInvokeTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorHttpInvokeTest.javaindex 759d5b6a75..be93ac5c72 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorHttpInvokeTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorHttpInvokeTest.java@@ -23,6 +23,7 @@ import io.vertx.mutiny.core.MultiMap;import io.vertx.mutiny.core.Vertx;import io.vertx.mutiny.core.buffer.Buffer;import io.vertx.mutiny.core.http.HttpServer;+import io.vertx.mutiny.core.http.HttpServerRequest;import io.vertx.mutiny.ext.web.Router;import io.vertx.mutiny.ext.web.RoutingContext;import jakarta.enterprise.inject.Instance;@@ -89,7 +90,7 @@ class AslExecutorHttpInvokeTest {void setUp() {server = vertx.createHttpServer();- var router = Router.router(vertx);+ Router router = Router.router(vertx);router.get("/json").handler(ctx -> {ctx.request().body()@@ -182,8 +183,8 @@ class AslExecutorHttpInvokeTest {}private void recordRequest(final RoutingContext ctx, String body) {- var request = ctx.request();- var requestRecord = new RecordedRequest(+ HttpServerRequest request = ctx.request();+ RecordedRequest requestRecord = new RecordedRequest(request.method().name(),request.uri(),request.query(),diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorIntrinsicMissingArgumentTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorIntrinsicMissingArgumentTest.javaindex 67dce70661..6e315278ce 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorIntrinsicMissingArgumentTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorIntrinsicMissingArgumentTest.java@@ -57,7 +57,7 @@ class AslExecutorIntrinsicMissingArgumentTest {@Testvoid unresolvableArgumentFailsWithTheCauseAwsWrites() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"v.$\":\"States.Format('{}', $.nope)\"}", "{\"other\":1}"));assertEquals("States.Runtime", failure.error);@@ -69,7 +69,7 @@ class AslExecutorIntrinsicMissingArgumentTest {/** The expression is echoed as written, spacing included. */@Testvoid theCauseEchoesTheExpressionVerbatim() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"v.$\":\"States.Format('{}',$.nope)\"}", "{\"other\":1}"));assertEquals("The function 'States.Format('{}',$.nope)' had the following error: "@@ -80,7 +80,7 @@ class AslExecutorIntrinsicMissingArgumentTest {/** A later argument fails alike, and the cause names that argument rather than the first. */@Testvoid aLaterArgumentNamesItself() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"v.$\":\"States.Format('{} {}', $.other, $.a.b)\"}", "{\"other\":1}"));assertEquals("The function 'States.Format('{} {}', $.other, $.a.b)' had the following "@@ -94,7 +94,7 @@ class AslExecutorIntrinsicMissingArgumentTest {*/@Testvoid aReferencePathAsTheFormatTemplateIsResolvedAndFailsWhenItMatchesNothing() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"v.$\":\"States.Format($.nope, 1)\"}", "{\"other\":1}"));assertEquals("States.Runtime", failure.error);@@ -106,7 +106,7 @@ class AslExecutorIntrinsicMissingArgumentTest {/** A reference path in the template position that does resolve is used as the template. */@Testvoid aReferencePathAsTheFormatTemplateThatResolvesIsUsedAsTheTemplate() throws Exception {- var resolved = resolve("{\"v.$\":\"States.Format($.tpl, 1)\"}", "{\"tpl\":\"n={}\"}");+ JsonNode resolved = resolve("{\"v.$\":\"States.Format($.tpl, 1)\"}", "{\"tpl\":\"n={}\"}");assertEquals("\"n=1\"", resolved.path("v").toString());}@@ -114,7 +114,7 @@ class AslExecutorIntrinsicMissingArgumentTest {/** The whole expression is named, not the inner function that took the failing argument. */@Testvoid nestedIntrinsicNamesTheWholeExpression() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"v.$\":\"States.Format('{}', States.Format('{}', $.nope))\"}","{\"other\":1}"));@@ -138,7 +138,7 @@ class AslExecutorIntrinsicMissingArgumentTest {/** Only absence fails. A present but explicitly null argument still formats as null. */@Testvoid explicitNullArgumentStillFormats() throws Exception {- var resolved = resolve("{\"v.$\":\"States.Format('{}', $.nul)\"}", "{\"nul\":null}");+ JsonNode resolved = resolve("{\"v.$\":\"States.Format('{}', $.nul)\"}", "{\"nul\":null}");assertEquals("\"null\"", resolved.path("v").toString());}@@ -146,7 +146,7 @@ class AslExecutorIntrinsicMissingArgumentTest {/** A wildcard projection that matches nothing is an empty array, not an absent argument. */@Testvoid wildcardMatchingNothingIsAnEmptyArray() throws Exception {- var resolved = resolve("{\"v.$\":\"States.ArrayLength($.items[*].nope)\"}", "{\"items\":[1,2]}");+ JsonNode resolved = resolve("{\"v.$\":\"States.ArrayLength($.items[*].nope)\"}", "{\"items\":[1,2]}");assertEquals(0, resolved.path("v").asInt());}@@ -158,7 +158,7 @@ class AslExecutorIntrinsicMissingArgumentTest {*/@Testvoid indexPastTheEndOfAnArrayFails() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"v.$\":\"States.Format('{}', $.items[5])\"}", "{\"items\":[1,2]}"));assertEquals("The function 'States.Format('{}', $.items[5])' had the following error: "@@ -169,7 +169,7 @@ class AslExecutorIntrinsicMissingArgumentTest {/** The plain form of the same path is not a miss. AWS resolves it to null and the execution succeeds. */@Testvoid plainReferencePastTheEndOfAnArrayResolvesToNull() throws Exception {- var resolved = resolve("{\"v.$\":\"$.items[5]\"}", "{\"items\":[1,2]}");+ JsonNode resolved = resolve("{\"v.$\":\"$.items[5]\"}", "{\"items\":[1,2]}");assertTrue(resolved.path("v").isNull());}@@ -177,7 +177,7 @@ class AslExecutorIntrinsicMissingArgumentTest {/** Reading a field off the absent element fails alike. */@Testvoid navigatingPastAnOutOfRangeIndexFails() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"v.$\":\"States.Format('{}', $.items[5].x)\"}", "{\"items\":[1]}"));assertEquals("The function 'States.Format('{}', $.items[5].x)' had the following error: "@@ -192,7 +192,7 @@ class AslExecutorIntrinsicMissingArgumentTest {*/@Testvoid indexingANonArrayFails() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"v.$\":\"States.Format('{}', $.other[0])\"}", "{\"other\":1}"));assertEquals("States.Runtime", failure.error);@@ -209,10 +209,10 @@ class AslExecutorIntrinsicMissingArgumentTest {*/@Testvoid unresolvableContextArgumentNamesTheRewrittenPathAndTheStateInput() throws Exception {- var context = mapper.readTree("{\"State\":{\"Name\":\"P\"}}");- var template = mapper.readTree("{\"v.$\":\"States.Format('{}', $$.Nope.Deep)\"}");+ JsonNode context = mapper.readTree("{\"State\":{\"Name\":\"P\"}}");+ JsonNode template = mapper.readTree("{\"v.$\":\"States.Format('{}', $$.Nope.Deep)\"}");- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> executor.resolveParameters(template, mapper.readTree("{\"other\":1}"), context));assertEquals("The function 'States.Format('{}', $$.Nope.Deep)' had the following error: "@@ -223,7 +223,7 @@ class AslExecutorIntrinsicMissingArgumentTest {/** A bare $ argument is the whole input, so it never misses. */@Testvoid wholeInputArgumentResolves() throws Exception {- var resolved = resolve("{\"v.$\":\"States.JsonToString($)\"}", "{\"other\":1}");+ JsonNode resolved = resolve("{\"v.$\":\"States.JsonToString($)\"}", "{\"other\":1}");assertEquals("{\"other\":1}", resolved.path("v").asText());}@@ -231,7 +231,7 @@ class AslExecutorIntrinsicMissingArgumentTest {/** ResultSelector and ItemSelector run through the same resolver, so they fail the same way. */@Testvoid resultSelectorFailsOnAnUnresolvableArgument() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"v.$\":\"States.Format('{}', $[0].nope)\"}", "[{\"other\":1}]"));assertEquals("The function 'States.Format('{}', $[0].nope)' had the following error: "@@ -240,7 +240,7 @@ class AslExecutorIntrinsicMissingArgumentTest {}private void assertIntrinsicFails(String expression, String argument) {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"v.$\":\"" + expression + "\"}", "{\"other\":1}"),expression);diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorMockedResponsesTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorMockedResponsesTest.javaindex b71c86502f..8fbfbd0caf 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorMockedResponsesTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorMockedResponsesTest.java@@ -74,10 +74,10 @@ class AslExecutorMockedResponsesTest {@Testvoid mockedReturnReplacesUnsupportedResource() throws Exception {- var mocks = testCase(Map.of("Call API", List.of(+ MockedTestCase mocks = testCase(Map.of("Call API", List.of(returnStep(0, 0, "{\"StatusCode\": 200, \"ResponseBody\": {\"id\": 1}}"))));- var execution = run("""+ Execution execution = run("""{"StartAt": "Call API","States": {@@ -91,7 +91,7 @@ class AslExecutorMockedResponsesTest {""".formatted(UNSUPPORTED_RESOURCE), mocks);assertEquals("SUCCEEDED", execution.getStatus());- var output = objectMapper.readTree(execution.getOutput());+ JsonNode output = objectMapper.readTree(execution.getOutput());assertEquals(200, output.path("StatusCode").asInt());assertEquals(1, output.path("ResponseBody").path("id").asInt());verifyNoInteractions(lambdaExecutor);@@ -99,10 +99,10 @@ class AslExecutorMockedResponsesTest {@Testvoid mockedThrowKeepsErrorAndCauseThroughCatch() throws Exception {- var mocks = testCase(Map.of("Call API", List.of(+ MockedTestCase mocks = testCase(Map.of("Call API", List.of(throwStep(0, 0, "ApiGateway.422", "Unprocessable"))));- var execution = run("""+ Execution execution = run("""{"StartAt": "Call API","States": {@@ -124,18 +124,18 @@ class AslExecutorMockedResponsesTest {""".formatted(UNSUPPORTED_RESOURCE), mocks);assertEquals("SUCCEEDED", execution.getStatus());- var output = objectMapper.readTree(execution.getOutput());+ JsonNode output = objectMapper.readTree(execution.getOutput());assertEquals("ApiGateway.422", output.path("Error").asText());assertEquals("Unprocessable", output.path("Cause").asText());}@Testvoid attemptKeyedMocksDriveRetry() throws Exception {- var mocks = testCase(Map.of("Call API", List.of(+ MockedTestCase mocks = testCase(Map.of("Call API", List.of(throwStep(0, 0, "ApiGateway.429", "Too many requests"),returnStep(1, 2, "{\"retried\": true}"))));- var execution = run("""+ Execution execution = run("""{"StartAt": "Call API","States": {@@ -160,11 +160,11 @@ class AslExecutorMockedResponsesTest {@Testvoid mockedResponseIndexContinuesAcrossMapIterations() throws Exception {- var mocks = testCase(Map.of("Call API", List.of(+ MockedTestCase mocks = testCase(Map.of("Call API", List.of(returnStep(0, 0, "{\"Payload\": \"first\"}"),returnStep(1, 1, "{\"Payload\": \"second\"}"))));- var execution = run("""+ Execution execution = run("""{"StartAt": "Each","States": {@@ -196,10 +196,10 @@ class AslExecutorMockedResponsesTest {@Testvoid mockedResponseIndexRestartsForEachExecution() throws Exception {- var mocks = testCase(Map.of("Call API", List.of(+ MockedTestCase mocks = testCase(Map.of("Call API", List.of(returnStep(0, 0, "{\"value\": \"first\"}"),returnStep(1, 1, "{\"value\": \"second\"}"))));- var definition = """+ String definition = """{"StartAt": "Call API","States": {@@ -212,8 +212,8 @@ class AslExecutorMockedResponsesTest {}""".formatted(UNSUPPORTED_RESOURCE);- var firstExecution = run(definition, mocks, "{}", "first-execution");- var secondExecution = run(definition, mocks, "{}", "second-execution");+ Execution firstExecution = run(definition, mocks, "{}", "first-execution");+ Execution secondExecution = run(definition, mocks, "{}", "second-execution");assertEquals("first", objectMapper.readTree(firstExecution.getOutput()).path("value").asText());assertEquals("first", objectMapper.readTree(secondExecution.getOutput()).path("value").asText());@@ -221,10 +221,10 @@ class AslExecutorMockedResponsesTest {@Testvoid missingAttemptEntryFailsExecution() throws Exception {- var mocks = testCase(Map.of("Call API", List.of(+ MockedTestCase mocks = testCase(Map.of("Call API", List.of(throwStep(0, 0, "ApiGateway.429", "Too many requests"))));- var execution = run("""+ Execution execution = run("""{"StartAt": "Call API","States": {@@ -250,10 +250,10 @@ class AslExecutorMockedResponsesTest {@Testvoid statesRuntimeIsNotRetriedOrCaughtEvenWhenNamedExplicitly() throws Exception {- var mocks = testCase(Map.of("Call API", List.of(+ MockedTestCase mocks = testCase(Map.of("Call API", List.of(throwStep(0, 0, "ApiGateway.429", "Too many requests"))));- var execution = run("""+ Execution execution = run("""{"StartAt": "Call API","States": {@@ -309,20 +309,20 @@ class AslExecutorMockedResponsesTest {}private Execution run(String definition, MockedTestCase mocks, String input, String executionName) {- var stateMachine = new StateMachine();+ StateMachine stateMachine = new StateMachine();stateMachine.setName("mock-test");stateMachine.setStateMachineArn("arn:aws:states:%s:%s:stateMachine:mock-test".formatted(REGION, ACCOUNT));stateMachine.setRoleArn("arn:aws:iam::%s:role/test-role".formatted(ACCOUNT));stateMachine.setDefinition(definition);- var execution = new Execution();+ Execution execution = new Execution();execution.setName(executionName);execution.setExecutionArn("arn:aws:states:%s:%s:execution:mock-test:%s".formatted(REGION, ACCOUNT, executionName));execution.setStateMachineArn(stateMachine.getStateMachineArn());execution.setInput(input);- var history = new ArrayList<HistoryEvent>();+ ArrayList<HistoryEvent> history = new ArrayList<>();executor.executeSync(stateMachine, execution, history, mocks, (updated, events) -> {});return execution;diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorRetryTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorRetryTest.javaindex 8b726afeab..f939bbf2dd 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorRetryTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorRetryTest.java@@ -101,7 +101,7 @@ class AslExecutorRetryTest {.thenReturn(new InvokeResult(200, null,"{\"ok\":true}".getBytes(StandardCharsets.UTF_8), null, "req-2"));- var execution = run("""+ Execution execution = run("""{"StartAt": "Flaky","States": {@@ -132,7 +132,7 @@ class AslExecutorRetryTest {.thenReturn(new InvokeResult(200, "Handled","{\"errorType\":\"Boom\"}".getBytes(StandardCharsets.UTF_8), null, "req-1"));- var execution = run("""+ Execution execution = run("""{"StartAt": "Flaky","States": {@@ -163,7 +163,7 @@ class AslExecutorRetryTest {.thenReturn(new InvokeResult(200, "Handled","{\"errorType\":\"Boom\"}".getBytes(StandardCharsets.UTF_8), null, "req-1"));- var execution = run("""+ Execution execution = run("""{"StartAt": "Flaky","States": {@@ -194,7 +194,7 @@ class AslExecutorRetryTest {.thenReturn(new InvokeResult(200, "Handled","{\"errorType\":\"Boom\"}".getBytes(StandardCharsets.UTF_8), null, "req-1"));- var execution = run("""+ Execution execution = run("""{"StartAt": "Flaky","States": {@@ -232,7 +232,7 @@ class AslExecutorRetryTest {void parallelStateRetriesFailingBranch() throws Exception {failOnceThenSucceed();- var execution = run("""+ Execution execution = run("""{"StartAt": "Par","States": {@@ -266,7 +266,7 @@ class AslExecutorRetryTest {.thenReturn(new InvokeResult(200, "Handled","{\"errorType\":\"Boom\"}".getBytes(StandardCharsets.UTF_8), null, "req-1"));- var execution = run("""+ Execution execution = run("""{"StartAt": "Par","States": {@@ -298,7 +298,7 @@ class AslExecutorRetryTest {void taskInsideParallelBranchRetriesIndependently() throws Exception {failOnceThenSucceed();- var execution = run("""+ Execution execution = run("""{"StartAt": "Par","States": {@@ -336,7 +336,7 @@ class AslExecutorRetryTest {void mapStateRetriesFailingIteration() throws Exception {failOnceThenSucceed();- var execution = run("""+ Execution execution = run("""{"StartAt": "Loop","States": {@@ -371,7 +371,7 @@ class AslExecutorRetryTest {when(lambdaExecutor.invoke(eq(flakyFunction), any(byte[].class), eq(InvocationType.RequestResponse))).thenThrow(new AssertionError("boom"));- var execution = run("""+ Execution execution = run("""{"StartAt": "Par","States": {@@ -401,7 +401,7 @@ class AslExecutorRetryTest {@Testvoid fullJitterScalesTheDelayByTheRandomFactor() throws Exception {- var retrier = "{\"IntervalSeconds\": 10, \"BackoffRate\": 1.0, \"JitterStrategy\": \"FULL\"}";+ String retrier = "{\"IntervalSeconds\": 10, \"BackoffRate\": 1.0, \"JitterStrategy\": \"FULL\"}";assertEquals(0.0, delay(retrier, 1, 0.0));assertEquals(5.0, delay(retrier, 1, 0.5));assertEquals(10.0, delay("{\"IntervalSeconds\": 10, \"BackoffRate\": 1.0, \"JitterStrategy\": \"NONE\"}", 1, 0.5));@@ -435,20 +435,20 @@ class AslExecutorRetryTest {}private Execution run(String definition, String input) {- var stateMachine = new StateMachine();+ StateMachine stateMachine = new StateMachine();stateMachine.setName("retry-test");stateMachine.setStateMachineArn("arn:aws:states:%s:%s:stateMachine:retry-test".formatted(REGION, ACCOUNT));stateMachine.setRoleArn("arn:aws:iam::%s:role/test-role".formatted(ACCOUNT));stateMachine.setDefinition(definition);- var execution = new Execution();+ Execution execution = new Execution();execution.setName("retry-test-execution");execution.setExecutionArn("arn:aws:states:%s:%s:execution:retry-test:retry-test-execution".formatted(REGION, ACCOUNT));execution.setStateMachineArn(stateMachine.getStateMachineArn());execution.setInput(input);- var history = new ArrayList<HistoryEvent>();+ ArrayList<HistoryEvent> history = new ArrayList<>();executor.executeSync(stateMachine, execution, history, (updated, events) -> {});return execution;diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorTaskHistoryEventsTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorTaskHistoryEventsTest.javaindex 2252436fab..d6cef26f26 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorTaskHistoryEventsTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorTaskHistoryEventsTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.stepfunctions;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -128,11 +129,11 @@ class AslExecutorTaskHistoryEventsTest {@Testvoid mockedTaskEmitsScheduledStartedSucceededInOrder() throws Exception {- var mocks = testCase(Map.of("Send", List.of(+ MockedTestCase mocks = testCase(Map.of("Send", List.of(returnStep(0, 0, "{\"MessageId\":\"abc\"}"))));- var history = new ArrayList<HistoryEvent>();- var execution = run("""+ ArrayList<HistoryEvent> history = new ArrayList<>();+ Execution execution = run("""{"StartAt": "Send","States": {@@ -156,23 +157,23 @@ class AslExecutorTaskHistoryEventsTest {typesOf(history));assertChain(history);- var scheduled = eventOfType(history, "TaskScheduled");+ HistoryEvent scheduled = eventOfType(history, "TaskScheduled");assertEquals("aws-sdk:sqs", scheduled.getDetails().get("resourceType"));assertEquals("sendMessage", scheduled.getDetails().get("resource"));assertEquals(REGION, scheduled.getDetails().get("region"));- var parameters = objectMapper.readTree((String) scheduled.getDetails().get("parameters"));+ JsonNode parameters = objectMapper.readTree((String) scheduled.getDetails().get("parameters"));assertEquals("https://sqs.us-east-2.amazonaws.com/000000000000/q", parameters.path("QueueUrl").asText());assertEquals("hello", parameters.path("MessageBody").asText());}@Testvoid retriedMockEmitsTaskEventsPerAttempt() throws Exception {- var mocks = testCase(Map.of("Send", List.of(+ MockedTestCase mocks = testCase(Map.of("Send", List.of(throwStep(0, 1, "ApiGateway.500", "boom"),returnStep(2, 2, "{\"ok\":true}"))));- var history = new ArrayList<HistoryEvent>();- var execution = run("""+ ArrayList<HistoryEvent> history = new ArrayList<>();+ Execution execution = run("""{"StartAt": "Send","States": {@@ -205,11 +206,11 @@ class AslExecutorTaskHistoryEventsTest {@Testvoid taskFailedToleratesNullCause() throws Exception {- var mocks = testCase(Map.of("Send", List.of(+ MockedTestCase mocks = testCase(Map.of("Send", List.of(throwStep(0, 0, "My.Error", null))));- var history = new ArrayList<HistoryEvent>();- var execution = run("""+ ArrayList<HistoryEvent> history = new ArrayList<>();+ Execution execution = run("""{"StartAt": "Send","States": {@@ -224,17 +225,17 @@ class AslExecutorTaskHistoryEventsTest {""", "{}", mocks, history);assertEquals("FAILED", execution.getStatus(), "history: " + typesOf(history));- var failed = eventOfType(history, "TaskFailed");+ HistoryEvent failed = eventOfType(history, "TaskFailed");assertEquals("My.Error", failed.getDetails().get("error"));assertFalse(failed.getDetails().containsKey("cause"));}@Testvoid jsonataArgumentsAppearResolvedInTaskScheduledParameters() throws Exception {- var mocks = testCase(Map.of("Send", List.of(+ MockedTestCase mocks = testCase(Map.of("Send", List.of(returnStep(0, 0, "{\"ok\":true}"))));- var history = new ArrayList<HistoryEvent>();+ ArrayList<HistoryEvent> history = new ArrayList<>();run("""{"QueryLanguage": "JSONata",@@ -250,29 +251,29 @@ class AslExecutorTaskHistoryEventsTest {}""", "{\"msg\":\"hi\"}", mocks, history);- var scheduled = eventOfType(history, "TaskScheduled");- var parameters = objectMapper.readTree((String) scheduled.getDetails().get("parameters"));+ HistoryEvent scheduled = eventOfType(history, "TaskScheduled");+ JsonNode parameters = objectMapper.readTree((String) scheduled.getDetails().get("parameters"));assertEquals("hi", parameters.path("msg").asText());}@Testvoid directLambdaArnEmitsLambdaFunctionEvents() throws Exception {- var functionName = "echo-lambda";- var functionArn = "arn:aws:lambda:%s:%s:function:%s".formatted(REGION, ACCOUNT, functionName);- var function = new LambdaFunction();+ String functionName = "echo-lambda";+ String functionArn = "arn:aws:lambda:%s:%s:function:%s".formatted(REGION, ACCOUNT, functionName);+ LambdaFunction function = new LambdaFunction();function.setFunctionName(functionName);function.setFunctionArn(functionArn);when(functionStore.get(REGION, functionName)).thenReturn(Optional.of(function));when(lambdaExecutor.invoke(eq(function), any(byte[].class), eq(InvocationType.RequestResponse))).thenAnswer(invocation -> {- var event = objectMapper.readTree((byte[]) invocation.getArgument(1));- var output = objectMapper.writeValueAsBytes(event);+ JsonNode event = objectMapper.readTree((byte[]) invocation.getArgument(1));+ byte[] output = objectMapper.writeValueAsBytes(event);return new InvokeResult(200, null, output, null, "echo-request");});- var history = new ArrayList<HistoryEvent>();- var execution = run("""+ ArrayList<HistoryEvent> history = new ArrayList<>();+ Execution execution = run("""{"StartAt": "Call","States": {@@ -292,25 +293,25 @@ class AslExecutorTaskHistoryEventsTest {typesOf(history));assertChain(history);- var scheduled = eventOfType(history, "LambdaFunctionScheduled");+ HistoryEvent scheduled = eventOfType(history, "LambdaFunctionScheduled");assertEquals(functionArn, scheduled.getDetails().get("resource"));assertFalse(scheduled.getDetails().containsKey("resourceType"));- var input = objectMapper.readTree((String) scheduled.getDetails().get("input"));+ JsonNode input = objectMapper.readTree((String) scheduled.getDetails().get("input"));assertEquals("hello", input.path("msg").asText());- var started = eventOfType(history, "LambdaFunctionStarted");+ HistoryEvent started = eventOfType(history, "LambdaFunctionStarted");assertNull(started.getDetails());}@Testvoid directLambdaFailurePreservesFunctionErrorInHistory() {- var functionName = "failing-lambda";- var functionArn = lambdaArn(functionName);- var errorPayload = "{\"errorType\":\"ValidationError\",\"errorMessage\":\"invalid input\"}";+ String functionName = "failing-lambda";+ String functionArn = lambdaArn(functionName);+ String errorPayload = "{\"errorType\":\"ValidationError\",\"errorMessage\":\"invalid input\"}";stubLambdaFailure(functionName, functionArn, errorPayload.getBytes(StandardCharsets.UTF_8));- var history = new ArrayList<HistoryEvent>();- var execution = run("""+ ArrayList<HistoryEvent> history = new ArrayList<>();+ Execution execution = run("""{"StartAt": "Call","States": {@@ -330,7 +331,7 @@ class AslExecutorTaskHistoryEventsTest {List.of("TaskStateEntered", "LambdaFunctionScheduled", "LambdaFunctionStarted","LambdaFunctionFailed", "ExecutionFailed"),typesOf(history));- var failed = eventOfType(history, "LambdaFunctionFailed");+ HistoryEvent failed = eventOfType(history, "LambdaFunctionFailed");assertEquals("ValidationError", failed.getDetails().get("error"));assertEquals(errorPayload, failed.getDetails().get("cause"));assertChain(history);@@ -338,13 +339,13 @@ class AslExecutorTaskHistoryEventsTest {@Testvoid optimizedLambdaFailurePreservesFunctionErrorInHistory() {- var functionName = "failing-lambda";- var functionArn = lambdaArn(functionName);- var errorPayload = "{\"errorType\":\"ValidationError\",\"errorMessage\":\"invalid input\"}";+ String functionName = "failing-lambda";+ String functionArn = lambdaArn(functionName);+ String errorPayload = "{\"errorType\":\"ValidationError\",\"errorMessage\":\"invalid input\"}";stubLambdaFailure(functionName, functionArn, errorPayload.getBytes(StandardCharsets.UTF_8));- var history = new ArrayList<HistoryEvent>();- var execution = run("""+ ArrayList<HistoryEvent> history = new ArrayList<>();+ Execution execution = run("""{"StartAt": "Call","States": {@@ -367,7 +368,7 @@ class AslExecutorTaskHistoryEventsTest {assertEquals(List.of("TaskStateEntered", "TaskScheduled", "TaskStarted", "TaskFailed", "ExecutionFailed"),typesOf(history));- var failed = eventOfType(history, "TaskFailed");+ HistoryEvent failed = eventOfType(history, "TaskFailed");assertEquals("lambda", failed.getDetails().get("resourceType"));assertEquals("invoke", failed.getDetails().get("resource"));assertEquals("ValidationError", failed.getDetails().get("error"));@@ -377,12 +378,12 @@ class AslExecutorTaskHistoryEventsTest {@Testvoid malformedLambdaErrorPayloadFallsBackToException() {- var functionName = "failing-lambda";- var functionArn = lambdaArn(functionName);- var errorPayload = "not-json";+ String functionName = "failing-lambda";+ String functionArn = lambdaArn(functionName);+ String errorPayload = "not-json";stubLambdaFailure(functionName, functionArn, errorPayload.getBytes(StandardCharsets.UTF_8));- var execution = run(directLambdaDefinition(functionArn), "{}", null, new ArrayList<>());+ Execution execution = run(directLambdaDefinition(functionArn), "{}", null, new ArrayList<>());assertEquals("FAILED", execution.getStatus());assertEquals("Exception", execution.getError());@@ -391,11 +392,11 @@ class AslExecutorTaskHistoryEventsTest {@Testvoid missingLambdaErrorPayloadFallsBackToException() {- var functionName = "failing-lambda";- var functionArn = lambdaArn(functionName);+ String functionName = "failing-lambda";+ String functionArn = lambdaArn(functionName);stubLambdaFailure(functionName, functionArn, null);- var execution = run(directLambdaDefinition(functionArn), "{}", null, new ArrayList<>());+ Execution execution = run(directLambdaDefinition(functionArn), "{}", null, new ArrayList<>());assertEquals("FAILED", execution.getStatus());assertEquals("Exception", execution.getError());@@ -409,8 +410,8 @@ class AslExecutorTaskHistoryEventsTest {*/@Testvoid parallelAndMapPublishAnUnbrokenEventChain() throws Exception {- var history = new ArrayList<HistoryEvent>();- var execution = run("""+ ArrayList<HistoryEvent> history = new ArrayList<>();+ Execution execution = run("""{"StartAt": "Fan","States": {@@ -453,7 +454,7 @@ class AslExecutorTaskHistoryEventsTest {List.of(0L, 1L, 2L, 3L, 4L, 5L, 6L, 6L,8L, 9L, 10L, 11L, 12L, 13L, 10L, 15L, 16L, 17L, 18L, 18L, 20L),history.stream().map(HistoryEvent::getPreviousEventId).toList());- for (var i = 0; i < history.size(); i++) {+ for (int i = 0; i < history.size(); i++) {assertEquals(i + 1L, history.get(i).getId(), "unexpected id at index " + i);}}@@ -471,8 +472,8 @@ class AslExecutorTaskHistoryEventsTest {}private static void assertChain(List<HistoryEvent> history) {- for (var i = 0; i < history.size(); i++) {- var event = history.get(i);+ for (int i = 0; i < history.size(); i++) {+ HistoryEvent event = history.get(i);assertEquals(i + 1L, event.getId(), "unexpected id at index " + i);assertEquals((long) i, event.getPreviousEventId(), "unexpected previousEventId at index " + i);}@@ -491,7 +492,7 @@ class AslExecutorTaskHistoryEventsTest {}private void stubLambdaFailure(String functionName, String functionArn, byte[] errorPayload) {- var function = new LambdaFunction();+ LambdaFunction function = new LambdaFunction();function.setFunctionName(functionName);function.setFunctionArn(functionArn);when(functionStore.get(REGION, functionName)).thenReturn(Optional.of(function));@@ -515,13 +516,13 @@ class AslExecutorTaskHistoryEventsTest {}private Execution run(String definition, String input, MockedTestCase mocks, List<HistoryEvent> history) {- var stateMachine = new StateMachine();+ StateMachine stateMachine = new StateMachine();stateMachine.setName("history-events-test");stateMachine.setStateMachineArn("arn:aws:states:%s:%s:stateMachine:history-events-test".formatted(REGION, ACCOUNT));stateMachine.setRoleArn("arn:aws:iam::%s:role/test-role".formatted(ACCOUNT));stateMachine.setDefinition(definition);- var execution = new Execution();+ Execution execution = new Execution();execution.setName("history-events-execution");execution.setExecutionArn("arn:aws:states:%s:%s:execution:history-events-test:history-events-execution".formatted(REGION, ACCOUNT));diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorUnresolvableJsonPathTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorUnresolvableJsonPathTest.javaindex d5ec2a5890..186d237178 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorUnresolvableJsonPathTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorUnresolvableJsonPathTest.java@@ -28,7 +28,7 @@ class AslExecutorUnresolvableJsonPathTest {@Testvoid unresolvableNestedPathFailsWithTheCauseAwsWrites() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"missing.$\":\"$.nope.deep\"}", "{\"other\":1}"));assertEquals("States.Runtime", failure.error);@@ -38,7 +38,7 @@ class AslExecutorUnresolvableJsonPathTest {@Testvoid unresolvableTopLevelPathFails() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"missing.$\":\"$.nope\"}", "{\"other\":1}"));assertEquals("The JSONPath '$.nope' specified for the field 'missing.$' could not be "@@ -48,7 +48,7 @@ class AslExecutorUnresolvableJsonPathTest {/** A field that resolves fine must be unaffected. */@Testvoid resolvablePathStillSucceeds() throws Exception {- var resolved = resolve("{\"picked.$\":\"$.other\"}", "{\"other\":1}");+ JsonNode resolved = resolve("{\"picked.$\":\"$.other\"}", "{\"other\":1}");assertEquals(1, resolved.path("picked").asInt());}@@ -60,7 +60,7 @@ class AslExecutorUnresolvableJsonPathTest {*/@Testvoid outOfRangeArrayIndexStillResolvesToNull() throws Exception {- var resolved = resolve("{\"idx.$\":\"$.items[5]\"}", "{\"items\":[1,2]}");+ JsonNode resolved = resolve("{\"idx.$\":\"$.items[5]\"}", "{\"items\":[1,2]}");assertEquals("null", resolved.path("idx").toString());}@@ -71,7 +71,7 @@ class AslExecutorUnresolvableJsonPathTest {*/@Testvoid indexBeyondIntRangeStillResolvesToNull() throws Exception {- var resolved = resolve("{\"idx.$\":\"$.items[99999999999999999999]\"}", "{\"items\":[1,2]}");+ JsonNode resolved = resolve("{\"idx.$\":\"$.items[99999999999999999999]\"}", "{\"items\":[1,2]}");assertEquals("null", resolved.path("idx").toString());}@@ -79,7 +79,7 @@ class AslExecutorUnresolvableJsonPathTest {/** An explicit null value is present, not missing, so it must not fail. */@Testvoid explicitNullValueStillSucceeds() throws Exception {- var resolved = resolve("{\"v.$\":\"$.nul\"}", "{\"nul\":null}");+ JsonNode resolved = resolve("{\"v.$\":\"$.nul\"}", "{\"nul\":null}");assertEquals("null", resolved.path("v").toString());}@@ -87,7 +87,7 @@ class AslExecutorUnresolvableJsonPathTest {/** A miss at any nesting depth inside the template fails, not only at the top level. */@Testvoid unresolvablePathFailsAtAnyNestingDepth() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"outer\":{\"missing.$\":\"$.a.b.c\"}}", "{\"a\":{\"x\":1}}"));assertEquals("The JSONPath '$.a.b.c' specified for the field 'missing.$' could not be "@@ -97,7 +97,7 @@ class AslExecutorUnresolvableJsonPathTest {/** ResultSelector and ItemSelector run through the same resolver, so they fail the same way. */@Testvoid resultSelectorFailsOnAnUnresolvablePath() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"missing.$\":\"$.nope\"}", "[{\"other\":1}]"));assertEquals("The JSONPath '$.nope' specified for the field 'missing.$' could not be "@@ -107,7 +107,7 @@ class AslExecutorUnresolvableJsonPathTest {/** Indexing through a value that is not an array or object fails, matching AWS. */@Testvoid navigatingThroughANonContainerValueFails() throws Exception {- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> resolve("{\"v.$\":\"$.other.x\"}", "{\"other\":1}"));assertEquals("States.Runtime", failure.error);@@ -118,7 +118,7 @@ class AslExecutorUnresolvableJsonPathTest {/** A wildcard projection matching nothing is an empty array, not a failure. */@Testvoid wildcardMatchingNothingStaysAnEmptyArray() throws Exception {- var resolved = resolve("{\"names.$\":\"$.items[*].name\"}", "{\"items\":[1,2]}");+ JsonNode resolved = resolve("{\"names.$\":\"$.items[*].name\"}", "{\"items\":[1,2]}");assertEquals(0, resolved.path("names").size());}@@ -129,10 +129,10 @@ class AslExecutorUnresolvableJsonPathTest {*/@Testvoid unresolvableContextReferenceFailsAndNamesTheContextObject() throws Exception {- var context = mapper.readTree("{\"State\":{\"Name\":\"P\"}}");- var template = mapper.readTree("{\"missing.$\":\"$$.Nope.Deep\"}");+ JsonNode context = mapper.readTree("{\"State\":{\"Name\":\"P\"}}");+ JsonNode template = mapper.readTree("{\"missing.$\":\"$$.Nope.Deep\"}");- var failure = assertThrows(AslExecutor.FailStateException.class,+ AslExecutor.FailStateException failure = assertThrows(AslExecutor.FailStateException.class,() -> newExecutor().resolveParameters(template, mapper.readTree("{\"other\":1}"), context));assertEquals("States.Runtime", failure.error);@@ -143,10 +143,10 @@ class AslExecutorUnresolvableJsonPathTest {/** A resolvable Context Object reference is unaffected. */@Testvoid resolvableContextReferenceStillSucceeds() throws Exception {- var context = mapper.readTree("{\"Execution\":{\"Name\":\"exec1\"}}");- var template = mapper.readTree("{\"name.$\":\"$$.Execution.Name\"}");+ JsonNode context = mapper.readTree("{\"Execution\":{\"Name\":\"exec1\"}}");+ JsonNode template = mapper.readTree("{\"name.$\":\"$$.Execution.Name\"}");- var resolved = newExecutor().resolveParameters(template, mapper.readTree("{}"), context);+ JsonNode resolved = newExecutor().resolveParameters(template, mapper.readTree("{}"), context);assertEquals("exec1", resolved.path("name").asText());}diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/HistoryChainTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/HistoryChainTest.javaindex 58c10741a5..405e9d1f6e 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/HistoryChainTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/HistoryChainTest.java@@ -23,11 +23,11 @@ class HistoryChainTest {@Testvoid publishingAfterTheExecutionEndedRecordsNothingAndDoesNotCountTowardsTheLimit() {List<HistoryEvent> history = new ArrayList<>();- var chain = HistoryChain.of(history);+ HistoryChain chain = HistoryChain.of(history);chain.end("ExecutionSucceeded", Map.of());assertDoesNotThrow(() -> {- for (var i = 0; i < MAX_HISTORY_EVENTS; i++) {+ for (int i = 0; i < MAX_HISTORY_EVENTS; i++) {assertEquals(0L, chain.publish("PassStateEntered", null));chain.publishAside("PassStateSucceeded", null);}@@ -37,13 +37,13 @@ class HistoryChainTest {@Testvoid publishingIntoAHistorySealedByStopExecutionStopsCountingAsWell() {- var history = new StepFunctionsService.ExecutionHistory();- var chain = HistoryChain.of(history);- var branch = chain.fork();+ StepFunctionsService.ExecutionHistory history = new StepFunctionsService.ExecutionHistory();+ HistoryChain chain = HistoryChain.of(history);+ HistoryChain branch = chain.fork();history.sealWith("ExecutionAborted", Map.of());assertDoesNotThrow(() -> {- for (var i = 0; i < MAX_HISTORY_EVENTS; i++) {+ for (int i = 0; i < MAX_HISTORY_EVENTS; i++) {assertEquals(0L, chain.publish("PassStateEntered", null));assertEquals(0L, branch.publish("PassStateEntered", null));}diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/JsonataEdgeCaseTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/JsonataEdgeCaseTest.javaindex e3b44fcfff..27d9497083 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/JsonataEdgeCaseTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/JsonataEdgeCaseTest.java@@ -1,5 +1,7 @@package io.github.hectorvent.floci.services.stepfunctions;+import com.dashjoin.jsonata.Jsonata;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import org.junit.jupiter.api.Test;@@ -23,10 +25,10 @@ class JsonataEdgeCaseTest {// ---------------------------------------------------------------@Testvoid objectConstructor_returnsMap() throws Exception {- var input = Map.of("input", Map.of("name", "Alice", "age", 30));+ Map<String, Map<String, Object>> input = Map.of("input", Map.of("name", "Alice", "age", 30));- var expr = jsonata("{\"name\": $states.input.name, \"age\": $states.input.age}");- var frame = expr.createFrame();+ Jsonata expr = jsonata("{\"name\": $states.input.name, \"age\": $states.input.age}");+ Jsonata.Frame frame = expr.createFrame();frame.bind("states", input);Object result = expr.evaluate(null, frame);@@ -46,10 +48,10 @@ class JsonataEdgeCaseTest {// ---------------------------------------------------------------@Testvoid missingField_returnsNullNotThrows() throws Exception {- var input = Map.of("input", Map.of("name", "Alice"));+ Map<String, Map<String, String>> input = Map.of("input", Map.of("name", "Alice"));- var expr = jsonata("$states.input.nonexistent");- var frame = expr.createFrame();+ Jsonata expr = jsonata("$states.input.nonexistent");+ Jsonata.Frame frame = expr.createFrame();frame.bind("states", input);Object result = expr.evaluate(null, frame);@@ -60,8 +62,8 @@ class JsonataEdgeCaseTest {@Testvoid missingVariable_returnsNull() throws Exception {// No binding at all for $states- var expr = jsonata("$states.input.name");- var frame = expr.createFrame();+ Jsonata expr = jsonata("$states.input.name");+ Jsonata.Frame frame = expr.createFrame();Object result = expr.evaluate(null, frame);@@ -86,24 +88,24 @@ class JsonataEdgeCaseTest {));// Deep path access- var expr1 = jsonata("$states.input.user.address.city");- var frame1 = expr1.createFrame();+ Jsonata expr1 = jsonata("$states.input.user.address.city");+ Jsonata.Frame frame1 = expr1.createFrame();frame1.bind("states", nested);Object city = expr1.evaluate(null, frame1);assertEquals("Springfield", city);// Access into an array element- var expr2 = jsonata("$states.input.user.tags[0]");- var frame2 = expr2.createFrame();+ Jsonata expr2 = jsonata("$states.input.user.tags[0]");+ Jsonata.Frame frame2 = expr2.createFrame();frame2.bind("states", nested);Object firstTag = expr2.evaluate(null, frame2);assertEquals("admin", firstTag);// Construct an object from deep paths- var expr3 = jsonata("{\"city\": $states.input.user.address.city, \"firstTag\": $states.input.user.tags[0]}");- var frame3 = expr3.createFrame();+ Jsonata expr3 = jsonata("{\"city\": $states.input.user.address.city, \"firstTag\": $states.input.user.tags[0]}");+ Jsonata.Frame frame3 = expr3.createFrame();frame3.bind("states", nested);Object combined = expr3.evaluate(null, frame3);@@ -119,15 +121,15 @@ class JsonataEdgeCaseTest {// ---------------------------------------------------------------@Testvoid convertValue_jacksonToMapRoundTrip() throws Exception {- var jsonNode = mapper.readTree("""+ JsonNode jsonNode = mapper.readTree("""{"input": {"name": "Bob", "scores": [10, 20, 30]}}""");@SuppressWarnings("unchecked")Map<String, Object> asMap = mapper.convertValue(jsonNode, Map.class);- var expr = jsonata("$sum($states.input.scores)");- var frame = expr.createFrame();+ Jsonata expr = jsonata("$sum($states.input.scores)");+ Jsonata.Frame frame = expr.createFrame();frame.bind("states", asMap);Object result = expr.evaluate(null, frame);@@ -145,13 +147,13 @@ class JsonataEdgeCaseTest {//// $states.result.Items where Items = [{...}] — $states.result is a plain object,// so .Items should return the List as-is, NOT the single element.- var input = Map.of("result", Map.of(+ Map<String, Map<String, Object>> input = Map.of("result", Map.of("Items", List.of(Map.of("id", "item1", "name", "Widget One")),"Count", 1));- var expr = jsonata("$states.result.Items");- var frame = expr.createFrame();+ Jsonata expr = jsonata("$states.result.Items");+ Jsonata.Frame frame = expr.createFrame();frame.bind("states", input);Object result = expr.evaluate(null, frame);@@ -163,15 +165,15 @@ class JsonataEdgeCaseTest {@Testvoid multiElementArray_propertyAccess_returnsList() throws Exception {- var input = Map.of("result", Map.of(+ Map<String, Map<String, List<Map<String, String>>>> input = Map.of("result", Map.of("Items", List.of(Map.of("id", "item1"),Map.of("id", "item2"))));- var expr = jsonata("$states.result.Items");- var frame = expr.createFrame();+ Jsonata expr = jsonata("$states.result.Items");+ Jsonata.Frame frame = expr.createFrame();frame.bind("states", input);Object result = expr.evaluate(null, frame);@@ -191,12 +193,12 @@ class JsonataEdgeCaseTest {// This is correct JSONata behavior (and what AWS does too).// To force an array, callers should use [$states.result.Items.{"id": id}]// or $toArray(...) if available.- var input = Map.of("result", Map.of(+ Map<String, Map<String, List<Map<String, String>>>> input = Map.of("result", Map.of("Items", List.of(Map.of("id", "item1", "name", "Widget One"))));- var expr = jsonata("$states.result.Items.{\"id\": id, \"name\": name}");- var frame = expr.createFrame();+ Jsonata expr = jsonata("$states.result.Items.{\"id\": id, \"name\": name}");+ Jsonata.Frame frame = expr.createFrame();frame.bind("states", input);Object result = expr.evaluate(null, frame);@@ -214,12 +216,12 @@ class JsonataEdgeCaseTest {void objectMapping_singleElement_wrappedInArray_forcesArray() throws Exception {// Workaround: wrap the mapping expression in [] to force array output.// [$states.result.Items.{"id": id}] — even for 1-element sequences, result is an array.- var input = Map.of("result", Map.of(+ Map<String, Map<String, List<Map<String, String>>>> input = Map.of("result", Map.of("Items", List.of(Map.of("id", "item1", "name", "Widget One"))));- var expr = jsonata("[$states.result.Items.{\"id\": id, \"name\": name}]");- var frame = expr.createFrame();+ Jsonata expr = jsonata("[$states.result.Items.{\"id\": id, \"name\": name}]");+ Jsonata.Frame frame = expr.createFrame();frame.bind("states", input);Object result = expr.evaluate(null, frame);diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/SfnMockLoaderTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/SfnMockLoaderTest.javaindex 99842f69e2..84b804dce7 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/SfnMockLoaderTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/SfnMockLoaderTest.java@@ -2,12 +2,15 @@ package io.github.hectorvent.floci.services.stepfunctions;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.services.stepfunctions.model.MockedResponseStep;+import io.github.hectorvent.floci.services.stepfunctions.model.MockedTestCase;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;import java.io.IOException;import java.nio.file.Files;import java.nio.file.Path;+import java.util.List;import java.util.Optional;import static org.junit.jupiter.api.Assertions.assertEquals;@@ -40,27 +43,27 @@ class SfnMockLoaderTest {Path tempDir;private SfnMockLoader loader(String content) throws IOException {- var file = tempDir.resolve("mock-config.json");+ Path file = tempDir.resolve("mock-config.json");Files.writeString(file, content);return new SfnMockLoader(Optional.of(file.toString()), new ObjectMapper());}@Testvoid parsesReturnAndThrowStepsWithAttemptRanges() throws IOException {- var testCase = loader(CONFIG).requireTestCase("Test", "Case");+ MockedTestCase testCase = loader(CONFIG).requireTestCase("Test", "Case");assertEquals("Case", testCase.testCaseName());- var steps = testCase.stateResponses().get("Call API");+ List<MockedResponseStep> steps = testCase.stateResponses().get("Call API");assertEquals(2, steps.size());- var throwStep = steps.get(0);+ MockedResponseStep throwStep = steps.get(0);assertTrue(throwStep.isThrow());assertTrue(throwStep.covers(0));assertFalse(throwStep.covers(1));assertEquals("ApiGateway.422", throwStep.errorName());assertEquals("Unprocessable", throwStep.errorCause());- var returnStep = steps.get(1);+ MockedResponseStep returnStep = steps.get(1);assertFalse(returnStep.isThrow());assertTrue(returnStep.covers(1));assertTrue(returnStep.covers(2));@@ -71,21 +74,21 @@ class SfnMockLoaderTest {@Testvoid rejectsUnknownStateMachine() throws IOException {- var loader = loader(CONFIG);- var e = assertThrows(AwsException.class, () -> loader.requireTestCase("Other", "Case"));+ SfnMockLoader loader = loader(CONFIG);+ AwsException e = assertThrows(AwsException.class, () -> loader.requireTestCase("Other", "Case"));assertTrue(e.getMessage().contains("Other"));}@Testvoid rejectsUnknownTestCase() throws IOException {- var loader = loader(CONFIG);- var e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Missing"));+ SfnMockLoader loader = loader(CONFIG);+ AwsException e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Missing"));assertTrue(e.getMessage().contains("Missing"));}@Testvoid rejectsMissingMockedResponsesEntry() throws IOException {- var loader = loader("""+ SfnMockLoader loader = loader("""{"StateMachines": {"Test": { "TestCases": { "Case": { "Call API": "Nope" } } }@@ -93,13 +96,13 @@ class SfnMockLoaderTest {"MockedResponses": {}}""");- var e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Case"));+ AwsException e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Case"));assertTrue(e.getMessage().contains("Nope"));}@Testvoid rejectsInvalidAttemptKey() throws IOException {- var loader = loader("""+ SfnMockLoader loader = loader("""{"StateMachines": {"Test": { "TestCases": { "Case": { "Call API": "Bad" } } }@@ -109,13 +112,13 @@ class SfnMockLoaderTest {}}""");- var e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Case"));+ AwsException e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Case"));assertTrue(e.getMessage().contains("first"));}@Testvoid rejectsStepWithBothReturnAndThrow() throws IOException {- var loader = loader("""+ SfnMockLoader loader = loader("""{"StateMachines": {"Test": { "TestCases": { "Case": { "Call API": "Both" } } }@@ -125,13 +128,13 @@ class SfnMockLoaderTest {}}""");- var e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Case"));+ AwsException e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Case"));assertTrue(e.getMessage().contains("exactly one of Return or Throw"));}@Testvoid rejectsThrowWithoutError() throws IOException {- var loader = loader("""+ SfnMockLoader loader = loader("""{"StateMachines": {"Test": { "TestCases": { "Case": { "Call API": "NoError" } } }@@ -141,13 +144,13 @@ class SfnMockLoaderTest {}}""");- var e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Case"));+ AwsException e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Case"));assertTrue(e.getMessage().contains("Error"));}@Testvoid acceptsMockedResponseWithNoAttemptEntries() throws IOException {- var testCase = loader("""+ MockedTestCase testCase = loader("""{"StateMachines": {"Test": { "TestCases": { "Case": { "Skipped": "Empty", "Call API": "Ok" } } }@@ -165,29 +168,29 @@ class SfnMockLoaderTest {@Testvoid reportsMissingFile() {- var loader = new SfnMockLoader(+ SfnMockLoader loader = new SfnMockLoader(Optional.of(tempDir.resolve("absent.json").toString()), new ObjectMapper());- var e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Case"));+ AwsException e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Case"));assertTrue(e.getMessage().contains("not found"));}@Testvoid reportsUnconfiguredLoader() {- var loader = new SfnMockLoader(Optional.empty(), new ObjectMapper());- var e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Case"));+ SfnMockLoader loader = new SfnMockLoader(Optional.empty(), new ObjectMapper());+ AwsException e = assertThrows(AwsException.class, () -> loader.requireTestCase("Test", "Case"));assertTrue(e.getMessage().contains("SFN_MOCK_CONFIG"));}@Testvoid reloadsFileWhenModified() throws IOException, InterruptedException {- var file = tempDir.resolve("mock-config.json");+ Path file = tempDir.resolve("mock-config.json");Files.writeString(file, CONFIG);- var loader = new SfnMockLoader(Optional.of(file.toString()), new ObjectMapper());+ SfnMockLoader loader = new SfnMockLoader(Optional.of(file.toString()), new ObjectMapper());assertEquals(2, loader.requireTestCase("Test", "Case").stateResponses().get("Call API").size());Thread.sleep(1100);Files.writeString(file, CONFIG.replace("\"1-2\"", "\"1\""));- var steps = loader.requireTestCase("Test", "Case").stateResponses().get("Call API");+ List<MockedResponseStep> steps = loader.requireTestCase("Test", "Case").stateResponses().get("Call API");assertEquals(1, steps.get(1).toAttempt());}}diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsDescribeMapRunIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsDescribeMapRunIntegrationTest.javaindex 105743be83..dbaed32b22 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsDescribeMapRunIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsDescribeMapRunIntegrationTest.java@@ -48,11 +48,11 @@ class StepFunctionsDescribeMapRunIntegrationTest {@Order(0)void setup_runsADistributedMapOverThreeItems() throws Exception {createBucket("describe-map-run");- var smArn = createStateMachine("describe-map-run-three", distributedMap(+ String smArn = createStateMachine("describe-map-run-three", distributedMap("[{\"n\": 1}, {\"n\": 2}, {\"n\": 3}]", "describe-map-run", null));threeItemExecutionArn = startExecution(smArn, "{}");- var describe = waitForTerminalState(threeItemExecutionArn);+ Response describe = waitForTerminalState(threeItemExecutionArn);assertEquals("SUCCEEDED", describe.jsonPath().getString("status"),"cause: " + describe.jsonPath().getString("cause"));threeItemMapRunArn = mapper.readTree(describe.jsonPath().getString("output"))@@ -66,7 +66,7 @@ class StepFunctionsDescribeMapRunIntegrationTest {@Test@Order(1)void describeMapRunReportsTheRunItsParentExecutionAndItsWindow() {- var response = describeMapRun(threeItemMapRunArn);+ Response response = describeMapRun(threeItemMapRunArn);response.then().statusCode(200);assertEquals(threeItemMapRunArn, response.jsonPath().getString("mapRunArn"));@@ -86,14 +86,14 @@ class StepFunctionsDescribeMapRunIntegrationTest {@Test@Order(2)void describeMapRunReportsAnUnboundedMapAsIntegerMaxValue() {- var response = describeMapRun(threeItemMapRunArn);+ Response response = describeMapRun(threeItemMapRunArn);assertEquals(UNBOUNDED_CONCURRENCY, response.jsonPath().getInt("maxConcurrency"));}@Test@Order(3)void describeMapRunReportsZeroToleratedFailuresAndNoRedrive() {- var response = describeMapRun(threeItemMapRunArn);+ Response response = describeMapRun(threeItemMapRunArn);assertEquals(0.0, response.jsonPath().getDouble("toleratedFailurePercentage"));assertEquals(0, response.jsonPath().getInt("toleratedFailureCount"));assertEquals(0, response.jsonPath().getInt("redriveCount"));@@ -104,14 +104,14 @@ class StepFunctionsDescribeMapRunIntegrationTest {@Test@Order(4)void describeMapRunCountsEveryItemAsSucceededAndWritten() {- var response = describeMapRun(threeItemMapRunArn);+ Response response = describeMapRun(threeItemMapRunArn);assertCounters(response, "itemCounts", 3);}@Test@Order(5)void describeMapRunReportsOneChildExecutionPerItem() {- var response = describeMapRun(threeItemMapRunArn);+ Response response = describeMapRun(threeItemMapRunArn);assertCounters(response, "executionCounts", 3);}@@ -119,17 +119,17 @@ class StepFunctionsDescribeMapRunIntegrationTest {@Order(6)void describeMapRunCountsTheItemsOfThatRunRatherThanAFixedNumber() throws Exception {createBucket("describe-map-run-five");- var smArn = createStateMachine("describe-map-run-five", distributedMap(+ String smArn = createStateMachine("describe-map-run-five", distributedMap("[{\"n\": 1}, {\"n\": 2}, {\"n\": 3}, {\"n\": 4}, {\"n\": 5}]","describe-map-run-five", 2));- var describe = waitForTerminalState(startExecution(smArn, "{}"));+ Response describe = waitForTerminalState(startExecution(smArn, "{}"));assertEquals("SUCCEEDED", describe.jsonPath().getString("status"),"cause: " + describe.jsonPath().getString("cause"));- var mapRunArn = mapper.readTree(describe.jsonPath().getString("output"))+ String mapRunArn = mapper.readTree(describe.jsonPath().getString("output")).path("MapRunArn").asText();- var response = describeMapRun(mapRunArn);+ Response response = describeMapRun(mapRunArn);response.then().statusCode(200);assertCounters(response, "itemCounts", 5);assertCounters(response, "executionCounts", 5);@@ -140,9 +140,9 @@ class StepFunctionsDescribeMapRunIntegrationTest {@Test@Order(7)void describeMapRunOnAnUnknownArnReturnsResourceNotFound() {- var unknown = "arn:aws:states:us-east-1:000000000000:mapRun:describe-map-run-three/"+ String unknown = "arn:aws:states:us-east-1:000000000000:mapRun:describe-map-run-three/"+ "00000000-0000-0000-0000-000000000000:11111111-1111-1111-1111-111111111111";- var response = describeMapRun(unknown);+ Response response = describeMapRun(unknown);response.then().statusCode(400);assertEquals("ResourceNotFound", response.jsonPath().getString("__type"));@@ -155,7 +155,7 @@ class StepFunctionsDescribeMapRunIntegrationTest {@Test@Order(8)void describeMapRunTaskReturnsThePascalCaseResponseWithIsoDates() throws Exception {- var smArn = createStateMachine("describe-map-run-task", """+ String smArn = createStateMachine("describe-map-run-task", """{"QueryLanguage": "JSONata","StartAt": "Describe",@@ -170,10 +170,10 @@ class StepFunctionsDescribeMapRunIntegrationTest {}""".replace("MAP_RUN_ARN", threeItemMapRunArn));- var describe = waitForTerminalState(startExecution(smArn, "{}"));+ Response describe = waitForTerminalState(startExecution(smArn, "{}"));assertEquals("SUCCEEDED", describe.jsonPath().getString("status"),"cause: " + describe.jsonPath().getString("cause"));- var result = mapper.readTree(describe.jsonPath().getString("output"));+ JsonNode result = mapper.readTree(describe.jsonPath().getString("output"));assertEquals(threeItemMapRunArn, result.path("MapRunArn").asText());assertEquals(threeItemExecutionArn, result.path("ExecutionArn").asText());@@ -197,9 +197,9 @@ class StepFunctionsDescribeMapRunIntegrationTest {@Test@Order(9)void describeMapRunTaskOnAnUnknownArnFailsWithTheSdkExceptionName() {- var unknown = "arn:aws:states:us-east-1:000000000000:mapRun:describe-map-run-three/"+ String unknown = "arn:aws:states:us-east-1:000000000000:mapRun:describe-map-run-three/"+ "00000000-0000-0000-0000-000000000000:22222222-2222-2222-2222-222222222222";- var smArn = createStateMachine("describe-map-run-task-unknown", """+ String smArn = createStateMachine("describe-map-run-task-unknown", """{"QueryLanguage": "JSONata","StartAt": "Describe",@@ -214,7 +214,7 @@ class StepFunctionsDescribeMapRunIntegrationTest {}""".replace("MAP_RUN_ARN", unknown));- var describe = waitForTerminalState(startExecution(smArn, "{}"));+ Response describe = waitForTerminalState(startExecution(smArn, "{}"));assertEquals("FAILED", describe.jsonPath().getString("status"));assertEquals("Sfn.ResourceNotFoundException", describe.jsonPath().getString("error"));assertEquals("Resource not found: '" + unknown + "'",@@ -243,15 +243,15 @@ class StepFunctionsDescribeMapRunIntegrationTest {@Test@Order(10)void describeMapRunResolvesTheArnOfAMapWithoutResultWriter() throws Exception {- var smArn = createStateMachine("describe-map-run-no-writer", distributedMapWithoutWriter(+ String smArn = createStateMachine("describe-map-run-no-writer", distributedMapWithoutWriter("[1, 2]", "Keep", "{\"Keep\": {\"Type\": \"Pass\", \"End\": true}}"));- var execArn = startExecution(smArn, "{}");- var describe = waitForTerminalState(execArn);+ String execArn = startExecution(smArn, "{}");+ Response describe = waitForTerminalState(execArn);assertEquals("SUCCEEDED", describe.jsonPath().getString("status"),"cause: " + describe.jsonPath().getString("cause"));- var mapRunArn = mapRunArnFromHistory(execArn);- var response = describeMapRun(mapRunArn);+ String mapRunArn = mapRunArnFromHistory(execArn);+ Response response = describeMapRun(mapRunArn);response.then().statusCode(200);assertEquals(mapRunArn, response.jsonPath().getString("mapRunArn"));assertEquals(execArn, response.jsonPath().getString("executionArn"));@@ -263,12 +263,12 @@ class StepFunctionsDescribeMapRunIntegrationTest {@Test@Order(11)void describeMapRunReportsARunWhoseItemFailed() throws Exception {- var smArn = createStateMachine("describe-map-run-failed", distributedMapWithoutWriter(+ String smArn = createStateMachine("describe-map-run-failed", distributedMapWithoutWriter("[1]", "Boom", "{\"Boom\": {\"Type\": \"Fail\", \"Error\": \"Boom\", \"Cause\": \"item failed\"}}"));- var execArn = startExecution(smArn, "{}");+ String execArn = startExecution(smArn, "{}");assertEquals("FAILED", waitForTerminalState(execArn).jsonPath().getString("status"));- var response = describeMapRun(mapRunArnFromHistory(execArn));+ Response response = describeMapRun(mapRunArnFromHistory(execArn));response.then().statusCode(200);assertEquals("FAILED", response.jsonPath().getString("status"));assertEquals(0, response.jsonPath().getInt("itemCounts.succeeded"));@@ -423,7 +423,7 @@ class StepFunctionsDescribeMapRunIntegrationTest {}private static String mapRunArnFromHistory(String execArn) throws Exception {- var history = given()+ Response history = given().header("X-Amz-Target", "AWSStepFunctions.GetExecutionHistory").contentType(SFN_CONTENT_TYPE).body("""@@ -454,7 +454,7 @@ class StepFunctionsDescribeMapRunIntegrationTest {}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("""@@ -466,7 +466,7 @@ class StepFunctionsDescribeMapRunIntegrationTest {}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("""@@ -488,8 +488,8 @@ class StepFunctionsDescribeMapRunIntegrationTest {}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/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsExecutionHistoryIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsExecutionHistoryIntegrationTest.javaindex b461bfde37..6babd5efb3 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsExecutionHistoryIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsExecutionHistoryIntegrationTest.java@@ -154,9 +154,9 @@ class StepFunctionsExecutionHistoryIntegrationTest {@Testvoid getExecutionHistory_emitsTaskScheduledStartedSucceededWithChainedPreviousEventId() throws Exception {- var queueUrl = createQueue("execution-history-sqs-queue");+ String queueUrl = createQueue("execution-history-sqs-queue");try {- var definition = """+ String definition = """{"StartAt": "Send","States": {@@ -173,11 +173,11 @@ class StepFunctionsExecutionHistoryIntegrationTest {}""".formatted(queueUrl);- var stateMachineArn = createStateMachine("execution-history-task-events-test", definition);- var executionArn = startExecution(stateMachineArn);+ String stateMachineArn = createStateMachine("execution-history-task-events-test", definition);+ String executionArn = startExecution(stateMachineArn);waitForExecution(executionArn);- var response = given()+ Response response = given().header("X-Amz-Target", "AWSStepFunctions.GetExecutionHistory").contentType(SFN_CONTENT_TYPE).body(String.format("""@@ -190,40 +190,40 @@ class StepFunctionsExecutionHistoryIntegrationTest {.post("/");response.then().statusCode(200);- var events = MAPPER.readTree(response.body().asString()).path("events");- var types = new ArrayList<String>();+ JsonNode events = MAPPER.readTree(response.body().asString()).path("events");+ ArrayList<String> types = new ArrayList<>();events.forEach(event -> types.add(event.path("type").asText()));assertEquals(List.of("ExecutionStarted", "TaskStateEntered", "TaskScheduled", "TaskStarted","TaskSucceeded", "TaskStateExited", "ExecutionSucceeded"), types);- var expectedPreviousEventIds = List.of(0L, 0L, 2L, 3L, 4L, 5L, 6L);- for (var i = 0; i < events.size(); i++) {- var event = events.get(i);+ List<Long> expectedPreviousEventIds = List.of(0L, 0L, 2L, 3L, 4L, 5L, 6L);+ for (int i = 0; i < events.size(); i++) {+ JsonNode event = events.get(i);assertEquals(i + 1L, event.path("id").asLong());assertEquals(expectedPreviousEventIds.get(i), event.path("previousEventId").asLong());}- var scheduled = events.get(2).path("taskScheduledEventDetails");+ JsonNode scheduled = events.get(2).path("taskScheduledEventDetails");assertFalse(scheduled.has("inputDetails"));assertEquals("sqs", scheduled.path("resourceType").asText());assertEquals("sendMessage", scheduled.path("resource").asText());assertEquals(stateMachineArn.split(":")[3], scheduled.path("region").asText());- var parameters = MAPPER.readTree(scheduled.path("parameters").asText());+ JsonNode parameters = MAPPER.readTree(scheduled.path("parameters").asText());assertEquals(queueUrl, parameters.path("QueueUrl").asText());assertEquals("hello", parameters.path("MessageBody").asText());- var started = events.get(3).path("taskStartedEventDetails");+ JsonNode started = events.get(3).path("taskStartedEventDetails");assertEquals("sqs", started.path("resourceType").asText());assertEquals("sendMessage", started.path("resource").asText());- var succeeded = events.get(4).path("taskSucceededEventDetails");- var succeededOutputDetails = succeeded.path("outputDetails");+ JsonNode succeeded = events.get(4).path("taskSucceededEventDetails");+ JsonNode succeededOutputDetails = succeeded.path("outputDetails");assertTrue(succeededOutputDetails.isObject());assertFalse(succeededOutputDetails.path("truncated").asBoolean(true));assertTrue(succeeded.path("output").asText().contains("MessageId"));- var entered = events.get(1).path("stateEnteredEventDetails");- var enteredInputDetails = entered.path("inputDetails");+ JsonNode entered = events.get(1).path("stateEnteredEventDetails");+ JsonNode enteredInputDetails = entered.path("inputDetails");assertTrue(enteredInputDetails.isObject());assertFalse(enteredInputDetails.path("truncated").asBoolean(true));} finally {@@ -268,8 +268,8 @@ class StepFunctionsExecutionHistoryIntegrationTest {String executionArn = startExecution(stateMachineArn, "{\"items\": [1, 2]}");waitForExecution(executionArn);- var events = MAPPER.readTree(getExecutionHistory(executionArn).body().asString()).path("events");- var types = new ArrayList<String>();+ JsonNode events = MAPPER.readTree(getExecutionHistory(executionArn).body().asString()).path("events");+ ArrayList<String> types = new ArrayList<>();events.forEach(event -> types.add(event.path("type").asText()));assertEquals(List.of("ExecutionStarted", "ParallelStateEntered", "ParallelStateStarted","PassStateEntered", "PassStateExited", "ParallelStateSucceeded", "ParallelStateExited",@@ -277,9 +277,9 @@ class StepFunctionsExecutionHistoryIntegrationTest {"MapIterationStarted", "PassStateEntered", "PassStateExited", "MapIterationSucceeded","MapIterationStarted", "PassStateEntered", "PassStateExited", "MapIterationSucceeded","MapStateSucceeded", "MapStateExited", "ExecutionSucceeded"), types);- var expectedPreviousEventIds = List.of(0L, 0L, 2L, 3L, 4L, 5L, 5L, 7L, 8L, 9L, 10L, 11L, 12L,+ List<Long> expectedPreviousEventIds = List.of(0L, 0L, 2L, 3L, 4L, 5L, 5L, 7L, 8L, 9L, 10L, 11L, 12L,9L, 14L, 15L, 16L, 17L, 17L, 19L);- for (var i = 0; i < events.size(); i++) {+ for (int i = 0; i < events.size(); i++) {assertEquals(i + 1L, events.get(i).path("id").asLong());assertEquals(expectedPreviousEventIds.get(i), events.get(i).path("previousEventId").asLong(),"previousEventId of event " + (i + 1) + " in " + events);@@ -313,17 +313,17 @@ class StepFunctionsExecutionHistoryIntegrationTest {String stateMachineArn = createStateMachine("execution-history-branch-failure-test", definition);String executionArn = startExecution(stateMachineArn, "{\"x\": \"a\"}");- var cause = "An error occurred while executing the state 'Fast' (entered at the event id #4). "+ String cause = "An error occurred while executing the state 'Fast' (entered at the event id #4). "+ "The JSONPath '$.nope' specified for the field 'm.$' could not be found in the input '{\"x\":\"a\"}'";await().atMost(Duration.ofSeconds(5)).pollInterval(Duration.ofMillis(100)).untilAsserted(() -> {- var described = describeExecution(executionArn);+ Response described = describeExecution(executionArn);assertEquals("FAILED", described.jsonPath().getString("status"), described.body().asString());assertEquals("States.Runtime", described.jsonPath().getString("error"));assertEquals(cause, described.jsonPath().getString("cause"));});- var events = MAPPER.readTree(getExecutionHistory(executionArn).body().asString()).path("events");- var types = new ArrayList<String>();+ JsonNode events = MAPPER.readTree(getExecutionHistory(executionArn).body().asString()).path("events");+ ArrayList<String> types = new ArrayList<>();events.forEach(event -> types.add(event.path("type").asText()));assertEquals(List.of("ExecutionStarted", "ParallelStateEntered", "ParallelStateStarted","PassStateEntered", "ExecutionFailed"), types);@@ -362,7 +362,7 @@ class StepFunctionsExecutionHistoryIntegrationTest {}private static String createQueue(String queueName) {- var response = given()+ Response response = given().header("X-Amz-Target", "AmazonSQS.CreateQueue").contentType(SQS_CONTENT_TYPE).body("""diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsExpressStartExecutionIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsExpressStartExecutionIntegrationTest.javaindex 49749cda9f..5a6e771d8b 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsExpressStartExecutionIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsExpressStartExecutionIntegrationTest.java@@ -62,8 +62,8 @@ class StepFunctionsExpressStartExecutionIntegrationTest {}private static String createStateMachine(String name, String type, String definition) {- var typeField = type != null ? "\"type\": \"%s\",".formatted(type) : "";- var resp = given()+ String typeField = type != null ? "\"type\": \"%s\",".formatted(type) : "";+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.CreateStateMachine").contentType(SFN_CONTENT_TYPE).body("""diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsIntrinsicMissingArgumentIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsIntrinsicMissingArgumentIntegrationTest.javaindex 083c1be933..d47952fe48 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsIntrinsicMissingArgumentIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsIntrinsicMissingArgumentIntegrationTest.java@@ -30,12 +30,12 @@ class StepFunctionsIntrinsicMissingArgumentIntegrationTest {@Testvoid unresolvableIntrinsicArgumentFailsTheExecution() throws Exception {- var definition = """+ String definition = """{"StartAt":"Pick","States":{"Pick":{"Type":"Pass","Parameters":{"v.$":"States.Format('{}', $.nope)"},"End":true}}}""";- var describe = run("missing-intrinsic-arg", definition, "{\"other\":1}");+ Response describe = run("missing-intrinsic-arg", definition, "{\"other\":1}");assertEquals("FAILED", describe.jsonPath().getString("status"), describe.body().asString());assertEquals("States.Runtime", describe.jsonPath().getString("error"));@@ -49,14 +49,14 @@ class StepFunctionsIntrinsicMissingArgumentIntegrationTest {/** The cause names the whole expression, not the inner call that took the failing argument. */@Testvoid nestedIntrinsicNamesTheWholeExpression() throws Exception {- var definition = """+ String definition = """{"StartAt":"Pick","States":{"Pick":{"Type":"Pass","Parameters":{"v.$":"States.Format('{}', States.Format('{}', $.nope))"},"End":true}}}""";- var describe = run("nested-intrinsic", definition, "{\"other\":1}");+ Response describe = run("nested-intrinsic", definition, "{\"other\":1}");assertEquals("FAILED", describe.jsonPath().getString("status"), describe.body().asString());assertEquals("An error occurred while executing the state 'Pick' (entered at the event id #2). "@@ -73,12 +73,12 @@ class StepFunctionsIntrinsicMissingArgumentIntegrationTest {*/@Testvoid intrinsicArgumentIndexingPastTheEndOfAnArrayFails() throws Exception {- var definition = """+ String definition = """{"StartAt":"Pick","States":{"Pick":{"Type":"Pass","Parameters":{"v.$":"States.Format('{}', $.items[5])"},"End":true}}}""";- var describe = run("intrinsic-index-out-of-range", definition, "{\"items\":[1,2]}");+ Response describe = run("intrinsic-index-out-of-range", definition, "{\"items\":[1,2]}");assertEquals("FAILED", describe.jsonPath().getString("status"), describe.body().asString());assertEquals("An error occurred while executing the state 'Pick' (entered at the event id #2). "@@ -91,7 +91,7 @@ class StepFunctionsIntrinsicMissingArgumentIntegrationTest {/** States.Runtime is never caught. A Map carries the Catch because AWS refuses it on a Pass. */@Testvoid catchAllDoesNotSwallowTheFailure() throws Exception {- var definition = """+ String definition = """{"StartAt":"M","States":{"M":{"Type":"Map","ItemsPath":"$.items","Parameters":{"v.$":"States.Format('{}', $.nope)"},@@ -100,7 +100,7 @@ class StepFunctionsIntrinsicMissingArgumentIntegrationTest {"Caught":{"Type":"Pass","End":true}}}""";- var describe = run("intrinsic-catch-all", definition, "{\"items\":[1,2]}");+ Response describe = run("intrinsic-catch-all", definition, "{\"items\":[1,2]}");assertEquals("FAILED", describe.jsonPath().getString("status"), describe.body().asString());assertEquals("States.Runtime", describe.jsonPath().getString("error"));@@ -114,23 +114,23 @@ class StepFunctionsIntrinsicMissingArgumentIntegrationTest {/** Only absence fails. A present but explicitly null argument still formats as null. */@Testvoid explicitNullArgumentStillSucceeds() throws Exception {- var definition = """+ String definition = """{"StartAt":"Pick","States":{"Pick":{"Type":"Pass","Parameters":{"v.$":"States.Format('{}', $.nul)"},"End":true}}}""";- var describe = run("explicit-null-arg", definition, "{\"nul\":null}");+ Response describe = run("explicit-null-arg", definition, "{\"nul\":null}");assertEquals("SUCCEEDED", describe.jsonPath().getString("status"), describe.body().asString());assertEquals("{\"v\":\"null\"}", describe.jsonPath().getString("output"));}private Response run(String label, String definition, String input) throws InterruptedException {- var smArn = create(label + "-" + System.currentTimeMillis(), definition);- var execArn = start(smArn, input);- for (var i = 0; i < 50; i++) {- var resp = describe(execArn);- var status = resp.jsonPath().getString("status");+ String smArn = create(label + "-" + System.currentTimeMillis(), definition);+ String execArn = start(smArn, input);+ for (int i = 0; i < 50; i++) {+ Response resp = describe(execArn);+ String status = resp.jsonPath().getString("status");if (!"RUNNING".equals(status)) {return resp;}@@ -141,7 +141,7 @@ class StepFunctionsIntrinsicMissingArgumentIntegrationTest {}private String create(String name, String definition) {- var resp = given()+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.CreateStateMachine").contentType(SFN_CONTENT_TYPE).body("{\"name\":\"" + name + "\",\"definition\":" + quote(definition)@@ -152,7 +152,7 @@ class StepFunctionsIntrinsicMissingArgumentIntegrationTest {}private String start(String smArn, String input) {- var resp = given()+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.StartExecution").contentType(SFN_CONTENT_TYPE).body("{\"stateMachineArn\":\"" + smArn + "\",\"input\":" + quote(input) + "}")diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsMockedServiceIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsMockedServiceIntegrationTest.javaindex e533f021a6..c029edd109 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsMockedServiceIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsMockedServiceIntegrationTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.stepfunctions;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;@@ -153,14 +154,14 @@ class StepFunctionsMockedServiceIntegrationTest {@Test@Order(1)void mockedReturnRunsUnsupportedIntegrationToCompletion() throws Exception {- var execArn = startExecution(mockSmArn + "#HappyPath", "{}");+ String execArn = startExecution(mockSmArn + "#HappyPath", "{}");assertFalse(execArn.contains("#"));- var describe = waitForTerminalState(execArn);+ Response describe = waitForTerminalState(execArn);assertEquals("SUCCEEDED", describe.jsonPath().getString("status"));assertEquals(mockSmArn, describe.jsonPath().getString("stateMachineArn"));- var output = mapper.readTree(describe.jsonPath().getString("output"));+ JsonNode output = mapper.readTree(describe.jsonPath().getString("output"));assertEquals(200, output.path("StatusCode").asInt());assertEquals(1, output.path("ResponseBody").path("id").asInt());}@@ -168,12 +169,12 @@ class StepFunctionsMockedServiceIntegrationTest {@Test@Order(2)void mockedThrowReachesCatchWithErrorAndCauseUnchanged() throws Exception {- var execArn = startExecution(mockSmArn + "#Throw422", "{}");+ String execArn = startExecution(mockSmArn + "#Throw422", "{}");- var describe = waitForTerminalState(execArn);+ Response describe = waitForTerminalState(execArn);assertEquals("SUCCEEDED", describe.jsonPath().getString("status"));- var output = mapper.readTree(describe.jsonPath().getString("output"));+ JsonNode output = mapper.readTree(describe.jsonPath().getString("output"));assertEquals("ApiGateway.422", output.path("error").path("Error").asText());assertEquals("Unprocessable", output.path("error").path("Cause").asText());}@@ -181,9 +182,9 @@ class StepFunctionsMockedServiceIntegrationTest {@Test@Order(3)void mockedThrowIsRetriedUsingAttemptKeyedResponses() throws Exception {- var execArn = startExecution(mockSmArn + "#RetryOnce", "{}");+ String execArn = startExecution(mockSmArn + "#RetryOnce", "{}");- var describe = waitForTerminalState(execArn);+ Response describe = waitForTerminalState(execArn);assertEquals("SUCCEEDED", describe.jsonPath().getString("status"));assertTrue(mapper.readTree(describe.jsonPath().getString("output")).path("ResponseBody").path("retried").asBoolean());@@ -192,12 +193,12 @@ class StepFunctionsMockedServiceIntegrationTest {@Test@Order(4)void mockedStateCombinesWithRealDynamoDbIntegration() throws Exception {- var execArn = startExecution(ddbSmArn + "#MockedApiRealDdb", "{}");+ String execArn = startExecution(ddbSmArn + "#MockedApiRealDdb", "{}");- var describe = waitForTerminalState(execArn);+ Response describe = waitForTerminalState(execArn);assertEquals("SUCCEEDED", describe.jsonPath().getString("status"));- var getItem = given()+ Response getItem = given().header("X-Amz-Target", "DynamoDB_20120810.GetItem").contentType(DDB_CONTENT_TYPE).body("""@@ -208,7 +209,7 @@ class StepFunctionsMockedServiceIntegrationTest {""".formatted(TABLE_NAME)).when().post("/");getItem.then().statusCode(200);- var item = mapper.readTree(getItem.body().asString()).path("Item");+ JsonNode item = mapper.readTree(getItem.body().asString()).path("Item");assertEquals("mocked-run", item.path("pk").path("S").asText());assertEquals("200", item.path("statusCode").path("N").asText());}@@ -218,7 +219,7 @@ class StepFunctionsMockedServiceIntegrationTest {void syncExecutionRejectsMockTestCases() {// Verified against Step Functions Local 2.0.0, which rejects the suffix here with// UnsupportedOperation.- var resp = given()+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.StartSyncExecution").contentType(SFN_CONTENT_TYPE).body("""@@ -234,7 +235,7 @@ class StepFunctionsMockedServiceIntegrationTest {void syncExecutionDoesNotStripABareSuffix() {// Verified against Step Functions Local 2.0.0. StartSyncExecution looks up the raw ARN,// so a bare trailing '#' fails with StateMachineDoesNotExist instead of running unmocked.- var resp = given()+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.StartSyncExecution").contentType(SFN_CONTENT_TYPE).body("""@@ -248,9 +249,9 @@ class StepFunctionsMockedServiceIntegrationTest {@Test@Order(6)void executionWithoutTestCaseSuffixStillCallsRealIntegration() {- var execArn = startExecution(mockSmArn, "{}");+ String execArn = startExecution(mockSmArn, "{}");- var describe = waitForTerminalState(execArn);+ Response describe = waitForTerminalState(execArn);assertEquals("FAILED", describe.jsonPath().getString("status"));assertEquals("States.TaskFailed", describe.jsonPath().getString("error"));assertTrue(describe.jsonPath().getString("cause").contains("Unsupported resource"));@@ -261,7 +262,7 @@ class StepFunctionsMockedServiceIntegrationTest {void unknownTestCaseIsRejected() {// Intentional deviation. Step Functions Local 2.0.0 returns a plain HTTP 500 with the// text "No mock map found for test DoesNotExist". Floci returns a structured 400 instead.- var resp = given()+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.StartExecution").contentType(SFN_CONTENT_TYPE).body("""@@ -277,9 +278,9 @@ class StepFunctionsMockedServiceIntegrationTest {void blankSuffixRunsWithoutMocks() {// Verified against Step Functions Local 2.0.0. A bare trailing '#' selects no test case// and the execution runs its real integrations.- var execArn = startExecution(mockSmArn + "#", "{}");+ String execArn = startExecution(mockSmArn + "#", "{}");- var describe = waitForTerminalState(execArn);+ Response describe = waitForTerminalState(execArn);assertEquals("FAILED", describe.jsonPath().getString("status"));assertEquals("States.TaskFailed", describe.jsonPath().getString("error"));assertTrue(describe.jsonPath().getString("cause").contains("Unsupported resource"));@@ -290,12 +291,12 @@ class StepFunctionsMockedServiceIntegrationTest {void emptyMockedResponseIsIgnoredWhenItsStateIsNotEntered() throws Exception {// Verified against Step Functions Local 2.0.0. A mocked response with no attempt entries// does not stop the execution from starting when its state is never entered.- var execArn = startExecution(skipSmArn + "#EmptyUnusedResponse", "{\"go\": \"run\"}");+ String execArn = startExecution(skipSmArn + "#EmptyUnusedResponse", "{\"go\": \"run\"}");- var describe = waitForTerminalState(execArn);+ Response describe = waitForTerminalState(execArn);assertEquals("SUCCEEDED", describe.jsonPath().getString("status"));- var output = mapper.readTree(describe.jsonPath().getString("output"));+ JsonNode output = mapper.readTree(describe.jsonPath().getString("output"));assertEquals(200, output.path("StatusCode").asInt());}@@ -304,16 +305,16 @@ class StepFunctionsMockedServiceIntegrationTest {void emptyMockedResponseFailsTheExecutionWhenItsStateIsEntered() {// Verified against Step Functions Local 2.0.0. Entering the state fails the execution// with States.Runtime rather than rejecting StartExecution.- var execArn = startExecution(skipSmArn + "#EmptyUnusedResponse", "{\"go\": \"skip\"}");+ String execArn = startExecution(skipSmArn + "#EmptyUnusedResponse", "{\"go\": \"skip\"}");- var describe = waitForTerminalState(execArn);+ Response describe = waitForTerminalState(execArn);assertEquals("FAILED", describe.jsonPath().getString("status"));assertEquals("States.Runtime", describe.jsonPath().getString("error"));}private static String createStateMachine(String name, String type, String definition) {- var typeField = type != null ? "\"type\": \"%s\",".formatted(type) : "";- var resp = given()+ String typeField = type != null ? "\"type\": \"%s\",".formatted(type) : "";+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.CreateStateMachine").contentType(SFN_CONTENT_TYPE).body("""@@ -330,7 +331,7 @@ class StepFunctionsMockedServiceIntegrationTest {}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("""@@ -342,15 +343,15 @@ class StepFunctionsMockedServiceIntegrationTest {}private static Response waitForTerminalState(String execArn) {- for (var i = 0; i < 100; i++) {- var resp = given()+ for (int i = 0; i < 100; i++) {+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.DescribeExecution").contentType(SFN_CONTENT_TYPE).body("""{"executionArn": "%s"}""".formatted(execArn)).when().post("/");- var status = resp.jsonPath().getString("status");+ String status = resp.jsonPath().getString("status");if (!"RUNNING".equals(status)) {return resp;}diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsPutEventsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsPutEventsIntegrationTest.javaindex 083f6c618c..cd5e6a2255 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsPutEventsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsPutEventsIntegrationTest.java@@ -53,7 +53,7 @@ class StepFunctionsPutEventsIntegrationTest {@Test@Order(1)void publishedEventReachesTheRuleTargetAndTheResultCarriesItsEventId() throws Exception {- var smArn = createStateMachine("put-events-delivers", """+ String smArn = createStateMachine("put-events-delivers", """{"QueryLanguage": "JSONata","StartAt": "Publish",@@ -74,12 +74,12 @@ class StepFunctionsPutEventsIntegrationTest {}""".replace("RESOURCE_ARN", RESOURCE).replace("SOURCE_NAME", SOURCE));- var result = mapper.readTree(succeedingOutputOf(smArn));+ JsonNode result = mapper.readTree(succeedingOutputOf(smArn));assertEquals(0, result.path("FailedEntryCount").asInt());- var eventId = result.path("Entries").get(0).path("EventId").asText();+ String eventId = result.path("Entries").get(0).path("EventId").asText();assertFalse(eventId.isBlank());- var delivered = mapper.readTree(receiveSingleMessage(sinkQueueUrl).path("Body").asText());+ JsonNode delivered = mapper.readTree(receiveSingleMessage(sinkQueueUrl).path("Body").asText());assertEquals(eventId, delivered.path("id").asText());assertEquals("payout requested", delivered.path("detail-type").asText());assertEquals(1200, delivered.path("detail").path("amount").asInt());@@ -155,7 +155,7 @@ class StepFunctionsPutEventsIntegrationTest {@Test@Order(4)void taskResultCarriesTheSameFieldsThePutEventsApiReturns() throws Exception {- var smArn = createStateMachine("put-events-same-envelope", """+ String smArn = createStateMachine("put-events-same-envelope", """{"QueryLanguage": "JSONata","StartAt": "Publish",@@ -172,8 +172,8 @@ class StepFunctionsPutEventsIntegrationTest {}""".replace("RESOURCE_ARN", RESOURCE));- var taskResult = mapper.readTree(succeedingOutputOf(smArn));- var apiResult = mapper.readTree(given()+ JsonNode taskResult = mapper.readTree(succeedingOutputOf(smArn));+ JsonNode apiResult = mapper.readTree(given().header("X-Amz-Target", "AWSEvents.PutEvents").contentType(EVENTS_CONTENT_TYPE).body("""@@ -192,7 +192,7 @@ class StepFunctionsPutEventsIntegrationTest {@Test@Order(5)void oneRejectedEntryFailsTheTaskWithFailedEntryAndTheWholeResponseAsCause() throws Exception {- var smArn = createStateMachine("put-events-failed-entry", """+ String smArn = createStateMachine("put-events-failed-entry", """{"QueryLanguage": "JSONata","StartAt": "Publish",@@ -213,12 +213,12 @@ class StepFunctionsPutEventsIntegrationTest {}""".replace("RESOURCE_ARN", RESOURCE));- var describe = waitForTerminalState(startExecution(smArn));+ Response describe = waitForTerminalState(startExecution(smArn));assertEquals("FAILED", describe.jsonPath().getString("status"));assertEquals("EventBridge.FailedEntry", describe.jsonPath().getString("error"));// The cause is the PutEvents response itself, so the caller can tell which entry failed.- var cause = mapper.readTree(describe.jsonPath().getString("cause"));+ JsonNode cause = mapper.readTree(describe.jsonPath().getString("cause"));assertEquals(1, cause.path("FailedEntryCount").asInt());assertFalse(cause.path("Entries").get(0).path("EventId").asText().isBlank());assertEquals("InvalidArgument", cause.path("Entries").get(1).path("ErrorCode").asText());@@ -227,7 +227,7 @@ class StepFunctionsPutEventsIntegrationTest {@Test@Order(6)void aFailedEntryIsCatchableByItsErrorName() throws Exception {- var smArn = createStateMachine("put-events-catch", """+ String smArn = createStateMachine("put-events-catch", """{"QueryLanguage": "JSONata","StartAt": "Publish",@@ -255,20 +255,20 @@ class StepFunctionsPutEventsIntegrationTest {}private static List<String> fieldNames(JsonNode node) {- var names = new ArrayList<String>();+ ArrayList<String> names = new ArrayList<>();node.fieldNames().forEachRemaining(names::add);return names;}private String succeedingOutputOf(String smArn) {- var describe = waitForTerminalState(startExecution(smArn));+ Response describe = waitForTerminalState(startExecution(smArn));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))@@ -278,7 +278,7 @@ class StepFunctionsPutEventsIntegrationTest {}private static String queueArn(String queueUrl) {- var resp = given()+ Response resp = given().header("X-Amz-Target", "AmazonSQS.GetQueueAttributes").contentType(SQS_CONTENT_TYPE).body("{\"QueueUrl\":\"%s\",\"AttributeNames\":[\"QueueArn\"]}".formatted(queueUrl))@@ -310,15 +310,15 @@ class StepFunctionsPutEventsIntegrationTest {}private JsonNode receiveSingleMessage(String queueUrl) throws Exception {- for (var i = 0; i < 20; i++) {- var resp = given()+ for (int i = 0; i < 20; i++) {+ Response resp = given().header("X-Amz-Target", "AmazonSQS.ReceiveMessage").contentType(SQS_CONTENT_TYPE).body("{\"QueueUrl\":\"%s\",\"MaxNumberOfMessages\":1,\"WaitTimeSeconds\":1}".formatted(queueUrl)).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) {return messages.get(0);}@@ -329,7 +329,7 @@ class StepFunctionsPutEventsIntegrationTest {}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("""@@ -341,7 +341,7 @@ class StepFunctionsPutEventsIntegrationTest {}private static String startExecution(String smArn) {- var resp = given()+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.StartExecution").contentType(SFN_CONTENT_TYPE).body("""@@ -353,8 +353,8 @@ class StepFunctionsPutEventsIntegrationTest {}private static Response waitForTerminalState(String execArn) {- for (var i = 0; i < 100; i++) {- var resp = given()+ for (int i = 0; i < 100; i++) {+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.DescribeExecution").contentType(SFN_CONTENT_TYPE).body("""diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsRetryIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsRetryIntegrationTest.javaindex ea51597443..ff3d2e74af 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsRetryIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsRetryIntegrationTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.stepfunctions;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;@@ -61,7 +62,7 @@ class StepFunctionsRetryIntegrationTest {@Test@Order(1)void taskIsRetriedAndSucceedsOnSecondAttempt() throws Exception {- var smArn = createStateMachine("sfn-retry-succeed-test", """+ String smArn = createStateMachine("sfn-retry-succeed-test", """{"StartAt": "Flaky","States": {@@ -83,12 +84,12 @@ class StepFunctionsRetryIntegrationTest {}}""");- var execArn = startExecution(smArn, "{}");+ String execArn = startExecution(smArn, "{}");- var describe = waitForTerminalState(execArn);+ Response describe = waitForTerminalState(execArn);assertEquals("SUCCEEDED", describe.jsonPath().getString("status"));- var getItem = given()+ Response getItem = given().header("X-Amz-Target", "DynamoDB_20120810.GetItem").contentType(DDB_CONTENT_TYPE).body("""@@ -103,7 +104,7 @@ class StepFunctionsRetryIntegrationTest {@Test@Order(2)void exhaustedRetriesFallThroughToCatch() throws Exception {- var smArn = createStateMachine("sfn-retry-catch-test", """+ String smArn = createStateMachine("sfn-retry-catch-test", """{"StartAt": "Flaky","States": {@@ -131,18 +132,18 @@ class StepFunctionsRetryIntegrationTest {}}""".formatted(MISSING_TABLE));- var execArn = startExecution(smArn, "{}");+ String execArn = startExecution(smArn, "{}");- var describe = waitForTerminalState(execArn);+ Response describe = waitForTerminalState(execArn);assertEquals("SUCCEEDED", describe.jsonPath().getString("status"));- var output = mapper.readTree(describe.jsonPath().getString("output"));+ JsonNode output = mapper.readTree(describe.jsonPath().getString("output"));assertEquals("DynamoDB.ResourceNotFoundException", output.path("err").path("Error").asText());}@Test@Order(3)void unmatchedErrorFailsWithoutRetry() {- var smArn = createStateMachine("sfn-retry-unmatched-test", """+ String smArn = createStateMachine("sfn-retry-unmatched-test", """{"StartAt": "Flaky","States": {@@ -163,15 +164,15 @@ class StepFunctionsRetryIntegrationTest {}}""".formatted(MISSING_TABLE));- var execArn = startExecution(smArn, "{}");+ String execArn = startExecution(smArn, "{}");- var describe = waitForTerminalState(execArn);+ Response describe = waitForTerminalState(execArn);assertEquals("FAILED", describe.jsonPath().getString("status"));assertEquals("DynamoDB.ResourceNotFoundException", describe.jsonPath().getString("error"));}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("""@@ -187,7 +188,7 @@ class StepFunctionsRetryIntegrationTest {}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("""@@ -199,15 +200,15 @@ class StepFunctionsRetryIntegrationTest {}private static Response waitForTerminalState(String execArn) {- for (var i = 0; i < 100; i++) {- var resp = given()+ for (int i = 0; i < 100; i++) {+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.DescribeExecution").contentType(SFN_CONTENT_TYPE).body("""{"executionArn": "%s"}""".formatted(execArn)).when().post("/");- var status = resp.jsonPath().getString("status");+ String status = resp.jsonPath().getString("status");if (!"RUNNING".equals(status)) {return resp;}diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsStartSyncExecutionIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsStartSyncExecutionIntegrationTest.javaindex 7ec5e16cfc..d642b977dc 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsStartSyncExecutionIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsStartSyncExecutionIntegrationTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.stepfunctions;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;@@ -80,7 +81,7 @@ class StepFunctionsStartSyncExecutionIntegrationTest {@Test@Order(1)void succeedingChildReturnsPascalCaseEnvelopeWithOutputAsJsonString() throws Exception {- var parentArn = createStateMachine("sync-exec-parent-ok", null, callChild("""+ String parentArn = createStateMachine("sync-exec-parent-ok", null, callChild("""{"QueryLanguage": "JSONata","StartAt": "CallChild",@@ -104,10 +105,10 @@ class StepFunctionsStartSyncExecutionIntegrationTest {}""", succeedingChildArn));- var describe = waitForTerminalState(startExecution(parentArn, "{}"));+ Response describe = waitForTerminalState(startExecution(parentArn, "{}"));assertEquals("SUCCEEDED", describe.jsonPath().getString("status"));- var output = mapper.readTree(describe.jsonPath().getString("output"));+ JsonNode output = mapper.readTree(describe.jsonPath().getString("output"));assertEquals("SUCCEEDED", output.path("status").asText());assertEquals(succeedingChildArn, output.path("childArn").asText());@@ -117,7 +118,7 @@ class StepFunctionsStartSyncExecutionIntegrationTest {"StartDate is not the SDK's ISO-8601 rendering: " + output.path("startDate"));// Output arrives as a JSON string, the way the AWS SDK integration returns it.- var childOutput = mapper.readTree(output.path("childOutput").asText());+ JsonNode childOutput = mapper.readTree(output.path("childOutput").asText());assertTrue(childOutput.path("approved").asBoolean());assertEquals(1200, childOutput.path("echoedAmount").asInt());}@@ -125,7 +126,7 @@ class StepFunctionsStartSyncExecutionIntegrationTest {@Test@Order(2)void failingChildIsReportedThroughStatusWithoutFailingTheTask() throws Exception {- var parentArn = createStateMachine("sync-exec-parent-fail", null, callChild("""+ String parentArn = createStateMachine("sync-exec-parent-fail", null, callChild("""{"QueryLanguage": "JSONata","StartAt": "CallChild",@@ -148,10 +149,10 @@ class StepFunctionsStartSyncExecutionIntegrationTest {}""", failingChildArn));- var describe = waitForTerminalState(startExecution(parentArn, "{}"));+ Response describe = waitForTerminalState(startExecution(parentArn, "{}"));assertEquals("SUCCEEDED", describe.jsonPath().getString("status"));- var output = mapper.readTree(describe.jsonPath().getString("output"));+ JsonNode output = mapper.readTree(describe.jsonPath().getString("output"));assertEquals("FAILED", output.path("status").asText());assertEquals("PoolClosed", output.path("error").asText());assertEquals("the pool is already closed", output.path("cause").asText());@@ -160,7 +161,7 @@ class StepFunctionsStartSyncExecutionIntegrationTest {@Test@Order(3)void standardChildFailsTheTaskWithTheServicePrefixedError() {- var parentArn = createStateMachine("sync-exec-parent-standard-child", null, """+ String parentArn = createStateMachine("sync-exec-parent-standard-child", null, """{"QueryLanguage": "JSONata","StartAt": "CallChild",@@ -178,7 +179,7 @@ class StepFunctionsStartSyncExecutionIntegrationTest {}""".formatted(RESOURCE, standardChildArn));- var describe = waitForTerminalState(startExecution(parentArn, "{}"));+ Response describe = waitForTerminalState(startExecution(parentArn, "{}"));assertEquals("FAILED", describe.jsonPath().getString("status"));assertEquals("Sfn.StateMachineTypeNotSupportedException", describe.jsonPath().getString("error"));assertTrue(describe.jsonPath().getString("cause").contains("only supported for EXPRESS"));@@ -187,7 +188,7 @@ class StepFunctionsStartSyncExecutionIntegrationTest {@Test@Order(4)void missingStateMachineArnFailsTheTask() {- var parentArn = createStateMachine("sync-exec-parent-no-arn", null, """+ String parentArn = createStateMachine("sync-exec-parent-no-arn", null, """{"QueryLanguage": "JSONata","StartAt": "CallChild",@@ -202,7 +203,7 @@ class StepFunctionsStartSyncExecutionIntegrationTest {}""".formatted(RESOURCE));- var describe = waitForTerminalState(startExecution(parentArn, "{}"));+ Response describe = waitForTerminalState(startExecution(parentArn, "{}"));assertEquals("FAILED", describe.jsonPath().getString("status"));assertEquals("Sfn.InvalidArnException", describe.jsonPath().getString("error"));}@@ -218,8 +219,8 @@ class StepFunctionsStartSyncExecutionIntegrationTest {}private static String createStateMachine(String name, String type, String definition) {- var typeField = type != null ? "\"type\": \"%s\",".formatted(type) : "";- var resp = given()+ String typeField = type != null ? "\"type\": \"%s\",".formatted(type) : "";+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.CreateStateMachine").contentType(SFN_CONTENT_TYPE).body("""@@ -236,7 +237,7 @@ class StepFunctionsStartSyncExecutionIntegrationTest {}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("""@@ -248,15 +249,15 @@ class StepFunctionsStartSyncExecutionIntegrationTest {}private static Response waitForTerminalState(String execArn) {- for (var i = 0; i < 100; i++) {- var resp = given()+ for (int i = 0; i < 100; i++) {+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.DescribeExecution").contentType(SFN_CONTENT_TYPE).body("""{"executionArn": "%s"}""".formatted(execArn)).when().post("/");- var status = resp.jsonPath().getString("status");+ String status = resp.jsonPath().getString("status");if (!"RUNNING".equals(status)) {return resp;}diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsUnresolvableJsonPathIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsUnresolvableJsonPathIntegrationTest.javaindex 4f08040139..fd4e5b18b3 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsUnresolvableJsonPathIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsUnresolvableJsonPathIntegrationTest.java@@ -29,12 +29,12 @@ class StepFunctionsUnresolvableJsonPathIntegrationTest {/** The exact reproduction from issue #2521. */@Testvoid unresolvableParametersPathFailsTheExecution() throws Exception {- var definition = """+ String definition = """{"StartAt":"Pick","States":{"Pick":{"Type":"Pass","Parameters":{"missing.$":"$.nope.deep"},"End":true}}}""";- var describe = run("unresolvable-jsonpath", definition, "{\"other\":1}");+ Response describe = run("unresolvable-jsonpath", definition, "{\"other\":1}");assertEquals("FAILED", describe.jsonPath().getString("status"), describe.body().asString());assertEquals("States.Runtime", describe.jsonPath().getString("error"));@@ -50,7 +50,7 @@ class StepFunctionsUnresolvableJsonPathIntegrationTest {*/@Testvoid catchAllDoesNotSwallowTheFailure() throws Exception {- var definition = """+ String definition = """{"StartAt":"M","States":{"M":{"Type":"Map","ItemsPath":"$.items","Parameters":{"missing.$":"$.nope"},@@ -59,7 +59,7 @@ class StepFunctionsUnresolvableJsonPathIntegrationTest {"Caught":{"Type":"Pass","End":true}}}""";- var describe = run("unresolvable-jsonpath-catch-all", definition, "{\"items\":[1,2]}");+ Response describe = run("unresolvable-jsonpath-catch-all", definition, "{\"items\":[1,2]}");assertEquals("FAILED", describe.jsonPath().getString("status"), describe.body().asString());assertEquals("States.Runtime", describe.jsonPath().getString("error"));@@ -68,12 +68,12 @@ class StepFunctionsUnresolvableJsonPathIntegrationTest {/** An out-of-range array index still resolves to null and the execution succeeds. */@Testvoid outOfRangeArrayIndexStillSucceeds() throws Exception {- var definition = """+ String definition = """{"StartAt":"Pick","States":{"Pick":{"Type":"Pass","Parameters":{"idx.$":"$.items[5]"},"End":true}}}""";- var describe = run("unresolvable-jsonpath-array-index", definition, "{\"items\":[1,2]}");+ Response describe = run("unresolvable-jsonpath-array-index", definition, "{\"items\":[1,2]}");assertEquals("SUCCEEDED", describe.jsonPath().getString("status"), describe.body().asString());assertEquals("{\"idx\":null}", describe.jsonPath().getString("output"));@@ -82,14 +82,14 @@ class StepFunctionsUnresolvableJsonPathIntegrationTest {/** ResultSelector runs through the same resolver and fails the same way. */@Testvoid unresolvableResultSelectorPathFailsTheExecution() throws Exception {- var definition = """+ String definition = """{"StartAt":"M","States":{"M":{"Type":"Map","ItemsPath":"$.items","ItemProcessor":{"StartAt":"P","States":{"P":{"Type":"Pass","End":true}}},"ResultSelector":{"missing.$":"$.nope"},"End":true}}}""";- var describe = run("unresolvable-jsonpath-result-selector", definition, "{\"items\":[1,2]}");+ Response describe = run("unresolvable-jsonpath-result-selector", definition, "{\"items\":[1,2]}");assertEquals("FAILED", describe.jsonPath().getString("status"), describe.body().asString());assertEquals("States.Runtime", describe.jsonPath().getString("error"));@@ -100,11 +100,11 @@ class StepFunctionsUnresolvableJsonPathIntegrationTest {}private Response run(String label, String definition, String input) throws InterruptedException {- var smArn = create(label + "-" + System.currentTimeMillis(), definition);- var execArn = start(smArn, input);- for (var i = 0; i < 50; i++) {- var resp = describe(execArn);- var status = resp.jsonPath().getString("status");+ String smArn = create(label + "-" + System.currentTimeMillis(), definition);+ String execArn = start(smArn, input);+ for (int i = 0; i < 50; i++) {+ Response resp = describe(execArn);+ String status = resp.jsonPath().getString("status");if (!"RUNNING".equals(status)) {return resp;}@@ -115,7 +115,7 @@ class StepFunctionsUnresolvableJsonPathIntegrationTest {}private String create(String name, String definition) {- var resp = given()+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.CreateStateMachine").contentType(SFN_CONTENT_TYPE).body("{\"name\":\"" + name + "\",\"definition\":" + quote(definition)@@ -126,7 +126,7 @@ class StepFunctionsUnresolvableJsonPathIntegrationTest {}private String start(String smArn, String input) {- var resp = given()+ Response resp = given().header("X-Amz-Target", "AWSStepFunctions.StartExecution").contentType(SFN_CONTENT_TYPE).body("{\"stateMachineArn\":\"" + smArn + "\",\"input\":" + quote(input) + "}")diff --git a/src/test/java/io/github/hectorvent/floci/tools/ami/AmiImageToolTest.java b/src/test/java/io/github/hectorvent/floci/tools/ami/AmiImageToolTest.javaindex f8f6a87b68..d9df773aef 100644--- a/src/test/java/io/github/hectorvent/floci/tools/ami/AmiImageToolTest.java+++ b/src/test/java/io/github/hectorvent/floci/tools/ami/AmiImageToolTest.java@@ -10,6 +10,7 @@ import java.nio.file.Files;import java.nio.file.Path;import java.security.MessageDigest;import java.util.HexFormat;+import java.util.stream.Stream;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;@@ -151,7 +152,7 @@ class AmiImageToolTest {void toolTreeDoesNotContainShellScripts() throws Exception {Path tools = Path.of("src/main/java/io/github/hectorvent/floci/tools/ami");if (Files.isDirectory(tools)) {- try (var stream = Files.walk(tools)) {+ try (Stream<Path> stream = Files.walk(tools)) {assertFalse(stream.anyMatch(path -> path.getFileName().toString().endsWith(".sh")));}}diff --git a/tools/checkstyle/suppressions.xml b/tools/checkstyle/suppressions.xmlindex 999b3477c4..f0e8dc3901 100644--- a/tools/checkstyle/suppressions.xml+++ b/tools/checkstyle/suppressions.xml@@ -4,446 +4,47 @@"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/AbstractKinesisAnalyticsV2LifecycleTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/AccessAnalyzerTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/AccountAlternateContactTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/AcmTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/AmazonMqTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/ApiGatewayV2ManagementTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/ApiGatewayV2WebSocketAndExtendedOpsTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/ApiGatewayV2WebSocketDataPlaneTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/AppConfigTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/BcmPricingCalculatorTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/BedrockAgentCoreCredentialProviderTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/BedrockAgentCoreResourcePolicyTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/BedrockGuardrailTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/CWWireDebugTest\.java$"/><suppress id="NoVar" files="/com/floci/test/CloudFormationEventSourceMappingTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/CloudFrontOriginCustomHeadersTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/CloudFrontResponseHeadersPolicyTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/CloudFrontTrustedKeyGroupsTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/CloudWatchLogsCrossAccountPolicyTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/CodeDeployEcsTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/CodeDeployTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/ControlCatalogTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/DetectiveOrganizationAdministrationTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/DynamoDbAccessPathValidationTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/DynamoDbImportTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/Ec2DescribeSpotPriceHistoryTest\.java$"/><suppress id="NoVar" files="/com/floci/test/ElastiCacheTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/ElasticBeanstalkTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/FisTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/GlueCatalogTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/GlueSchemaRegistryTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/IamTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/IdentityStoreTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/Inspector2OrganizationConfigurationTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/IotTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/KinesisEfoTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/KinesisTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/KmsFeaturesTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/KmsSm2Test\.java$"/>- <suppress id="NoVar" files="/com/floci/test/KmsTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/LightsailTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/MarketplaceAgreementTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/MarketplaceCatalogTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/MarketplaceDeploymentTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/MarketplaceDiscoveryTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/MarketplaceEntitlementTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/MarketplaceMeteringTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/MarketplaceReportingTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/NeptuneTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/OamTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/RdsControlPlaneTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/RdsIamTokenCompatTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/RedshiftOperationsTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/ResourceExplorer2Test\.java$"/>- <suppress id="NoVar" files="/com/floci/test/S3AnnotationsTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/S3PresignedUrlSigV4VerificationTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/S3Test\.java$"/>- <suppress id="NoVar" files="/com/floci/test/S3VirtualHostStyleTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/SecurityHubOrganizationConfigurationTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/SesEventPublishingTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/SesReceiptRuleSetTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/SnsTest\.java$"/><suppress id="NoVar" files="/com/floci/test/SqsMd5Test\.java$"/>- <suppress id="NoVar" files="/com/floci/test/SsoAdminAccountAssignmentTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/SsoOidcTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/SsoPortalTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/StepFunctionsExecutionHistoryTest\.java$"/><suppress id="NoVar" files="/com/floci/test/StsTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/SwfRegionPaginationTest\.java$"/>- <suppress id="NoVar" files="/com/floci/test/TestFixtures\.java$"/>- <suppress id="NoVar" files="/com/floci/test/VerifiedPermissionsTest\.java$"/>- <suppress id="NoVar" files="/floci/config/ContainerCaBundle\.java$"/>- <suppress id="NoVar" files="/floci/config/ContainerCaBundleTest\.java$"/>- <suppress id="NoVar" files="/floci/config/CustomDomainTlsIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/config/FlociCertificateAuthorityTest\.java$"/>- <suppress id="NoVar" files="/floci/config/FlociConfigRelocationsInterceptorTest\.java$"/>- <suppress id="NoVar" files="/floci/config/TlsCertificateHostnameTest\.java$"/>- <suppress id="NoVar" files="/floci/config/TlsCertificateManagerFixture\.java$"/>- <suppress id="NoVar" files="/floci/config/TlsEnsureHostIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/config/TlsHttp2HostRoutingIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/config/TlsLocalCaIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/config/TlsProxyServer\.java$"/>- <suppress id="NoVar" files="/floci/core/common/AiMockConfigLoader\.java$"/>- <suppress id="NoVar" files="/floci/core/common/AiMockConfigLoaderTest\.java$"/>- <suppress id="NoVar" files="/floci/core/common/AwsRequestIdFilter\.java$"/><suppress id="NoVar" files="/floci/core/common/IamEnforcementFilter\.java$"/>- <suppress id="NoVar" files="/floci/core/common/RequestScopes\.java$"/>- <suppress id="NoVar" files="/floci/core/common/ServiceEnabledFilter\.java$"/>- <suppress id="NoVar" files="/floci/core/common/XmlParserTest\.java$"/>- <suppress id="NoVar" files="/floci/core/common/docker/ContainerCaBundleDockerIntegrationTest\.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/core/common/docker/LaunchedContainerAwsEnv\.java$"/>- <suppress id="NoVar" files="/floci/core/storage/HybridStorageTest\.java$"/>- <suppress id="NoVar" files="/floci/core/storage/PersistedModelReflectionTest\.java$"/>- <suppress id="NoVar" files="/floci/core/storage/PersistentPathValidatorTest\.java$"/>- <suppress id="NoVar" files="/floci/core/storage/PersistentStorageTest\.java$"/>- <suppress id="NoVar" files="/floci/core/storage/StorageBackedMapTest\.java$"/>- <suppress id="NoVar" files="/floci/core/storage/StorageFactory\.java$"/>- <suppress id="NoVar" files="/floci/core/storage/WalStorageTest\.java$"/>- <suppress id="NoVar" files="/floci/lifecycle/EmulatorInfoControllerIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/lifecycle/EmulatorLifecycleTest\.java$"/>- <suppress id="NoVar" files="/floci/lifecycle/inithook/InitializationHooksRunnerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/amazonmq/AmazonMqEngineTypeCaseTest\.java$"/>- <suppress id="NoVar" files="/floci/services/amazonmq/AmazonMqServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/apigateway/ApiGatewayAwsIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/apigateway/ApiGatewayExecuteController\.java$"/><suppress id="NoVar" files="/floci/services/apigateway/ApiGatewayService\.java$"/>- <suppress id="NoVar" files="/floci/services/apigateway/ApiGatewaySqsIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/apigateway/ApiGatewaySqsPathIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/apigateway/VtlTemplateEngineTest\.java$"/>- <suppress id="NoVar" files="/floci/services/apigatewayv2/proxy/ContextValueResolverTest\.java$"/>- <suppress id="NoVar" files="/floci/services/apigatewayv2/proxy/HttpProxyInvokerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/apigatewayv2/proxy/RequestParameterMapperTest\.java$"/>- <suppress id="NoVar" files="/floci/services/apigatewayv2/websocket/WebSocketIntegrationInvoker\.java$"/>- <suppress id="NoVar" files="/floci/services/appintegrations/AppIntegrationsIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/appsync/AppSyncController\.java$"/>- <suppress id="NoVar" files="/floci/services/appsync/AppSyncService\.java$"/>- <suppress id="NoVar" files="/floci/services/appsync/AppSyncServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/appsync/graphql/AppSyncVtlEngineTest\.java$"/>- <suppress id="NoVar" files="/floci/services/appsync/graphql/auth/LambdaAuthorizerValidator\.java$"/>- <suppress id="NoVar" files="/floci/services/appsync/graphql/resolver/AppSyncResolverExecutorTest\.java$"/>- <suppress id="NoVar" files="/floci/services/appsync/graphql/util/ListUtilTest\.java$"/>- <suppress id="NoVar" files="/floci/services/appsync/graphql/util/TimeUtil\.java$"/>- <suppress id="NoVar" files="/floci/services/athena/AthenaCreateWorkGroupPersistenceIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/athena/AthenaGetWorkGroupIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/autoscaling/AutoScalingReconcilerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/autoscaling/AutoScalingServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/bedrock/BedrockIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayRuleController\.java$"/>- <suppress id="NoVar" files="/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayRuleService\.java$"/>- <suppress id="NoVar" files="/floci/services/bedrockagentcorecontrol/BedrockAgentCorePaginationIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/bedrockagentcorecontrol/BedrockAgentCoreTaggingIdentityIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/bedrockagentcorecontrol/BedrockAgentCoreToolsController\.java$"/><suppress id="NoVar" files="/floci/services/bedrockruntime/backend/BedrockOpenAiTranslator\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/ApiGatewayCfnMockCorsIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/CfnProvisionerFixtureTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/CfnSchemaCoverageTest\.java$"/><suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationDeletionPolicyIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationEc2NetworkingIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationIamUserIntegrationTest\.java$"/><suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationManagedPolicyUpdateIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationPersistenceIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationQueryHandler\.java$"/><suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationService\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationStackPersistenceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/CloudFormationTemplateEngine\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/EventBusProvisionOwnershipTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/InlineZipPackager\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/InlineZipPackagerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/OrganizationsCfnIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/OrganizationsCfnRollbackIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/SamTransformIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/CfnStableNameUpdatePathTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/CodeBuildCfnProvisionerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/CodePipelineCfnProvisionerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/Ec2NetworkAclCfnProvisioner\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/Ec2NetworkCfnProvisioner\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/Ec2NetworkCfnProvisionerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/Ec2SecurityGroupRuleCfnProvisionerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/Ec2VpcEndpointCfnProvisioner\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/Ec2VpcGatewayAttachmentCfnProvisionerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/EcsCapacityCfnProvisionerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/ElbV2CfnProvisionerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/EventsCfnProvisioner\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/EventsCfnProvisionerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/FirehoseCfnProvisioner\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/KmsCfnProvisioner\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/LambdaEventSourceMappingCfnProvisioner\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/LambdaEventSourceMappingCfnProvisionerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/RdsCfnProvisioner\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudformation/provisioners/SnsCfnProvisioner\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudfront/CloudFrontCustomOriginServingTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudfront/CloudFrontDistributionServingTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudfront/CloudFrontServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudfront/CloudFrontServingController\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudfront/CloudFrontSignatureVerifierTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudfront/ResponseHeadersPolicyConfigCodecTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudhsmv2/CloudHsmV2JsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudtrail/CloudTrailAdvancedSelectorsIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudwatch/logs/CloudWatchLogsHandlerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudwatch/logs/CloudWatchLogsServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandler\.java$"/><suppress id="NoVar" files="/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsService\.java$"/>- <suppress id="NoVar" files="/floci/services/codebuild/CodeBuildRunner\.java$"/><suppress id="NoVar" files="/floci/services/cognito/CognitoLambdaTriggersTest\.java$"/>- <suppress id="NoVar" files="/floci/services/configservice/ConfigServiceJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/connect/ConnectIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/controlcatalog/ControlCatalogControllerIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/controlcatalog/ControlCatalogServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/controltower/ControlTowerControlController\.java$"/>- <suppress id="NoVar" files="/floci/services/controltower/ControlTowerControlService\.java$"/>- <suppress id="NoVar" files="/floci/services/controltower/ControlTowerController\.java$"/>- <suppress id="NoVar" files="/floci/services/cur/CurEmissionIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/cur/ParquetEmitterIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/datasync/DataSyncJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/datasync/DataSyncServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/detective/DetectiveController\.java$"/>- <suppress id="NoVar" files="/floci/services/detective/DetectiveService\.java$"/>- <suppress id="NoVar" files="/floci/services/detective/DetectiveServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/docdb/DocDbLegacyMigrationRaceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/docdb/DocDbServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbAccessPath\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbAccessPathValidator\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbAccessPathValidatorTest\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbAttributeValueValidator\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbConcurrencyIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbConsumedCapacityIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbFilterExpressionIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbGsiSortKeyRestartTest\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbImportIntegrationTest\.java$"/><suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbItemSize\.java$"/><suppress id="NoVar" files="/floci/services/dynamodb/NativeDynamoDbJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/NativeDynamoDbJsonHandlerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbNumberUtils\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbPartiQLParser\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbPartiQLParserTest\.java$"/><suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbService\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbServiceTest\.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/dynamodb/DynamoDbTableArnIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbUpdatedAttributes\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbWriteCapacity\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/DynamoDbWriteCapacityTest\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/ExpressionEvaluator\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/ExpressionEvaluatorTest\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/ProjectionEvaluator\.java$"/>- <suppress id="NoVar" files="/floci/services/dynamodb/ProjectionEvaluatorTest\.java$"/><suppress id="NoVar" files="/floci/services/ec2/Ec2ContainerManager\.java$"/>- <suppress id="NoVar" files="/floci/services/ec2/Ec2DeregisterAndCopyImageIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ec2/Ec2IntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ec2/Ec2IpamService\.java$"/>- <suppress id="NoVar" files="/floci/services/ec2/Ec2IpamServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ec2/Ec2MetadataServer\.java$"/>- <suppress id="NoVar" files="/floci/services/ec2/Ec2ModifyVpcEndpointTest\.java$"/><suppress id="NoVar" files="/floci/services/ec2/Ec2Service\.java$"/>- <suppress id="NoVar" files="/floci/services/ec2/Ec2ServiceConcurrencyTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ec2/Ec2ServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ecr/EcrService\.java$"/>- <suppress id="NoVar" files="/floci/services/ecr/registry/EcrRegistryDataPlaneTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ecr/registry/EcrRegistryManager\.java$"/>- <suppress id="NoVar" files="/floci/services/ecs/EcsJsonHandlerTaskDefinitionPersistenceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ecs/EcsServiceDaemonSchedulingTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ecs/EcsServiceRolloutTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ecs/container/EcsContainerManager\.java$"/>- <suppress id="NoVar" files="/floci/services/ecs/container/EcsContainerManagerSecurityGroupTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ecs/container/SecretsManagerSelectorTest\.java$"/><suppress id="NoVar" files="/floci/services/eks/EksClusterManager\.java$"/>- <suppress id="NoVar" files="/floci/services/eks/EksOidcServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/eks/EksOidcWellKnownController\.java$"/><suppress id="NoVar" files="/floci/services/eks/EksServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/elbv2/ElbV2ServiceTest\.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/eventbridge/RulePersistenceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/eventbridge/model/InputTransformerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/firehose/FirehoseJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/firehose/FirehoseParquetConverter\.java$"/>- <suppress id="NoVar" files="/floci/services/firehose/S3DestinationValidator\.java$"/>- <suppress id="NoVar" files="/floci/services/fis/FisService\.java$"/>- <suppress id="NoVar" files="/floci/services/floci/ui/FlociUiManager\.java$"/>- <suppress id="NoVar" files="/floci/services/floci/ui/FlociUiManagerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/glue/GlueJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/glue/GlueServiceTest\.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/AssumeRoleWithSamlValidationIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/iam/IamListEntitiesForPolicyIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/iam/IamQueryHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/iam/IamServiceLinkedRoleIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/iam/IamUpdateGroupConsumerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/iam/InstanceProfileTagsIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/iam/ResourceArnBuilder\.java$"/>- <suppress id="NoVar" files="/floci/services/iam/ResourceArnBuilderTest\.java$"/>- <suppress id="NoVar" files="/floci/services/iam/SAMLAssertionVerifier\.java$"/>- <suppress id="NoVar" files="/floci/services/iam/SAMLProviderService\.java$"/>- <suppress id="NoVar" files="/floci/services/iam/SAMLTrustPolicyEvaluator\.java$"/><suppress id="NoVar" files="/floci/services/iam/StsQueryHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/iam/WebIdentityTrustPolicyEvaluator\.java$"/>- <suppress id="NoVar" files="/floci/services/identitystore/IdentityStoreJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/identitystore/ScimController\.java$"/>- <suppress id="NoVar" files="/floci/services/inspector2/Inspector2Controller\.java$"/>- <suppress id="NoVar" files="/floci/services/inspector2/Inspector2IntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/iot/IotDataController\.java$"/>- <suppress id="NoVar" files="/floci/services/iot/IotIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/iot/IotMqttBrokerServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/iot/IotMqttMutualTlsIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/iot/IotMqttTlsIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/iot/IotMqttWebSocketIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/iot/ReloadingKeyManagerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/kinesis/KinesisIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/kinesis/KinesisJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/kinesis/KinesisJsonHandlerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/kinesis/KinesisServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/kinesisanalytics/KinesisAnalyticsV2JsonHandlerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/kinesisanalytics/KinesisAnalyticsV2ServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/kinesisanalytics/container/FlinkContainerManager\.java$"/>- <suppress id="NoVar" files="/floci/services/kinesisanalytics/container/FlinkRestClient\.java$"/>- <suppress id="NoVar" files="/floci/services/kms/KmsIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/kms/KmsServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/EsmStore\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/KinesisEventSourcePoller\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/LambdaLayerController\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/LambdaLayerService\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/LambdaPermissionTagLayerIntegrationTest\.java$"/><suppress id="NoVar" files="/floci/services/lambda/LambdaService\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/SqsEventSourcePoller\.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/lambda/launcher/ContainerLauncherTest\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/LambdaRuntimeLauncherProducer\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/LambdaRuntimeLauncherProducerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/kubernetes/EksTokenMinter\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/kubernetes/EksTokenMinterTest\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/kubernetes/KubernetesApiClient\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/kubernetes/KubernetesApiClientKubeconfigTest\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/kubernetes/KubernetesFlociAddressResolver\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/kubernetes/KubernetesFlociAddressResolverTest\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/kubernetes/KubernetesPodLauncher\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/kubernetes/KubernetesPodLauncherTest\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/kubernetes/KubernetesPodLogStreamer\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/kubernetes/LambdaPodSpecFactory\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/launcher/kubernetes/LambdaPodSpecFactoryTest\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/runtime/RuntimeApiServer\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/zip/CodeStore\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/zip/ZipExtractor\.java$"/>- <suppress id="NoVar" files="/floci/services/lambda/zip/ZipExtractorTest\.java$"/>- <suppress id="NoVar" files="/floci/services/marketplace/MarketplaceCatalogControllerIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/marketplace/MarketplaceDeploymentIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/marketplace/MarketplaceEntitlementService\.java$"/>- <suppress id="NoVar" files="/floci/services/marketplace/MarketplaceMeteringIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/marketplace/MarketplaceReportingServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/memorydb/MemoryDbService\.java$"/>- <suppress id="NoVar" files="/floci/services/msk/MskController\.java$"/>- <suppress id="NoVar" files="/floci/services/msk/MskControllerIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/msk/MskServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/msk/RedpandaManager\.java$"/><suppress id="NoVar" files="/floci/services/mwaa/MwaaEnvironmentManager\.java$"/>- <suppress id="NoVar" files="/floci/services/networkfirewall/NetworkFirewallConcurrencyTest\.java$"/>- <suppress id="NoVar" files="/floci/services/oam/OamService\.java$"/>- <suppress id="NoVar" files="/floci/services/organizations/OrganizationsIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/organizations/OrganizationsInvalidEffectivePolicyIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/pipes/PipesController\.java$"/>- <suppress id="NoVar" files="/floci/services/pipes/PipesFilterMatcher\.java$"/>- <suppress id="NoVar" files="/floci/services/pipes/PipesPoller\.java$"/>- <suppress id="NoVar" files="/floci/services/pipes/PipesServiceTest\.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/rds/container/RdsContainerManagerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/rds/model/DbClusterPersistenceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/rds/proxy/PostgresProtocolHandlerTest\.java$"/>- <suppress id="NoVar" files="/floci/services/rds/proxy/RdsProxyTlsCertificatesTest\.java$"/>- <suppress id="NoVar" files="/floci/services/redshiftserverless/RedshiftServerlessServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/resourceexplorer2/ResourceExplorer2Controller\.java$"/>- <suppress id="NoVar" files="/floci/services/resourceexplorer2/ResourceExplorer2IntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/resourceexplorer2/ResourceExplorer2PaginationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/resourceexplorer2/ResourceExplorer2Service\.java$"/>- <suppress id="NoVar" files="/floci/services/resourceexplorer2/query/QueryParserTest\.java$"/>- <suppress id="NoVar" files="/floci/services/resourceexplorer2/query/ResourceFilter\.java$"/>- <suppress id="NoVar" files="/floci/services/route53/Route53VpcAssociationIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/route53resolver/Route53ResolverJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/rum/RumController\.java$"/>- <suppress id="NoVar" files="/floci/services/rum/RumControllerIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/rum/RumServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/s3/PreSignedUrlFilter\.java$"/>- <suppress id="NoVar" files="/floci/services/s3/PreSignedUrlGenerator\.java$"/><suppress id="NoVar" files="/floci/services/s3/S3Controller\.java$"/>- <suppress id="NoVar" files="/floci/services/s3/S3NotificationModelTest\.java$"/><suppress id="NoVar" files="/floci/services/s3/S3Service\.java$"/>- <suppress id="NoVar" files="/floci/services/s3/S3ServiceAnnotationsTest\.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/s3/S3VirtualHostIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/s3/S3WebsiteIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/s3/model/S3Object\.java$"/>- <suppress id="NoVar" files="/floci/services/s3tables/S3TablesServiceTest\.java$"/><suppress id="NoVar" files="/floci/services/scheduler/SchedulerIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/securityadmin/SecurityAdminController\.java$"/>- <suppress id="NoVar" files="/floci/services/securityhub/SecurityHubController\.java$"/>- <suppress id="NoVar" files="/floci/services/securityhub/SecurityHubOrganizationIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/servicecatalog/ServiceCatalogJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/ses/SesBulkV1IntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ses/SesEventPayloadTest\.java$"/><suppress id="NoVar" files="/floci/services/ses/SesQueryHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/ses/SesTenantServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ses/SesTestRenderV2IntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ses/SmtpRelay\.java$"/>- <suppress id="NoVar" files="/floci/services/signin/SigninIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/signin/SigninServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/sns/SnsJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/sns/SnsMobilePushTest\.java$"/>- <suppress id="NoVar" files="/floci/services/sns/SnsQueryHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/sns/SnsService\.java$"/>- <suppress id="NoVar" files="/floci/services/sns/SnsSqsFanoutFifoDeliveryTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ssm/SsmDirectCommandExecutor\.java$"/>- <suppress id="NoVar" files="/floci/services/ssoadmin/SsoAdminJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/ssoadmin/SsoAdminService\.java$"/>- <suppress id="NoVar" files="/floci/services/ssoadmin/SsoAdminServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ssooidc/SsoOidcController\.java$"/>- <suppress id="NoVar" files="/floci/services/ssooidc/SsoOidcIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ssooidc/SsoOidcServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ssoportal/SsoPortalController\.java$"/>- <suppress id="NoVar" files="/floci/services/ssoportal/SsoPortalIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/ssoportal/SsoPortalService\.java$"/>- <suppress id="NoVar" files="/floci/services/ssoportal/SsoPortalServiceTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/AslExecutor\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/AslExecutorBranchHistoryEventsTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/AslExecutorHttpInvokeTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/AslExecutorIntrinsicMissingArgumentTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/AslExecutorMockedResponsesTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/AslExecutorNestedStartExecutionTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/AslExecutorRetryTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/AslExecutorTaskHistoryEventsTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/AslExecutorUnresolvableJsonPathTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/ChoiceOperators\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/HistoryChain\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/HistoryChainTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/JsonataEdgeCaseTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/SfnMockLoader\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/SfnMockLoaderTest\.java$"/><suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsAwsSdkTaskIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsDescribeMapRunIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsExecutionHistoryIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsExpressStartExecutionIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsIntrinsicMissingArgumentIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsJsonHandler\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsMockedServiceIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsPutEventsIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsRetryIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsService\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsStartSyncExecutionIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/stepfunctions/StepFunctionsUnresolvableJsonPathIntegrationTest\.java$"/>- <suppress id="NoVar" files="/floci/services/verifiedpermissions/CedarAuthorizationEvaluator\.java$"/>- <suppress id="NoVar" files="/floci/services/verifiedpermissions/VerifiedPermissionsService\.java$"/>- <suppress id="NoVar" files="/floci/services/verifiedpermissions/VerifiedPermissionsTokenService\.java$"/>- <suppress id="NoVar" files="/floci/tools/ami/AmiImageToolTest\.java$"/></suppressions>