Light, fluffy, and always free - The AWS Local Emulator alternative
build: enforce Java import order with Checkstyle (#5326)
David Phillipsda6a7dd085a9
diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.ymlindex efa7869690..74728d12e6 100644--- a/.github/workflows/checkstyle.yml+++ b/.github/workflows/checkstyle.yml@@ -51,3 +51,6 @@ jobs:- name: Run Checkstylerun: ./mvnw -B checkstyle:check++ - name: Test import-order rules+ run: python3 tools/checkstyle/test_import_order.pydiff --git a/AGENTS.md b/AGENTS.mdindex af085b20f2..7f1343f8b2 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -445,9 +445,10 @@ Floci-side rules:- No wildcard imports in `src/main`. Static wildcards stay fine in tests, where`Assertions.*`, `Mockito.*` and `Matchers.*` are the established idiom.-- Import order: non-`java`/`javax` imports alphabetically, then `java.*` and- `javax.*` last. This is the IntelliJ default layout and what most of the tree- already uses.+- Import order: non-`java`/`javax` imports, then `javax.*`, then `java.*`, then+ static imports. Alphabetize each group. Separate the non-JDK, JDK, and static+ sections with a blank line; no blank line is needed between `javax` and `java`.+ This follows IntelliJ's default layout and is enforced by Checkstyle.### Conventions the codebase already followsdiff --git a/CONTRIBUTING.md b/CONTRIBUTING.mdindex d3c4dfb5df..54091e00ac 100644--- a/CONTRIBUTING.md+++ b/CONTRIBUTING.md@@ -155,6 +155,9 @@ before your first PR:`new ArrayList<>()`, never `new java.util.ArrayList<>()`. Qualify inline only fora genuine name collision in that file, and say in a comment what collides.- **No wildcard imports in `src/main`.** Static wildcards are fine in tests.+- **Keep imports ordered.** Alphabetize non-JDK imports, then `javax`, then+ `java`, then static imports. Use blank lines between sections, except between+ `javax` and `java`, matching IntelliJ's default layout.- **Never leave a `catch` block empty.** If swallowing is correct, name thevariable `ignored` or `expected` and say why in a comment.- **Always use braces in conditionals**, and use constructor injection.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 d46257e087..e7b3725b46 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@@ -2,129 +2,111 @@ package com.floci.test;import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;+import software.amazon.awssdk.core.SdkBytes;+import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;+import software.amazon.awssdk.core.exception.SdkClientException;+import software.amazon.awssdk.endpoints.Endpoint;+import software.amazon.awssdk.http.Protocol;+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;import software.amazon.awssdk.regions.Region;import software.amazon.awssdk.regions.RegionMetadata;-import software.amazon.awssdk.services.account.AccountClient;import software.amazon.awssdk.services.accessanalyzer.AccessAnalyzerClient;-import software.amazon.awssdk.services.redshiftserverless.RedshiftServerlessClient;+import software.amazon.awssdk.services.account.AccountClient;+import software.amazon.awssdk.services.acm.AcmClient;+import software.amazon.awssdk.services.amp.AmpClient;+import software.amazon.awssdk.services.apigateway.ApiGatewayClient;+import software.amazon.awssdk.services.apigatewayv2.ApiGatewayV2Client;+import software.amazon.awssdk.services.appconfig.AppConfigClient;+import software.amazon.awssdk.services.appconfigdata.AppConfigDataClient;+import software.amazon.awssdk.services.appintegrations.AppIntegrationsClient;+import software.amazon.awssdk.services.appsync.AppSyncClient;+import software.amazon.awssdk.services.athena.AthenaClient;+import software.amazon.awssdk.services.athena.model.GetQueryExecutionRequest;+import software.amazon.awssdk.services.athena.model.QueryExecutionState;+import software.amazon.awssdk.services.athena.model.QueryExecutionStatus;+import software.amazon.awssdk.services.autoscaling.AutoScalingClient;+import software.amazon.awssdk.services.backup.BackupClient;+import software.amazon.awssdk.services.bcmpricingcalculator.BcmPricingCalculatorClient;+import software.amazon.awssdk.services.bedrock.BedrockClient;+import software.amazon.awssdk.services.bedrockagentcore.BedrockAgentCoreClient;+import software.amazon.awssdk.services.bedrockagentcorecontrol.BedrockAgentCoreControlClient;+import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient;+import software.amazon.awssdk.services.budgets.BudgetsClient;import software.amazon.awssdk.services.cloudformation.CloudFormationClient;-import software.amazon.awssdk.services.cloudhsmv2.CloudHsmV2Client;import software.amazon.awssdk.services.cloudfront.CloudFrontClient;+import software.amazon.awssdk.services.cloudhsmv2.CloudHsmV2Client;import software.amazon.awssdk.services.cloudtrail.CloudTrailClient;import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;import software.amazon.awssdk.services.codeartifact.CodeartifactClient;+import software.amazon.awssdk.services.codebuild.CodeBuildClient;+import software.amazon.awssdk.services.codedeploy.CodeDeployClient;+import software.amazon.awssdk.services.codepipeline.CodePipelineClient;import software.amazon.awssdk.services.cognitoidentityprovider.CognitoIdentityProviderClient;+import software.amazon.awssdk.services.controlcatalog.ControlCatalogClient;+import software.amazon.awssdk.services.databasemigration.DatabaseMigrationClient;+import software.amazon.awssdk.services.datasync.DataSyncClient;+import software.amazon.awssdk.services.detective.DetectiveClient;+import software.amazon.awssdk.services.dlm.DlmClient;import 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.ec2.Ec2Client;+import software.amazon.awssdk.services.ecr.EcrClient;+import software.amazon.awssdk.services.ecs.EcsClient;+import software.amazon.awssdk.services.efs.EfsClient;+import software.amazon.awssdk.services.eks.EksClient;+import software.amazon.awssdk.services.elasticache.ElastiCacheClient;+import software.amazon.awssdk.services.elasticbeanstalk.ElasticBeanstalkClient;+import software.amazon.awssdk.services.elasticloadbalancingv2.ElasticLoadBalancingV2Client;import software.amazon.awssdk.services.emr.EmrClient;import software.amazon.awssdk.services.emrserverless.EmrServerlessClient;-import software.amazon.awssdk.services.wafv2.Wafv2Client;+import software.amazon.awssdk.services.eventbridge.EventBridgeClient;+import software.amazon.awssdk.services.firehose.FirehoseClient;+import software.amazon.awssdk.services.fis.FisClient;+import software.amazon.awssdk.services.globalaccelerator.GlobalAcceleratorClient;+import software.amazon.awssdk.services.glue.GlueClient;+import software.amazon.awssdk.services.guardduty.GuardDutyClient;import software.amazon.awssdk.services.iam.IamClient;+import software.amazon.awssdk.services.identitystore.IdentitystoreClient;+import software.amazon.awssdk.services.inspector2.Inspector2Client;+import software.amazon.awssdk.services.iot.IotClient;+import software.amazon.awssdk.services.iotdataplane.IotDataPlaneClient;+import software.amazon.awssdk.services.iotjobsdataplane.IotJobsDataPlaneClient;+import software.amazon.awssdk.services.kafka.KafkaClient;import software.amazon.awssdk.services.kinesis.KinesisAsyncClient;import software.amazon.awssdk.services.kinesis.KinesisClient;-import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;-import software.amazon.awssdk.http.Protocol;+import software.amazon.awssdk.services.kinesisanalyticsv2.KinesisAnalyticsV2Client;import software.amazon.awssdk.services.kms.KmsClient;import software.amazon.awssdk.services.lambda.LambdaClient;-import software.amazon.awssdk.services.opensearch.OpenSearchClient;-import software.amazon.awssdk.services.oam.OamClient;-import software.amazon.awssdk.services.neptune.NeptuneClient;-import software.amazon.awssdk.services.rds.RdsClient;-import software.amazon.awssdk.services.redshift.RedshiftClient;-import software.amazon.awssdk.services.redshiftdata.RedshiftDataClient;-import software.amazon.awssdk.services.guardduty.GuardDutyClient;-import software.amazon.awssdk.services.fis.FisClient;-import software.amazon.awssdk.services.organizations.OrganizationsClient;-import software.amazon.awssdk.services.sso.SsoClient;-import software.amazon.awssdk.services.ssoadmin.SsoAdminClient;-import software.amazon.awssdk.services.ssooidc.SsoOidcClient;-import software.amazon.awssdk.services.identitystore.IdentitystoreClient;-import software.amazon.awssdk.services.budgets.BudgetsClient;-import software.amazon.awssdk.services.bcmpricingcalculator.BcmPricingCalculatorClient;-import software.amazon.awssdk.services.timestreaminfluxdb.TimestreamInfluxDbClient;-import software.amazon.awssdk.services.transfer.TransferClient;+import software.amazon.awssdk.services.lambda.model.CreateFunctionRequest;+import software.amazon.awssdk.services.lambda.model.DeleteFunctionRequest;+import software.amazon.awssdk.services.lambda.model.FunctionCode;+import software.amazon.awssdk.services.lambda.model.InvocationType;+import software.amazon.awssdk.services.lambda.model.InvokeRequest;+import software.amazon.awssdk.services.lambda.model.InvokeResponse;+import software.amazon.awssdk.services.lambda.model.Runtime;+import software.amazon.awssdk.services.lightsail.LightsailClient;import software.amazon.awssdk.services.macie2.Macie2Client;-import software.amazon.awssdk.services.controlcatalog.ControlCatalogClient;-import software.amazon.awssdk.services.marketplacecatalog.MarketplaceCatalogClient;import software.amazon.awssdk.services.marketplaceagreement.MarketplaceAgreementClient;-import software.amazon.awssdk.services.marketplaceentitlement.MarketplaceEntitlementClient;-import software.amazon.awssdk.services.verifiedpermissions.VerifiedPermissionsClient;+import software.amazon.awssdk.services.marketplacecatalog.MarketplaceCatalogClient;import software.amazon.awssdk.services.marketplacedeployment.MarketplaceDeploymentClient;-import software.amazon.awssdk.services.marketplacereporting.MarketplaceReportingClient;-import software.amazon.awssdk.services.marketplacemetering.MarketplaceMeteringClient;import software.amazon.awssdk.services.marketplacediscovery.MarketplaceDiscoveryClient;-import software.amazon.awssdk.services.inspector2.Inspector2Client;-import software.amazon.awssdk.services.securityhub.SecurityHubClient;-import software.amazon.awssdk.services.databasemigration.DatabaseMigrationClient;-import software.amazon.awssdk.services.detective.DetectiveClient;-import software.amazon.awssdk.services.globalaccelerator.GlobalAcceleratorClient;-import software.amazon.awssdk.services.rum.RumClient;-import software.amazon.awssdk.services.resourceexplorer2.ResourceExplorer2Client;-import software.amazon.awssdk.services.ram.RamClient;-import software.amazon.awssdk.services.s3.S3AsyncClient;-import software.amazon.awssdk.services.s3.S3Client;-import software.amazon.awssdk.endpoints.Endpoint;-import software.amazon.awssdk.services.s3control.S3ControlClient;-import software.amazon.awssdk.services.s3control.endpoints.S3ControlEndpointProvider;-import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;-import software.amazon.awssdk.services.ses.SesClient;-import software.amazon.awssdk.services.sesv2.SesV2Client;-import software.amazon.awssdk.services.sfn.SfnClient;-import software.amazon.awssdk.services.signin.SigninClient;-import software.amazon.awssdk.services.swf.SwfClient;-import software.amazon.awssdk.services.sns.SnsClient;-import software.amazon.awssdk.services.sqs.SqsClient;-import software.amazon.awssdk.services.ssm.SsmClient;-import software.amazon.awssdk.services.sts.StsClient;-import software.amazon.awssdk.services.kafka.KafkaClient;+import software.amazon.awssdk.services.marketplaceentitlement.MarketplaceEntitlementClient;+import software.amazon.awssdk.services.marketplacemetering.MarketplaceMeteringClient;+import software.amazon.awssdk.services.marketplacereporting.MarketplaceReportingClient;import software.amazon.awssdk.services.mq.MqClient;-import software.amazon.awssdk.services.kinesisanalyticsv2.KinesisAnalyticsV2Client;-import software.amazon.awssdk.services.athena.AthenaClient;-import software.amazon.awssdk.services.athena.model.GetQueryExecutionRequest;-import software.amazon.awssdk.services.athena.model.QueryExecutionState;-import software.amazon.awssdk.services.athena.model.QueryExecutionStatus;-import software.amazon.awssdk.services.glue.GlueClient;-import software.amazon.awssdk.services.firehose.FirehoseClient;-import software.amazon.awssdk.services.resourcegroupstaggingapi.ResourceGroupsTaggingApiClient;-import software.amazon.awssdk.services.apigateway.ApiGatewayClient;-import software.amazon.awssdk.services.apigatewayv2.ApiGatewayV2Client;-import software.amazon.awssdk.services.elasticache.ElastiCacheClient;-import software.amazon.awssdk.services.elasticbeanstalk.ElasticBeanstalkClient;-import software.amazon.awssdk.services.acm.AcmClient;-import software.amazon.awssdk.services.amp.AmpClient;-import software.amazon.awssdk.services.efs.EfsClient;-import software.amazon.awssdk.services.ec2.Ec2Client;-import software.amazon.awssdk.services.ecr.EcrClient;-import software.amazon.awssdk.services.bedrock.BedrockClient;-import software.amazon.awssdk.services.bedrockagentcore.BedrockAgentCoreClient;-import software.amazon.awssdk.services.bedrockagentcorecontrol.BedrockAgentCoreControlClient;-import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient;+import software.amazon.awssdk.services.neptune.NeptuneClient;+import software.amazon.awssdk.services.oam.OamClient;+import software.amazon.awssdk.services.opensearch.OpenSearchClient;+import software.amazon.awssdk.services.organizations.OrganizationsClient;import software.amazon.awssdk.services.pipes.PipesClient;-import software.amazon.awssdk.services.codebuild.CodeBuildClient;-import software.amazon.awssdk.services.sagemaker.SageMakerClient;-import software.amazon.awssdk.services.sagemakerruntime.SageMakerRuntimeClient;-import software.amazon.awssdk.services.codedeploy.CodeDeployClient;-import software.amazon.awssdk.services.codepipeline.CodePipelineClient;-import software.amazon.awssdk.services.ecs.EcsClient;-import software.amazon.awssdk.services.eks.EksClient;-import software.amazon.awssdk.services.iot.IotClient;-import software.amazon.awssdk.services.iotdataplane.IotDataPlaneClient;-import software.amazon.awssdk.services.iotjobsdataplane.IotJobsDataPlaneClient;-import software.amazon.awssdk.services.scheduler.SchedulerClient;-import software.amazon.awssdk.services.appconfig.AppConfigClient;-import software.amazon.awssdk.services.appconfigdata.AppConfigDataClient;-import software.amazon.awssdk.services.appintegrations.AppIntegrationsClient;-import software.amazon.awssdk.services.dlm.DlmClient;-import software.amazon.awssdk.services.datasync.DataSyncClient;-import software.amazon.awssdk.services.autoscaling.AutoScalingClient;-import software.amazon.awssdk.services.backup.BackupClient;-import software.amazon.awssdk.services.elasticloadbalancingv2.ElasticLoadBalancingV2Client;-import software.amazon.awssdk.services.appsync.AppSyncClient;-import software.amazon.awssdk.services.lightsail.LightsailClient;+import software.amazon.awssdk.services.ram.RamClient;+import software.amazon.awssdk.services.rds.RdsClient;+import software.amazon.awssdk.services.redshift.RedshiftClient;+import software.amazon.awssdk.services.redshiftdata.RedshiftDataClient;+import software.amazon.awssdk.services.redshiftserverless.RedshiftServerlessClient;+import software.amazon.awssdk.services.resourceexplorer2.ResourceExplorer2Client;+import software.amazon.awssdk.services.resourceexplorer2.ResourceExplorer2ClientBuilder;+import software.amazon.awssdk.services.resourcegroupstaggingapi.ResourceGroupsTaggingApiClient;import software.amazon.awssdk.services.route53.Route53Client;import software.amazon.awssdk.services.route53.model.Change;import software.amazon.awssdk.services.route53.model.ChangeAction;@@ -135,40 +117,55 @@ import software.amazon.awssdk.services.route53.model.CreateHostedZoneResponse;import software.amazon.awssdk.services.route53.model.RRType;import software.amazon.awssdk.services.route53.model.ResourceRecord;import software.amazon.awssdk.services.route53.model.ResourceRecordSet;-import software.amazon.awssdk.services.s3vectors.S3VectorsClient;+import software.amazon.awssdk.services.rum.RumClient;+import software.amazon.awssdk.services.s3.S3AsyncClient;+import software.amazon.awssdk.services.s3.S3Client;+import software.amazon.awssdk.services.s3control.S3ControlClient;+import software.amazon.awssdk.services.s3control.endpoints.S3ControlEndpointProvider;import software.amazon.awssdk.services.s3tables.S3TablesClient;--import software.amazon.awssdk.core.SdkBytes;-import software.amazon.awssdk.services.lambda.model.CreateFunctionRequest;-import software.amazon.awssdk.services.lambda.model.DeleteFunctionRequest;-import software.amazon.awssdk.services.lambda.model.FunctionCode;-import software.amazon.awssdk.services.lambda.model.InvokeRequest;-import software.amazon.awssdk.services.lambda.model.InvokeResponse;-import software.amazon.awssdk.services.lambda.model.InvocationType;-import software.amazon.awssdk.services.lambda.model.Runtime;+import software.amazon.awssdk.services.s3vectors.S3VectorsClient;+import software.amazon.awssdk.services.sagemaker.SageMakerClient;+import software.amazon.awssdk.services.sagemakerruntime.SageMakerRuntimeClient;+import software.amazon.awssdk.services.scheduler.SchedulerClient;+import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;+import software.amazon.awssdk.services.securityhub.SecurityHubClient;+import software.amazon.awssdk.services.servicediscovery.ServiceDiscoveryClient;+import software.amazon.awssdk.services.ses.SesClient;+import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.CreateEmailIdentityRequest;import software.amazon.awssdk.services.sesv2.model.CreateEmailIdentityResponse;import software.amazon.awssdk.services.sesv2.model.GetEmailIdentityRequest;+import software.amazon.awssdk.services.sfn.SfnClient;+import software.amazon.awssdk.services.signin.SigninClient;+import software.amazon.awssdk.services.sns.SnsClient;+import software.amazon.awssdk.services.sqs.SqsClient;+import software.amazon.awssdk.services.ssm.SsmClient;+import software.amazon.awssdk.services.sso.SsoClient;+import software.amazon.awssdk.services.ssoadmin.SsoAdminClient;+import software.amazon.awssdk.services.ssooidc.SsoOidcClient;+import software.amazon.awssdk.services.sts.StsClient;+import software.amazon.awssdk.services.swf.SwfClient;+import software.amazon.awssdk.services.timestreaminfluxdb.TimestreamInfluxDbClient;+import software.amazon.awssdk.services.transfer.TransferClient;+import software.amazon.awssdk.services.verifiedpermissions.VerifiedPermissionsClient;+import software.amazon.awssdk.services.wafv2.Wafv2Client;+import javax.net.ssl.SSLContext;+import javax.net.ssl.TrustManager;+import javax.net.ssl.X509TrustManager;import java.io.ByteArrayOutputStream;import java.net.URI;import java.net.http.HttpClient;+import java.nio.charset.StandardCharsets;import java.security.GeneralSecurityException;import java.security.SecureRandom;import java.security.cert.X509Certificate;--import javax.net.ssl.SSLContext;-import javax.net.ssl.TrustManager;-import javax.net.ssl.X509TrustManager;-import java.nio.charset.StandardCharsets;import java.time.Duration;import java.util.List;import java.util.UUID;import java.util.zip.ZipEntry;import java.util.zip.ZipOutputStream;-import software.amazon.awssdk.core.exception.SdkClientException;-/*** Shared test utilities and AWS client factories.*/diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayAccountCompatibilityTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayAccountCompatibilityTest.javaindex dfaf92215b..835074bfd8 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayAccountCompatibilityTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayAccountCompatibilityTest.java@@ -1,12 +1,13 @@package com.floci.test;import org.junit.jupiter.api.Test;-import static org.assertj.core.api.Assertions.assertThat;import software.amazon.awssdk.services.apigateway.ApiGatewayClient;import software.amazon.awssdk.services.apigateway.model.GetAccountRequest;import software.amazon.awssdk.services.apigateway.model.GetAccountResponse;-import software.amazon.awssdk.services.apigateway.model.UpdateAccountRequest;import software.amazon.awssdk.services.apigateway.model.PatchOperation;+import software.amazon.awssdk.services.apigateway.model.UpdateAccountRequest;++import static org.assertj.core.api.Assertions.assertThat;class ApiGatewayAccountCompatibilityTest {diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayOpenApiImportCompatibilityTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayOpenApiImportCompatibilityTest.javaindex 54be27e265..0272aa7397 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayOpenApiImportCompatibilityTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ApiGatewayOpenApiImportCompatibilityTest.java@@ -5,9 +5,9 @@ import org.junit.jupiter.api.Test;import software.amazon.awssdk.core.SdkBytes;import software.amazon.awssdk.services.apigateway.ApiGatewayClient;import software.amazon.awssdk.services.apigateway.model.BadRequestException;+import software.amazon.awssdk.services.apigateway.model.GatewayResponseType;import software.amazon.awssdk.services.apigateway.model.GetIntegrationResponse;import software.amazon.awssdk.services.apigateway.model.GetMethodResponse;-import software.amazon.awssdk.services.apigateway.model.GatewayResponseType;import software.amazon.awssdk.services.apigateway.model.ImportRestApiResponse;import software.amazon.awssdk.services.apigateway.model.NotFoundException;import software.amazon.awssdk.services.apigateway.model.PutMode;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 666b2369bf..c8eb70c99c 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@@ -13,11 +13,11 @@ import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;import software.amazon.awssdk.core.SdkBytes;import software.amazon.awssdk.services.apigatewaymanagementapi.ApiGatewayManagementApiClient;+import software.amazon.awssdk.services.apigatewaymanagementapi.model.DeleteConnectionRequest;import software.amazon.awssdk.services.apigatewaymanagementapi.model.GetConnectionRequest;import software.amazon.awssdk.services.apigatewaymanagementapi.model.GetConnectionResponse;import software.amazon.awssdk.services.apigatewaymanagementapi.model.GoneException;import software.amazon.awssdk.services.apigatewaymanagementapi.model.PostToConnectionRequest;-import software.amazon.awssdk.services.apigatewaymanagementapi.model.DeleteConnectionRequest;import software.amazon.awssdk.services.apigatewayv2.ApiGatewayV2Client;import software.amazon.awssdk.services.apigatewayv2.model.*;import software.amazon.awssdk.services.lambda.LambdaClient;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 c4fe5a54f0..27a44c53ae 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@@ -3,10 +3,10 @@ package com.floci.test;import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;+import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import org.junit.jupiter.api.MethodOrderer;import software.amazon.awssdk.services.bedrockagentcorecontrol.BedrockAgentCoreControlClient;import software.amazon.awssdk.services.bedrockagentcorecontrol.model.CreateApiKeyCredentialProviderRequest;import software.amazon.awssdk.services.bedrockagentcorecontrol.model.CreateApiKeyCredentialProviderResponse;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 9d93ba2fa5..6393ce5ec9 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@@ -3,12 +3,13 @@ package com.floci.test;import org.junit.jupiter.api.Test;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.interceptor.*;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;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFormationCloudWatchDashboardTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFormationCloudWatchDashboardTest.javaindex 5aba65a442..d05b079054 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFormationCloudWatchDashboardTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFormationCloudWatchDashboardTest.java@@ -11,8 +11,8 @@ import software.amazon.awssdk.services.cloudformation.model.Output;import software.amazon.awssdk.services.cloudformation.model.Parameter;import software.amazon.awssdk.services.cloudformation.model.Stack;import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;-import software.amazon.awssdk.services.cloudwatch.model.GetDashboardResponse;import software.amazon.awssdk.services.cloudwatch.model.CloudWatchException;+import software.amazon.awssdk.services.cloudwatch.model.GetDashboardResponse;import software.amazon.awssdk.services.cloudwatch.model.Tag;import java.util.List;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFormationStepFunctionsUpdateTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFormationStepFunctionsUpdateTest.javaindex 705daea521..34d3cfc831 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFormationStepFunctionsUpdateTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudFormationStepFunctionsUpdateTest.java@@ -1,9 +1,5 @@package com.floci.test;-import java.util.List;-import java.util.logging.Level;-import java.util.logging.Logger;-import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;@@ -16,6 +12,10 @@ import software.amazon.awssdk.services.cloudformation.model.StackResource;import software.amazon.awssdk.services.sfn.SfnClient;import software.amazon.awssdk.services.sfn.model.DescribeStateMachineResponse;+import java.util.List;+import java.util.logging.Level;+import java.util.logging.Logger;+import static org.assertj.core.api.Assertions.assertThat;@DisplayName("CloudFormation Step Functions update")diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudHsmV2Test.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudHsmV2Test.javaindex b100ca29bb..45b1e8fe1b 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudHsmV2Test.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudHsmV2Test.java@@ -1,10 +1,5 @@package com.floci.test;-import org.junit.jupiter.api.Test;-import software.amazon.awssdk.services.cloudhsmv2.CloudHsmV2Client;-import software.amazon.awssdk.services.cloudhsmv2.model.*;--import java.util.List;import org.bouncycastle.asn1.x500.X500Name;import org.bouncycastle.cert.X509v3CertificateBuilder;import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;@@ -13,6 +8,9 @@ import org.bouncycastle.operator.ContentSigner;import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;import org.bouncycastle.util.io.pem.PemObject;import org.bouncycastle.util.io.pem.PemWriter;+import org.junit.jupiter.api.Test;+import software.amazon.awssdk.services.cloudhsmv2.CloudHsmV2Client;+import software.amazon.awssdk.services.cloudhsmv2.model.*;import java.io.StringWriter;import java.math.BigInteger;@@ -20,6 +18,7 @@ import java.security.KeyPair;import java.security.KeyPairGenerator;import java.security.cert.X509Certificate;import java.util.Date;+import java.util.List;import static org.assertj.core.api.Assertions.assertThat;import static org.assertj.core.api.Assertions.assertThatThrownBy;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeArtifactTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeArtifactTest.javaindex c75aed6eb0..a75cbe6cb8 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeArtifactTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeArtifactTest.java@@ -1,12 +1,13 @@package com.floci.test;+// Explicit import: this file's Tag usage is the CodeArtifact model type, not JUnit's @Tag.+import org.jboss.logging.Logger;import org.junit.jupiter.api.*;import software.amazon.awssdk.core.ResponseBytes;import software.amazon.awssdk.core.sync.RequestBody;import software.amazon.awssdk.services.codeartifact.CodeartifactClient;import software.amazon.awssdk.services.codeartifact.model.*;-// Explicit import: this file's Tag usage is the CodeArtifact model type, not JUnit's @Tag.import software.amazon.awssdk.services.codeartifact.model.Tag;import java.nio.charset.StandardCharsets;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeBuildTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeBuildTest.javaindex e642a8d5ee..e854cf7403 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeBuildTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CodeBuildTest.java@@ -8,13 +8,18 @@ import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;import software.amazon.awssdk.services.codebuild.CodeBuildClient;import software.amazon.awssdk.services.codebuild.model.ArtifactsType;+import software.amazon.awssdk.services.codebuild.model.AuthType;+import software.amazon.awssdk.services.codebuild.model.BatchGetBuildsResponse;import software.amazon.awssdk.services.codebuild.model.BatchGetProjectsResponse;+import software.amazon.awssdk.services.codebuild.model.Build;import software.amazon.awssdk.services.codebuild.model.ComputeType;import software.amazon.awssdk.services.codebuild.model.CreateProjectResponse;import software.amazon.awssdk.services.codebuild.model.CreateReportGroupResponse;import software.amazon.awssdk.services.codebuild.model.DeleteReportGroupRequest;import software.amazon.awssdk.services.codebuild.model.EnvironmentType;import software.amazon.awssdk.services.codebuild.model.ImportSourceCredentialsResponse;+import software.amazon.awssdk.services.codebuild.model.ListBuildsForProjectResponse;+import software.amazon.awssdk.services.codebuild.model.ListBuildsResponse;import software.amazon.awssdk.services.codebuild.model.ListCuratedEnvironmentImagesResponse;import software.amazon.awssdk.services.codebuild.model.ListProjectsResponse;import software.amazon.awssdk.services.codebuild.model.ListReportGroupsResponse;@@ -25,19 +30,14 @@ import software.amazon.awssdk.services.codebuild.model.ProjectSource;import software.amazon.awssdk.services.codebuild.model.ReportExportConfig;import software.amazon.awssdk.services.codebuild.model.ReportExportConfigType;import software.amazon.awssdk.services.codebuild.model.ReportType;-import software.amazon.awssdk.services.codebuild.model.AuthType;+import software.amazon.awssdk.services.codebuild.model.RetryBuildResponse;import software.amazon.awssdk.services.codebuild.model.ServerType;import software.amazon.awssdk.services.codebuild.model.SourceType;-import software.amazon.awssdk.services.codebuild.model.BatchGetBuildsResponse;-import software.amazon.awssdk.services.codebuild.model.Build;-import software.amazon.awssdk.services.codebuild.model.ListBuildsForProjectResponse;-import software.amazon.awssdk.services.codebuild.model.ListBuildsResponse;-import software.amazon.awssdk.services.codebuild.model.RetryBuildResponse;import software.amazon.awssdk.services.codebuild.model.StartBuildResponse;-import software.amazon.awssdk.services.s3.S3Client;-import software.amazon.awssdk.services.s3.model.GetObjectRequest;import software.amazon.awssdk.services.codebuild.model.Tag;import software.amazon.awssdk.services.codebuild.model.UpdateProjectResponse;+import software.amazon.awssdk.services.s3.S3Client;+import software.amazon.awssdk.services.s3.model.GetObjectRequest;import static org.assertj.core.api.Assertions.assertThat;import static org.assertj.core.api.Assertions.assertThatThrownBy;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 d23d9138e2..f12dcda52b 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@@ -11,8 +11,8 @@ import software.amazon.awssdk.services.codedeploy.CodeDeployClient;import software.amazon.awssdk.services.codedeploy.model.AppSpecContent;import software.amazon.awssdk.services.codedeploy.model.BatchGetApplicationsResponse;import software.amazon.awssdk.services.codedeploy.model.BatchGetDeploymentGroupsResponse;-import software.amazon.awssdk.services.codedeploy.model.BatchGetDeploymentsResponse;import software.amazon.awssdk.services.codedeploy.model.BatchGetDeploymentTargetsResponse;+import software.amazon.awssdk.services.codedeploy.model.BatchGetDeploymentsResponse;import software.amazon.awssdk.services.codedeploy.model.ComputePlatform;import software.amazon.awssdk.services.codedeploy.model.CreateApplicationResponse;import software.amazon.awssdk.services.codedeploy.model.CreateDeploymentConfigResponse;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CognitoOptionalTotpMfaTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CognitoOptionalTotpMfaTest.javaindex 16af1b7e70..c1585491b4 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CognitoOptionalTotpMfaTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CognitoOptionalTotpMfaTest.java@@ -14,13 +14,13 @@ import software.amazon.awssdk.services.cognitoidentityprovider.model.MessageActiimport software.amazon.awssdk.services.cognitoidentityprovider.model.RespondToAuthChallengeResponse;import software.amazon.awssdk.services.cognitoidentityprovider.model.UserPoolMfaType;+import javax.crypto.Mac;+import javax.crypto.spec.SecretKeySpec;import java.nio.ByteBuffer;import java.time.Instant;import java.util.Locale;import java.util.Map;import java.util.UUID;-import javax.crypto.Mac;-import javax.crypto.spec.SecretKeySpec;import static org.assertj.core.api.Assertions.assertThat;import static org.assertj.core.api.Assertions.assertThatThrownBy;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 37e699821f..e4df330481 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@@ -8,9 +8,9 @@ import software.amazon.awssdk.services.controlcatalog.model.ImplementationFilterimport software.amazon.awssdk.services.controlcatalog.model.ListControlsResponse;import software.amazon.awssdk.services.controlcatalog.model.ResourceNotFoundException;-import static org.junit.jupiter.api.Assertions.assertEquals;import java.util.HashSet;+import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertThrows;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbExportTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbExportTest.javaindex 57d501794d..e6d9929ef5 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbExportTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbExportTest.java@@ -8,8 +8,8 @@ import software.amazon.awssdk.services.dynamodb.waiters.DynamoDbWaiter;import software.amazon.awssdk.services.s3.S3Client;import software.amazon.awssdk.services.s3.model.*;-import java.io.ByteArrayInputStream;import java.io.BufferedReader;+import java.io.ByteArrayInputStream;import java.io.InputStreamReader;import java.nio.charset.StandardCharsets;import java.util.List;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbTest.javaindex 22f5dfffa2..7ae4c33591 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbTest.java@@ -23,8 +23,8 @@ import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;import software.amazon.awssdk.services.dynamodb.model.IndexStatus;import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;-import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;import software.amazon.awssdk.services.dynamodb.model.KeyType;+import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;import software.amazon.awssdk.services.dynamodb.model.ListTablesResponse;import software.amazon.awssdk.services.dynamodb.model.ListTagsOfResourceRequest;import software.amazon.awssdk.services.dynamodb.model.ListTagsOfResourceResponse;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/EcsFargateTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/EcsFargateTest.javaindex ffc8829e3c..fc8f7a8830 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/EcsFargateTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/EcsFargateTest.java@@ -25,9 +25,9 @@ import software.amazon.awssdk.services.ecs.model.DescribeTaskDefinitionRequest;import software.amazon.awssdk.services.ecs.model.DescribeTasksRequest;import software.amazon.awssdk.services.ecs.model.DescribeTasksResponse;import software.amazon.awssdk.services.ecs.model.EcsException;-import software.amazon.awssdk.services.ecs.model.KeyValuePair;import software.amazon.awssdk.services.ecs.model.EphemeralStorage;import software.amazon.awssdk.services.ecs.model.ExecuteCommandRequest;+import software.amazon.awssdk.services.ecs.model.KeyValuePair;import software.amazon.awssdk.services.ecs.model.LaunchType;import software.amazon.awssdk.services.ecs.model.NetworkConfiguration;import software.amazon.awssdk.services.ecs.model.NetworkMode;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 de1ab84fa8..8e1ec42806 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@@ -12,9 +12,9 @@ import software.amazon.awssdk.services.elasticbeanstalk.model.CreateApplicationVimport 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.DescribeApplicationVersionsRequest;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;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/FirehoseCompressionDeliveryTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/FirehoseCompressionDeliveryTest.javaindex 23e3733cd7..7e24816d51 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/FirehoseCompressionDeliveryTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/FirehoseCompressionDeliveryTest.java@@ -9,6 +9,7 @@ import org.junit.jupiter.params.provider.MethodSource;import org.xerial.snappy.Snappy;import org.xerial.snappy.SnappyInputStream;import software.amazon.awssdk.core.ResponseInputStream;+import software.amazon.awssdk.core.SdkBytes;import software.amazon.awssdk.services.firehose.FirehoseClient;import software.amazon.awssdk.services.firehose.model.BufferingHints;import software.amazon.awssdk.services.firehose.model.CompressionFormat;@@ -25,7 +26,6 @@ import software.amazon.awssdk.services.s3.model.GetObjectRequest;import software.amazon.awssdk.services.s3.model.GetObjectResponse;import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;import software.amazon.awssdk.services.s3.model.S3Object;-import software.amazon.awssdk.core.SdkBytes;import java.io.ByteArrayInputStream;import java.io.ByteArrayOutputStream;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 a8c3ad1ae1..917053ae9b 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@@ -8,73 +8,73 @@ 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;-import software.amazon.awssdk.services.glue.model.ConnectionInput;-import software.amazon.awssdk.services.glue.model.ConnectionPropertyKey;-import software.amazon.awssdk.services.glue.model.ConnectionType;-import software.amazon.awssdk.services.glue.model.CreateConnectionRequest;-import software.amazon.awssdk.services.glue.model.DataCatalogEncryptionSettings;-import software.amazon.awssdk.services.glue.model.CreateConnectionResponse;-import software.amazon.awssdk.services.glue.model.DeleteConnectionRequest;-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.BatchDeleteTableResponse;import software.amazon.awssdk.services.glue.model.BatchGetPartitionRequest;import software.amazon.awssdk.services.glue.model.BatchUpdatePartitionRequest;import software.amazon.awssdk.services.glue.model.BatchUpdatePartitionRequestEntry;import software.amazon.awssdk.services.glue.model.Column;import software.amazon.awssdk.services.glue.model.ColumnStatistics;import software.amazon.awssdk.services.glue.model.ColumnStatisticsData;+import software.amazon.awssdk.services.glue.model.ConditionCheckFailureException;+import software.amazon.awssdk.services.glue.model.Connection;+import software.amazon.awssdk.services.glue.model.ConnectionInput;+import software.amazon.awssdk.services.glue.model.ConnectionPropertyKey;+import software.amazon.awssdk.services.glue.model.ConnectionType;+import software.amazon.awssdk.services.glue.model.CreateConnectionRequest;+import software.amazon.awssdk.services.glue.model.CreateConnectionResponse;import software.amazon.awssdk.services.glue.model.CreateDatabaseRequest;import software.amazon.awssdk.services.glue.model.CreatePartitionRequest;import software.amazon.awssdk.services.glue.model.CreateTableRequest;import software.amazon.awssdk.services.glue.model.CreateUserDefinedFunctionRequest;+import software.amazon.awssdk.services.glue.model.DataCatalogEncryptionSettings;import software.amazon.awssdk.services.glue.model.DatabaseInput;import software.amazon.awssdk.services.glue.model.DeleteColumnStatisticsForPartitionRequest;import software.amazon.awssdk.services.glue.model.DeleteColumnStatisticsForTableRequest;+import software.amazon.awssdk.services.glue.model.DeleteConnectionRequest;import software.amazon.awssdk.services.glue.model.DeleteDatabaseRequest;import software.amazon.awssdk.services.glue.model.DeletePartitionRequest;+import software.amazon.awssdk.services.glue.model.DeleteResourcePolicyRequest;import software.amazon.awssdk.services.glue.model.DeleteTableRequest;import software.amazon.awssdk.services.glue.model.DeleteUserDefinedFunctionRequest;import software.amazon.awssdk.services.glue.model.EntityNotFoundException;+import software.amazon.awssdk.services.glue.model.ExistCondition;import software.amazon.awssdk.services.glue.model.GetColumnStatisticsForPartitionRequest;+import software.amazon.awssdk.services.glue.model.GetColumnStatisticsForPartitionResponse;import software.amazon.awssdk.services.glue.model.GetColumnStatisticsForTableRequest;+import software.amazon.awssdk.services.glue.model.GetColumnStatisticsForTableResponse;+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.GetDataCatalogEncryptionSettingsRequest;import software.amazon.awssdk.services.glue.model.GetDatabaseRequest;import software.amazon.awssdk.services.glue.model.GetDatabasesRequest;import software.amazon.awssdk.services.glue.model.GetPartitionRequest;import software.amazon.awssdk.services.glue.model.GetPartitionsRequest;+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.GetTableRequest;import software.amazon.awssdk.services.glue.model.GetTablesRequest;import software.amazon.awssdk.services.glue.model.GetUserDefinedFunctionRequest;import software.amazon.awssdk.services.glue.model.GetUserDefinedFunctionsRequest;import software.amazon.awssdk.services.glue.model.LongColumnStatisticsData;+import software.amazon.awssdk.services.glue.model.Partition;import software.amazon.awssdk.services.glue.model.PartitionInput;import software.amazon.awssdk.services.glue.model.PartitionValueList;+import software.amazon.awssdk.services.glue.model.PhysicalConnectionRequirements;import software.amazon.awssdk.services.glue.model.PrincipalType;+import software.amazon.awssdk.services.glue.model.PutResourcePolicyRequest;import software.amazon.awssdk.services.glue.model.ResourceType;import software.amazon.awssdk.services.glue.model.ResourceUri;import software.amazon.awssdk.services.glue.model.SerDeInfo;import software.amazon.awssdk.services.glue.model.StorageDescriptor;+import software.amazon.awssdk.services.glue.model.Table;import software.amazon.awssdk.services.glue.model.TableInput;import software.amazon.awssdk.services.glue.model.UpdateColumnStatisticsForPartitionRequest;import software.amazon.awssdk.services.glue.model.UpdateColumnStatisticsForTableRequest;+import software.amazon.awssdk.services.glue.model.UpdateConnectionRequest;import software.amazon.awssdk.services.glue.model.UpdatePartitionRequest;import software.amazon.awssdk.services.glue.model.UpdateTableRequest;import software.amazon.awssdk.services.glue.model.UpdateUserDefinedFunctionRequest;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 3f181f5253..da9ffda61d 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@@ -39,9 +39,9 @@ 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.ListSchemaVersionsRequest;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;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/GuardDutyTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/GuardDutyTest.javaindex 41f34acb15..f631a56f4c 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/GuardDutyTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/GuardDutyTest.java@@ -9,9 +9,9 @@ import software.amazon.awssdk.services.guardduty.model.AutoEnableMembers;import software.amazon.awssdk.services.guardduty.model.BadRequestException;import software.amazon.awssdk.services.guardduty.model.CreateDetectorResponse;import software.amazon.awssdk.services.guardduty.model.DescribeOrganizationConfigurationResponse;+import software.amazon.awssdk.services.guardduty.model.DetectorAdditionalConfiguration;import software.amazon.awssdk.services.guardduty.model.DetectorFeature;import software.amazon.awssdk.services.guardduty.model.DetectorFeatureConfiguration;-import software.amazon.awssdk.services.guardduty.model.DetectorAdditionalConfiguration;import software.amazon.awssdk.services.guardduty.model.DetectorStatus;import software.amazon.awssdk.services.guardduty.model.FeatureAdditionalConfiguration;import software.amazon.awssdk.services.guardduty.model.FeatureStatus;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 97fc26b6b1..9999e02742 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@@ -31,9 +31,9 @@ import software.amazon.awssdk.services.identitystore.model.ListGroupMembershipsRimport software.amazon.awssdk.services.identitystore.model.ListGroupsRequest;import software.amazon.awssdk.services.identitystore.model.ListUsersRequest;import software.amazon.awssdk.services.identitystore.model.MemberId;+import software.amazon.awssdk.services.identitystore.model.UniqueAttribute;import software.amazon.awssdk.services.identitystore.model.UpdateGroupRequest;import software.amazon.awssdk.services.identitystore.model.UpdateUserRequest;-import software.amazon.awssdk.services.identitystore.model.UniqueAttribute;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;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 c1bff1fcb9..bfbc639301 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@@ -6,19 +6,19 @@ import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;import software.amazon.awssdk.core.SdkBytes;import software.amazon.awssdk.services.iot.IotClient;-import software.amazon.awssdk.services.iot.model.AttributePayload;+import software.amazon.awssdk.services.iot.model.Action;+import software.amazon.awssdk.services.iot.model.AddThingToThingGroupRequest;import software.amazon.awssdk.services.iot.model.AttachPolicyRequest;import software.amazon.awssdk.services.iot.model.AttachThingPrincipalRequest;+import software.amazon.awssdk.services.iot.model.AttributePayload;import software.amazon.awssdk.services.iot.model.AuthorizerConfig;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.CreateDomainConfigurationRequest;import software.amazon.awssdk.services.iot.model.CreateDomainConfigurationResponse;+import software.amazon.awssdk.services.iot.model.CreateJobRequest;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;@@ -31,9 +31,10 @@ 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;-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.DeleteTopicRuleRequest;+import software.amazon.awssdk.services.iot.model.DeprecateThingTypeRequest;import software.amazon.awssdk.services.iot.model.DescribeCertificateRequest;import software.amazon.awssdk.services.iot.model.DescribeCertificateResponse;import software.amazon.awssdk.services.iot.model.DescribeDomainConfigurationRequest;@@ -45,13 +46,12 @@ 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.DetachPolicyRequest;+import software.amazon.awssdk.services.iot.model.DetachThingPrincipalRequest;+import software.amazon.awssdk.services.iot.model.DisableTopicRuleRequest;import software.amazon.awssdk.services.iot.model.DomainConfigurationStatus;import software.amazon.awssdk.services.iot.model.DomainConfigurationSummary;import software.amazon.awssdk.services.iot.model.DomainType;-import software.amazon.awssdk.services.iot.model.DisableTopicRuleRequest;-import software.amazon.awssdk.services.iot.model.DeprecateThingTypeRequest;-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;@@ -66,31 +66,31 @@ import software.amazon.awssdk.services.iot.model.ListJobExecutionsForThingRequesimport 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.ListTagsForResourceRequest;import software.amazon.awssdk.services.iot.model.ListTagsForResourceResponse;import software.amazon.awssdk.services.iot.model.ListThingGroupsForThingRequest;+import software.amazon.awssdk.services.iot.model.ListThingPrincipalsRequest;import software.amazon.awssdk.services.iot.model.ListThingPrincipalsResponse;+import software.amazon.awssdk.services.iot.model.ListThingTypesRequest;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.ResourceAlreadyExistsException;+import software.amazon.awssdk.services.iot.model.ResourceNotFoundException;import software.amazon.awssdk.services.iot.model.ServerCertificateStatus;import software.amazon.awssdk.services.iot.model.ServiceType;import software.amazon.awssdk.services.iot.model.SqsAction;-import software.amazon.awssdk.services.iot.model.ResourceAlreadyExistsException;-import software.amazon.awssdk.services.iot.model.ResourceNotFoundException;import software.amazon.awssdk.services.iot.model.Tag;import software.amazon.awssdk.services.iot.model.TagResourceRequest;import software.amazon.awssdk.services.iot.model.ThingGroupProperties;import software.amazon.awssdk.services.iot.model.ThingTypeProperties;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.UpdateDomainConfigurationRequest;import software.amazon.awssdk.services.iot.model.UpdateDomainConfigurationResponse;import software.amazon.awssdk.services.iot.model.UpdateThingRequest;import software.amazon.awssdk.services.iot.model.UpdateThingTypeRequest;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 0ede6d66f3..3598636d37 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@@ -11,16 +11,16 @@ 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.ExpirationModelType;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;+import software.amazon.awssdk.services.kms.model.KeyState;import software.amazon.awssdk.services.kms.model.KeyUsageType;import software.amazon.awssdk.services.kms.model.KmsInvalidStateException;-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;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 06d6d11bf1..85d3bfe1a5 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@@ -4,9 +4,9 @@ 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;import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertNotNull;class MarketplaceReportingTest {diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MetricFilterQueryAssertions.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MetricFilterQueryAssertions.javaindex 4ea640a8cb..675c9df48f 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MetricFilterQueryAssertions.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MetricFilterQueryAssertions.java@@ -11,6 +11,8 @@ import software.amazon.awssdk.http.SdkHttpFullRequest;import software.amazon.awssdk.http.SdkHttpMethod;import software.amazon.awssdk.services.cloudwatch.model.Dimension;+import javax.xml.XMLConstants;+import javax.xml.parsers.DocumentBuilderFactory;import java.io.ByteArrayInputStream;import java.net.URLEncoder;import java.net.http.HttpClient;@@ -23,8 +25,6 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.xml.XMLConstants;-import javax.xml.parsers.DocumentBuilderFactory;import static org.assertj.core.api.Assertions.assertThat;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 9e5475bbb6..4b646da66a 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@@ -35,6 +35,7 @@ import software.amazon.awssdk.services.neptune.model.RemoveTagsFromResourceRequeimport 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;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/OrganizationsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/OrganizationsTest.javaindex 16dea8c308..3bb59028ce 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/OrganizationsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/OrganizationsTest.java@@ -2,8 +2,8 @@ package com.floci.test;import org.junit.jupiter.api.Test;import software.amazon.awssdk.services.organizations.OrganizationsClient;-import software.amazon.awssdk.services.organizations.model.Account;import software.amazon.awssdk.services.organizations.model.AccessDeniedException;+import software.amazon.awssdk.services.organizations.model.Account;import software.amazon.awssdk.services.organizations.model.AwsOrganizationsNotInUseException;import software.amazon.awssdk.services.organizations.model.ChildType;import software.amazon.awssdk.services.organizations.model.ConstraintViolationException;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 72897f48ea..814a664c4b 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@@ -31,10 +31,10 @@ 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.InvalidDbInstanceStateException;import software.amazon.awssdk.services.rds.model.InvalidOptionGroupStateException;import software.amazon.awssdk.services.rds.model.InvalidRestoreException;import software.amazon.awssdk.services.rds.model.ListTagsForResourceResponse;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RdsJdbcCompatTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RdsJdbcCompatTest.javaindex 9108634e55..7d5976c1f2 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RdsJdbcCompatTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RdsJdbcCompatTest.java@@ -3,10 +3,10 @@ package com.floci.test;import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.Assumptions;import org.junit.jupiter.api.DisplayName;+import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import org.junit.jupiter.api.MethodOrderer;import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;import software.amazon.awssdk.regions.Region;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftDataOperationsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftDataOperationsTest.javaindex 147fd8b788..7f0463fe3e 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftDataOperationsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftDataOperationsTest.java@@ -1,5 +1,6 @@package com.floci.test;+import org.jboss.logging.Logger;import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;@@ -15,8 +16,6 @@ import software.amazon.awssdk.services.redshiftdata.model.GetStatementResultRequimport software.amazon.awssdk.services.redshiftdata.model.GetStatementResultResponse;import software.amazon.awssdk.services.redshiftdata.model.StatusString;-import org.jboss.logging.Logger;-import java.time.Duration;import java.time.Instant;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 4565c09c2b..cffcf75aaf 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@@ -34,9 +34,9 @@ import software.amazon.awssdk.services.redshift.model.DescribeClusterSubnetGroupimport 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.DescribeOrderableClusterOptionsRequest;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;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftServerlessTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftServerlessTest.javaindex f5f017bf4a..3a55df883f 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftServerlessTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/RedshiftServerlessTest.java@@ -8,8 +8,8 @@ import software.amazon.awssdk.services.redshiftdata.model.DescribeStatementRespoimport software.amazon.awssdk.services.redshiftdata.model.ExecuteStatementResponse;import software.amazon.awssdk.services.redshiftdata.model.StatusString;import software.amazon.awssdk.services.redshiftserverless.RedshiftServerlessClient;-import software.amazon.awssdk.services.redshiftserverless.model.GetCredentialsResponse;import software.amazon.awssdk.services.redshiftserverless.model.ConflictException;+import software.amazon.awssdk.services.redshiftserverless.model.GetCredentialsResponse;import software.amazon.awssdk.services.redshiftserverless.model.Namespace;import software.amazon.awssdk.services.redshiftserverless.model.NamespaceStatus;import software.amazon.awssdk.services.redshiftserverless.model.ResourceNotFoundException;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Route53Test.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Route53Test.javaindex 4bf1e52bd0..37119226fe 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Route53Test.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Route53Test.java@@ -8,8 +8,8 @@ import software.amazon.awssdk.services.ec2.Ec2Client;import software.amazon.awssdk.services.ec2.model.CreateVpcRequest;import software.amazon.awssdk.services.ec2.model.DeleteVpcRequest;import software.amazon.awssdk.services.route53.Route53Client;-import software.amazon.awssdk.services.route53.model.CreateHostedZoneRequest;import software.amazon.awssdk.services.route53.model.AssociateVpcWithHostedZoneRequest;+import software.amazon.awssdk.services.route53.model.CreateHostedZoneRequest;import software.amazon.awssdk.services.route53.model.CreateHostedZoneResponse;import software.amazon.awssdk.services.route53.model.CreateVpcAssociationAuthorizationRequest;import software.amazon.awssdk.services.route53.model.DeleteHostedZoneRequest;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 becbe18380..767ceec471 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@@ -1,10 +1,6 @@package com.floci.test;import org.junit.jupiter.api.*;--import java.util.logging.Level;-import java.util.logging.Logger;-import software.amazon.awssdk.core.ResponseBytes;import software.amazon.awssdk.core.sync.RequestBody;import software.amazon.awssdk.services.s3.S3Client;@@ -22,6 +18,9 @@ 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 java.util.logging.Level;+import java.util.logging.Logger;+import static org.assertj.core.api.Assertions.*;@DisplayName("S3 Object Annotations")diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3ControlTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3ControlTest.javaindex 826cfcba03..a77d823cfa 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3ControlTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3ControlTest.java@@ -12,16 +12,16 @@ import software.amazon.awssdk.services.s3.model.PutBucketTaggingRequest;import software.amazon.awssdk.services.s3.model.Tag;import software.amazon.awssdk.services.s3.model.Tagging;import software.amazon.awssdk.services.s3control.S3ControlClient;+import software.amazon.awssdk.services.s3control.model.DeletePublicAccessBlockRequest;+import software.amazon.awssdk.services.s3control.model.GetPublicAccessBlockRequest;+import software.amazon.awssdk.services.s3control.model.GetPublicAccessBlockResponse;import software.amazon.awssdk.services.s3control.model.ListTagsForResourceRequest;import software.amazon.awssdk.services.s3control.model.ListTagsForResourceResponse;+import software.amazon.awssdk.services.s3control.model.PublicAccessBlockConfiguration;+import software.amazon.awssdk.services.s3control.model.PutPublicAccessBlockRequest;+import software.amazon.awssdk.services.s3control.model.S3ControlException;import software.amazon.awssdk.services.s3control.model.TagResourceRequest;import software.amazon.awssdk.services.s3control.model.UntagResourceRequest;-import software.amazon.awssdk.services.s3control.model.S3ControlException;-import software.amazon.awssdk.services.s3control.model.PutPublicAccessBlockRequest;-import software.amazon.awssdk.services.s3control.model.GetPublicAccessBlockRequest;-import software.amazon.awssdk.services.s3control.model.GetPublicAccessBlockResponse;-import software.amazon.awssdk.services.s3control.model.DeletePublicAccessBlockRequest;-import software.amazon.awssdk.services.s3control.model.PublicAccessBlockConfiguration;import java.util.List;import java.util.Map;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3SelectTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3SelectTest.javaindex c98cc819d6..5318e6d44f 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3SelectTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3SelectTest.java@@ -5,8 +5,8 @@ import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;import software.amazon.awssdk.core.async.SdkPublisher;import software.amazon.awssdk.core.sync.RequestBody;-import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;import software.amazon.awssdk.http.Protocol;+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;import software.amazon.awssdk.regions.Region;import software.amazon.awssdk.services.s3.S3AsyncClient;import software.amazon.awssdk.services.s3.S3Client;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 0486b5cfbd..34776c1bec 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@@ -14,9 +14,9 @@ import software.amazon.awssdk.services.s3.model.Delete;import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;import software.amazon.awssdk.services.s3.model.DeleteBucketTaggingRequest;import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;+import software.amazon.awssdk.services.s3.model.DeleteObjectTaggingRequest;import software.amazon.awssdk.services.s3.model.DeleteObjectsRequest;import software.amazon.awssdk.services.s3.model.DeleteObjectsResponse;-import software.amazon.awssdk.services.s3.model.DeleteObjectTaggingRequest;import software.amazon.awssdk.services.s3.model.GetBucketLocationRequest;import software.amazon.awssdk.services.s3.model.GetBucketLocationResponse;import software.amazon.awssdk.services.s3.model.GetBucketTaggingRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3VectorsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3VectorsTest.javaindex fcb0f23186..92a1b11e1c 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3VectorsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3VectorsTest.java@@ -5,11 +5,11 @@ import software.amazon.awssdk.core.document.Document;import software.amazon.awssdk.services.s3vectors.S3VectorsClient;import software.amazon.awssdk.services.s3vectors.model.*;-import static org.assertj.core.api.Assertions.*;-import java.util.List;import java.util.Map;+import static org.assertj.core.api.Assertions.*;+@DisplayName("S3 Vectors Compatibility Tests")@TestMethodOrder(MethodOrderer.OrderAnnotation.class)class S3VectorsTest {diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesAccountAttributesTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesAccountAttributesTest.javaindex 883cd89b82..8a540ad80c 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesAccountAttributesTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesAccountAttributesTest.java@@ -7,15 +7,9 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;--import java.util.ArrayList;-import java.util.Collections;-import java.util.List;-import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.GetAccountSendingEnabledResponse;import software.amazon.awssdk.services.ses.model.UpdateAccountSendingEnabledRequest;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.AccountDetails;import software.amazon.awssdk.services.sesv2.model.ContactLanguage;@@ -33,6 +27,10 @@ import software.amazon.awssdk.services.sesv2.model.SesV2Exception;import software.amazon.awssdk.services.sesv2.model.SuppressionListReason;import software.amazon.awssdk.services.sesv2.model.VdmAttributes;+import java.util.ArrayList;+import java.util.Collections;+import java.util.List;+import static org.assertj.core.api.Assertions.assertThat;import static org.assertj.core.api.Assertions.assertThatThrownBy;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesBatchGetMetricDataTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesBatchGetMetricDataTest.javaindex 1f89c9057d..d99bed5f9f 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesBatchGetMetricDataTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesBatchGetMetricDataTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.BatchGetMetricDataQuery;import software.amazon.awssdk.services.sesv2.model.BatchGetMetricDataRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetDeliveryOptionsV1Test.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetDeliveryOptionsV1Test.javaindex bc39563d13..279a7252d9 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetDeliveryOptionsV1Test.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetDeliveryOptionsV1Test.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.ConfigurationSet;import software.amazon.awssdk.services.ses.model.ConfigurationSetDoesNotExistException;@@ -15,7 +14,6 @@ import software.amazon.awssdk.services.ses.model.CreateConfigurationSetRequest;import software.amazon.awssdk.services.ses.model.DeleteConfigurationSetRequest;import software.amazon.awssdk.services.ses.model.DeliveryOptions;import software.amazon.awssdk.services.ses.model.PutConfigurationSetDeliveryOptionsRequest;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.GetConfigurationSetRequest;import software.amazon.awssdk.services.sesv2.model.GetConfigurationSetResponse;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetEventDestinationTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetEventDestinationTest.javaindex 70277c5b53..e0fcbd6d80 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetEventDestinationTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetEventDestinationTest.java@@ -10,7 +10,6 @@ import org.junit.jupiter.api.TestMethodOrder;import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.Arguments;import org.junit.jupiter.params.provider.MethodSource;-import software.amazon.awssdk.awscore.exception.AwsServiceException;import software.amazon.awssdk.regions.Region;import software.amazon.awssdk.services.ses.SesClient;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetOptionsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetOptionsTest.javaindex 30040a7cbc..a0244386db 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetOptionsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetOptionsTest.java@@ -7,14 +7,12 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.ArchivingOptions;import software.amazon.awssdk.services.sesv2.model.BadRequestException;-import software.amazon.awssdk.services.sesv2.model.DashboardOptions;-import software.amazon.awssdk.services.sesv2.model.GuardianOptions;import software.amazon.awssdk.services.sesv2.model.CreateConfigurationSetRequest;import software.amazon.awssdk.services.sesv2.model.CreateDedicatedIpPoolRequest;+import software.amazon.awssdk.services.sesv2.model.DashboardOptions;import software.amazon.awssdk.services.sesv2.model.DefaultSigningScheme;import software.amazon.awssdk.services.sesv2.model.DeleteConfigurationSetRequest;import software.amazon.awssdk.services.sesv2.model.DeleteDedicatedIpPoolRequest;@@ -22,14 +20,15 @@ import software.amazon.awssdk.services.sesv2.model.DeleteEmailIdentityRequest;import software.amazon.awssdk.services.sesv2.model.DeliveryOptions;import software.amazon.awssdk.services.sesv2.model.GetConfigurationSetRequest;import software.amazon.awssdk.services.sesv2.model.GetConfigurationSetResponse;+import software.amazon.awssdk.services.sesv2.model.GuardianOptions;import software.amazon.awssdk.services.sesv2.model.MessageSecurityOptions;import software.amazon.awssdk.services.sesv2.model.NotFoundException;import software.amazon.awssdk.services.sesv2.model.PutConfigurationSetArchivingOptionsRequest;import software.amazon.awssdk.services.sesv2.model.PutConfigurationSetDeliveryOptionsRequest;import software.amazon.awssdk.services.sesv2.model.PutConfigurationSetReputationOptionsRequest;import software.amazon.awssdk.services.sesv2.model.PutConfigurationSetTrackingOptionsRequest;-import software.amazon.awssdk.services.sesv2.model.ReputationOptions;import software.amazon.awssdk.services.sesv2.model.PutConfigurationSetVdmOptionsRequest;+import software.amazon.awssdk.services.sesv2.model.ReputationOptions;import software.amazon.awssdk.services.sesv2.model.SignatureFormat;import software.amazon.awssdk.services.sesv2.model.SigningScheme;import software.amazon.awssdk.services.sesv2.model.TrackingOptions;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetPagingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetPagingTest.javaindex b567ee6387..8bb2b55bcd 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetPagingTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetPagingTest.java@@ -4,7 +4,6 @@ import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;-import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.ConfigurationSet;import software.amazon.awssdk.services.ses.model.ListConfigurationSetsRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetSendingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetSendingTest.javaindex bc3067cacd..f4007d3b5d 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetSendingTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetSendingTest.java@@ -7,13 +7,11 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.ConfigurationSetAttribute;import software.amazon.awssdk.services.ses.model.DescribeConfigurationSetRequest;import software.amazon.awssdk.services.ses.model.DescribeConfigurationSetResponse;import software.amazon.awssdk.services.ses.model.UpdateConfigurationSetSendingEnabledRequest;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.Body;import software.amazon.awssdk.services.sesv2.model.Content;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetTest.javaindex 794e8d43f6..fb444a4255 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.awscore.exception.AwsServiceException;import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.ConfigurationSet;@@ -17,7 +16,6 @@ import software.amazon.awssdk.services.ses.model.DescribeConfigurationSetRequestimport software.amazon.awssdk.services.ses.model.DescribeConfigurationSetResponse;import software.amazon.awssdk.services.ses.model.ListConfigurationSetsRequest;import software.amazon.awssdk.services.ses.model.ListConfigurationSetsResponse;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.GetConfigurationSetRequest;import software.amazon.awssdk.services.sesv2.model.GetConfigurationSetResponse;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetTrackingOptionsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetTrackingOptionsTest.javaindex 5f1218ef40..e84c85c51f 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetTrackingOptionsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetTrackingOptionsTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.ConfigurationSet;import software.amazon.awssdk.services.ses.model.ConfigurationSetAttribute;@@ -24,7 +23,6 @@ import software.amazon.awssdk.services.ses.model.TrackingOptionsAlreadyExistsExcimport software.amazon.awssdk.services.ses.model.TrackingOptionsDoesNotExistException;import software.amazon.awssdk.services.ses.model.UpdateConfigurationSetReputationMetricsEnabledRequest;import software.amazon.awssdk.services.ses.model.UpdateConfigurationSetTrackingOptionsRequest;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.DeleteEmailIdentityRequest;import software.amazon.awssdk.services.sesv2.model.GetConfigurationSetRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactFilterTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactFilterTest.javaindex b97aeeb3d4..635aade856 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactFilterTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactFilterTest.java@@ -4,7 +4,6 @@ import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.Contact;import software.amazon.awssdk.services.sesv2.model.CreateContactListRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactListTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactListTest.javaindex 9a7b204d1e..4a27f6f528 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactListTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactListTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.BadRequestException;import software.amazon.awssdk.services.sesv2.model.CreateContactListRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactPagingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactPagingTest.javaindex 23f3bc2bb9..e2ac21b422 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactPagingTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactPagingTest.java@@ -4,7 +4,6 @@ import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.Contact;import software.amazon.awssdk.services.sesv2.model.CreateContactListRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactTest.javaindex 61b8a1a335..d5d12b65d0 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesContactTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.AlreadyExistsException;import software.amazon.awssdk.services.sesv2.model.BadRequestException;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesCustomVerificationEmailTemplatePagingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesCustomVerificationEmailTemplatePagingTest.javaindex 64171ff70b..daf2edeef4 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesCustomVerificationEmailTemplatePagingTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesCustomVerificationEmailTemplatePagingTest.java@@ -4,7 +4,6 @@ import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;-import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.CustomVerificationEmailTemplate;import software.amazon.awssdk.services.ses.model.ListCustomVerificationEmailTemplatesRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesCustomVerificationEmailTemplateTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesCustomVerificationEmailTemplateTest.javaindex 697efa1385..3f1d503c87 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesCustomVerificationEmailTemplateTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesCustomVerificationEmailTemplateTest.java@@ -7,10 +7,8 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.CreateCustomVerificationEmailTemplateRequest;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.AlreadyExistsException;import software.amazon.awssdk.services.sesv2.model.CreateEmailIdentityRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesDedicatedIpPoolPagingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesDedicatedIpPoolPagingTest.javaindex abaee52445..a460146e7f 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesDedicatedIpPoolPagingTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesDedicatedIpPoolPagingTest.java@@ -4,7 +4,6 @@ import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.CreateDedicatedIpPoolRequest;import software.amazon.awssdk.services.sesv2.model.DeleteDedicatedIpPoolRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesDedicatedIpPoolTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesDedicatedIpPoolTest.javaindex 528fe70504..d17f242f7e 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesDedicatedIpPoolTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesDedicatedIpPoolTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.AlreadyExistsException;import software.amazon.awssdk.services.sesv2.model.BadRequestException;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesEmailIdentityConfigurationSetTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesEmailIdentityConfigurationSetTest.javaindex 65fe10ea48..aa6ef59096 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesEmailIdentityConfigurationSetTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesEmailIdentityConfigurationSetTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.CreateConfigurationSetRequest;import software.amazon.awssdk.services.sesv2.model.CreateEmailIdentityRequest;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 88f90fe488..5214654c40 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@@ -9,11 +9,35 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-+import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;+import software.amazon.awssdk.services.cloudwatch.model.ListMetricsRequest;+import software.amazon.awssdk.services.cloudwatch.model.Metric;+import software.amazon.awssdk.services.eventbridge.EventBridgeClient;+import software.amazon.awssdk.services.eventbridge.model.DeleteRuleRequest;+import software.amazon.awssdk.services.eventbridge.model.PutRuleRequest;+import software.amazon.awssdk.services.eventbridge.model.PutTargetsRequest;+import software.amazon.awssdk.services.eventbridge.model.RemoveTargetsRequest;+import software.amazon.awssdk.services.eventbridge.model.Target;+import software.amazon.awssdk.services.firehose.FirehoseClient;+import software.amazon.awssdk.services.firehose.model.BufferingHints;+import software.amazon.awssdk.services.firehose.model.CreateDeliveryStreamRequest;+import software.amazon.awssdk.services.firehose.model.DeleteDeliveryStreamRequest;+import software.amazon.awssdk.services.firehose.model.S3DestinationConfiguration;+import software.amazon.awssdk.services.s3.S3Client;+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;+import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;+import software.amazon.awssdk.services.s3.model.DeleteObjectsRequest;+import software.amazon.awssdk.services.s3.model.GetObjectRequest;+import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;+import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;+import software.amazon.awssdk.services.s3.model.ObjectIdentifier;+import software.amazon.awssdk.services.s3.model.S3Object;import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.Body;import software.amazon.awssdk.services.sesv2.model.BulkEmailContent;import software.amazon.awssdk.services.sesv2.model.BulkEmailEntry;+import software.amazon.awssdk.services.sesv2.model.CloudWatchDestination;+import software.amazon.awssdk.services.sesv2.model.CloudWatchDimensionConfiguration;import software.amazon.awssdk.services.sesv2.model.Content;import software.amazon.awssdk.services.sesv2.model.CreateConfigurationSetEventDestinationRequest;import software.amazon.awssdk.services.sesv2.model.CreateConfigurationSetRequest;@@ -22,10 +46,13 @@ import software.amazon.awssdk.services.sesv2.model.DeleteConfigurationSetEventDeimport software.amazon.awssdk.services.sesv2.model.DeleteConfigurationSetRequest;import software.amazon.awssdk.services.sesv2.model.DeleteEmailIdentityRequest;import software.amazon.awssdk.services.sesv2.model.Destination;+import software.amazon.awssdk.services.sesv2.model.DimensionValueSource;import software.amazon.awssdk.services.sesv2.model.EmailContent;import software.amazon.awssdk.services.sesv2.model.EmailTemplateContent;+import software.amazon.awssdk.services.sesv2.model.EventBridgeDestination;import software.amazon.awssdk.services.sesv2.model.EventDestinationDefinition;import software.amazon.awssdk.services.sesv2.model.EventType;+import software.amazon.awssdk.services.sesv2.model.KinesisFirehoseDestination;import software.amazon.awssdk.services.sesv2.model.Message;import software.amazon.awssdk.services.sesv2.model.MessageHeader;import software.amazon.awssdk.services.sesv2.model.MessageTag;@@ -33,18 +60,11 @@ import software.amazon.awssdk.services.sesv2.model.SendBulkEmailRequest;import software.amazon.awssdk.services.sesv2.model.SendEmailRequest;import software.amazon.awssdk.services.sesv2.model.SnsDestination;import software.amazon.awssdk.services.sesv2.model.Template;-import software.amazon.awssdk.services.sesv2.model.CloudWatchDestination;-import software.amazon.awssdk.services.sesv2.model.CloudWatchDimensionConfiguration;-import software.amazon.awssdk.services.sesv2.model.DimensionValueSource;-import software.amazon.awssdk.services.sesv2.model.EventBridgeDestination;-import software.amazon.awssdk.services.sesv2.model.KinesisFirehoseDestination;-import software.amazon.awssdk.services.sns.SnsClient;import software.amazon.awssdk.services.sns.model.CreateTopicRequest;import software.amazon.awssdk.services.sns.model.DeleteTopicRequest;import software.amazon.awssdk.services.sns.model.SubscribeRequest;import software.amazon.awssdk.services.sns.model.UnsubscribeRequest;-import software.amazon.awssdk.services.sqs.SqsClient;import software.amazon.awssdk.services.sqs.model.CreateQueueRequest;import software.amazon.awssdk.services.sqs.model.DeleteMessageBatchRequest;@@ -55,33 +75,6 @@ import software.amazon.awssdk.services.sqs.model.QueueAttributeName;import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;-import software.amazon.awssdk.services.firehose.FirehoseClient;-import software.amazon.awssdk.services.firehose.model.BufferingHints;-import software.amazon.awssdk.services.firehose.model.CreateDeliveryStreamRequest;-import software.amazon.awssdk.services.firehose.model.DeleteDeliveryStreamRequest;-import software.amazon.awssdk.services.firehose.model.S3DestinationConfiguration;--import software.amazon.awssdk.services.s3.S3Client;-import software.amazon.awssdk.services.s3.model.CreateBucketRequest;-import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;-import software.amazon.awssdk.services.s3.model.DeleteObjectsRequest;-import software.amazon.awssdk.services.s3.model.GetObjectRequest;-import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;-import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;-import software.amazon.awssdk.services.s3.model.ObjectIdentifier;-import software.amazon.awssdk.services.s3.model.S3Object;--import software.amazon.awssdk.services.eventbridge.EventBridgeClient;-import software.amazon.awssdk.services.eventbridge.model.DeleteRuleRequest;-import software.amazon.awssdk.services.eventbridge.model.PutRuleRequest;-import software.amazon.awssdk.services.eventbridge.model.PutTargetsRequest;-import software.amazon.awssdk.services.eventbridge.model.RemoveTargetsRequest;-import software.amazon.awssdk.services.eventbridge.model.Target;--import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;-import software.amazon.awssdk.services.cloudwatch.model.ListMetricsRequest;-import software.amazon.awssdk.services.cloudwatch.model.Metric;-import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.List;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesExportJobTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesExportJobTest.javaindex 1873ff0e30..0be09c6a6c 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesExportJobTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesExportJobTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.BadRequestException;import software.amazon.awssdk.services.sesv2.model.Body;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityAttributesTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityAttributesTest.javaindex 9dff8c7e1a..221f6f8345 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityAttributesTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityAttributesTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.awscore.exception.AwsServiceException;import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.DeleteIdentityRequest;@@ -25,16 +24,15 @@ import software.amazon.awssdk.services.ses.model.SetIdentityHeadersInNotificatioimport software.amazon.awssdk.services.ses.model.SetIdentityMailFromDomainRequest;import software.amazon.awssdk.services.ses.model.VerifyDomainDkimRequest;import software.amazon.awssdk.services.ses.model.VerifyDomainIdentityRequest;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.BadRequestException;import software.amazon.awssdk.services.sesv2.model.CreateEmailIdentityRequest;import software.amazon.awssdk.services.sesv2.model.DeleteEmailIdentityRequest;import software.amazon.awssdk.services.sesv2.model.DkimAttributes;import software.amazon.awssdk.services.sesv2.model.DkimSigningAttributes;-import software.amazon.awssdk.services.sesv2.model.DkimStatus;import software.amazon.awssdk.services.sesv2.model.DkimSigningAttributesOrigin;import software.amazon.awssdk.services.sesv2.model.DkimSigningKeyLength;+import software.amazon.awssdk.services.sesv2.model.DkimStatus;import software.amazon.awssdk.services.sesv2.model.GetEmailIdentityRequest;import software.amazon.awssdk.services.sesv2.model.GetEmailIdentityResponse;import software.amazon.awssdk.services.sesv2.model.IdentityInfo;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityCertificateTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityCertificateTest.javaindex ccf965f5d2..ccf6c76ebc 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityCertificateTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityCertificateTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.core.SdkBytes;import software.amazon.awssdk.services.acm.AcmClient;import software.amazon.awssdk.services.sesv2.SesV2Client;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityPagingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityPagingTest.javaindex fca962f593..c3ede8e084 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityPagingTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityPagingTest.java@@ -4,7 +4,6 @@ import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;-import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.ListIdentitiesRequest;import software.amazon.awssdk.services.ses.model.ListIdentitiesResponse;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityPolicyTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityPolicyTest.javaindex 0285d91846..bc46159c26 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityPolicyTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesIdentityPolicyTest.java@@ -7,13 +7,11 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.DeleteIdentityPolicyRequest;import software.amazon.awssdk.services.ses.model.GetIdentityPoliciesRequest;import software.amazon.awssdk.services.ses.model.ListIdentityPoliciesRequest;import software.amazon.awssdk.services.ses.model.PutIdentityPolicyRequest;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.AlreadyExistsException;import software.amazon.awssdk.services.sesv2.model.CreateEmailIdentityPolicyRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesImportJobPagingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesImportJobPagingTest.javaindex 70ffd2c467..7d02060379 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesImportJobPagingTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesImportJobPagingTest.java@@ -4,7 +4,6 @@ import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;-import software.amazon.awssdk.core.sync.RequestBody;import software.amazon.awssdk.services.s3.S3Client;import software.amazon.awssdk.services.s3.model.CreateBucketRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesImportJobTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesImportJobTest.javaindex b5435d829e..e4408842b1 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesImportJobTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesImportJobTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.core.sync.RequestBody;import software.amazon.awssdk.services.s3.S3Client;import software.amazon.awssdk.services.s3.model.CreateBucketRequest;@@ -38,9 +37,9 @@ import software.amazon.awssdk.services.sesv2.model.ListImportJobsResponse;import software.amazon.awssdk.services.sesv2.model.ListSuppressedDestinationsRequest;import software.amazon.awssdk.services.sesv2.model.NotFoundException;import software.amazon.awssdk.services.sesv2.model.SubscriptionStatus;+import software.amazon.awssdk.services.sesv2.model.SuppressedDestinationSummary;import software.amazon.awssdk.services.sesv2.model.SuppressionListDestination;import software.amazon.awssdk.services.sesv2.model.SuppressionListImportAction;-import software.amazon.awssdk.services.sesv2.model.SuppressedDestinationSummary;import software.amazon.awssdk.services.sesv2.model.Topic;import java.util.List;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesListManagementOptionsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesListManagementOptionsTest.javaindex b2c2615f2e..ebd4879c7d 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesListManagementOptionsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesListManagementOptionsTest.java@@ -4,7 +4,6 @@ import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.Body;import software.amazon.awssdk.services.sesv2.model.Content;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesMessageInsightsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesMessageInsightsTest.javaindex fb937a6568..ecd09dd2ca 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesMessageInsightsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesMessageInsightsTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.Body;import software.amazon.awssdk.services.sesv2.model.Content;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 3974d33119..776ec65dc4 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@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.AlreadyExistsException;import software.amazon.awssdk.services.ses.model.CannotDeleteException;@@ -17,9 +16,9 @@ import software.amazon.awssdk.services.ses.model.DescribeReceiptRuleSetResponse;import software.amazon.awssdk.services.ses.model.InvalidSnsTopicException;import software.amazon.awssdk.services.ses.model.ListReceiptRuleSetsResponse;import software.amazon.awssdk.services.ses.model.ReceiptFilter;+import software.amazon.awssdk.services.ses.model.ReceiptFilterPolicy;import software.amazon.awssdk.services.ses.model.ReceiptRule;import software.amazon.awssdk.services.ses.model.RuleDoesNotExistException;-import software.amazon.awssdk.services.ses.model.ReceiptFilterPolicy;import software.amazon.awssdk.services.ses.model.RuleSetDoesNotExistException;import software.amazon.awssdk.services.ses.model.SesException;import software.amazon.awssdk.services.ses.model.TlsPolicy;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesSuppressionListPagingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesSuppressionListPagingTest.javaindex bce7119e74..fd0179af0c 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesSuppressionListPagingTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesSuppressionListPagingTest.java@@ -4,7 +4,6 @@ import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.DeleteSuppressedDestinationRequest;import software.amazon.awssdk.services.sesv2.model.InvalidNextTokenException;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesSuppressionListTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesSuppressionListTest.javaindex b98f082af6..7f03272d5e 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesSuppressionListTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesSuppressionListTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.DeleteSuppressedDestinationRequest;import software.amazon.awssdk.services.sesv2.model.GetSuppressedDestinationRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTagResourceTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTagResourceTest.javaindex 6ae5be0091..fca7962ce6 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTagResourceTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTagResourceTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.CreateConfigurationSetRequest;import software.amazon.awssdk.services.sesv2.model.CreateContactListRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTemplatePagingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTemplatePagingTest.javaindex 7c78fdcdc0..11c0cd0d31 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTemplatePagingTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTemplatePagingTest.java@@ -4,7 +4,6 @@ import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;-import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.ListTemplatesRequest;import software.amazon.awssdk.services.ses.model.ListTemplatesResponse;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTemplateTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTemplateTest.javaindex e9624d286e..34a964fdc4 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTemplateTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTemplateTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.awscore.exception.AwsServiceException;import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.ses.model.BulkEmailDestination;@@ -16,9 +15,9 @@ import software.amazon.awssdk.services.ses.model.DeleteIdentityRequest;import software.amazon.awssdk.services.ses.model.DeleteTemplateRequest;import software.amazon.awssdk.services.ses.model.GetTemplateRequest;import software.amazon.awssdk.services.ses.model.GetTemplateResponse;+import software.amazon.awssdk.services.ses.model.InvalidRenderingParameterException;import software.amazon.awssdk.services.ses.model.ListTemplatesRequest;import software.amazon.awssdk.services.ses.model.ListTemplatesResponse;-import software.amazon.awssdk.services.ses.model.InvalidRenderingParameterException;import software.amazon.awssdk.services.ses.model.MissingRenderingAttributeException;import software.amazon.awssdk.services.ses.model.SendBulkTemplatedEmailRequest;import software.amazon.awssdk.services.ses.model.SendBulkTemplatedEmailResponse;@@ -29,8 +28,8 @@ import software.amazon.awssdk.services.ses.model.TestRenderTemplateRequest;import software.amazon.awssdk.services.ses.model.TestRenderTemplateResponse;import software.amazon.awssdk.services.ses.model.UpdateTemplateRequest;import software.amazon.awssdk.services.ses.model.VerifyEmailIdentityRequest;-import software.amazon.awssdk.services.sesv2.SesV2Client;+import software.amazon.awssdk.services.sesv2.model.BadRequestException;import software.amazon.awssdk.services.sesv2.model.BulkEmailContent;import software.amazon.awssdk.services.sesv2.model.BulkEmailEntry;import software.amazon.awssdk.services.sesv2.model.CreateEmailIdentityRequest;@@ -44,7 +43,6 @@ import software.amazon.awssdk.services.sesv2.model.GetEmailTemplateRequest;import software.amazon.awssdk.services.sesv2.model.GetEmailTemplateResponse;import software.amazon.awssdk.services.sesv2.model.ListEmailTemplatesRequest;import software.amazon.awssdk.services.sesv2.model.ListEmailTemplatesResponse;-import software.amazon.awssdk.services.sesv2.model.BadRequestException;import software.amazon.awssdk.services.sesv2.model.NotFoundException;import software.amazon.awssdk.services.sesv2.model.SendBulkEmailRequest;import software.amazon.awssdk.services.sesv2.model.SendBulkEmailResponse;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTenantPagingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTenantPagingTest.javaindex 79d49315a8..d9fa1e8afa 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTenantPagingTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTenantPagingTest.java@@ -4,12 +4,11 @@ import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.CreateEmailIdentityRequest;import software.amazon.awssdk.services.sesv2.model.CreateTenantRequest;-import software.amazon.awssdk.services.sesv2.model.CreateTenantResponse;import software.amazon.awssdk.services.sesv2.model.CreateTenantResourceAssociationRequest;+import software.amazon.awssdk.services.sesv2.model.CreateTenantResponse;import software.amazon.awssdk.services.sesv2.model.DeleteEmailIdentityRequest;import software.amazon.awssdk.services.sesv2.model.DeleteTenantRequest;import software.amazon.awssdk.services.sesv2.model.ListResourceTenantsRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTenantTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTenantTest.javaindex 98da12823e..ae1b42250e 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTenantTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTenantTest.java@@ -7,7 +7,6 @@ import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.AlreadyExistsException;import software.amazon.awssdk.services.sesv2.model.BadRequestException;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsmTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsmTest.javaindex 607e7dc4ec..d4e0ae2376 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsmTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsmTest.java@@ -17,15 +17,15 @@ import software.amazon.awssdk.services.ssm.model.GetParameterHistoryRequest;import software.amazon.awssdk.services.ssm.model.GetParameterHistoryResponse;import software.amazon.awssdk.services.ssm.model.GetParameterRequest;import software.amazon.awssdk.services.ssm.model.GetParameterResponse;-import software.amazon.awssdk.services.ssm.model.ListCommandInvocationsRequest;-import software.amazon.awssdk.services.ssm.model.ListCommandInvocationsResponse;-import software.amazon.awssdk.services.ssm.model.ListCommandsRequest;-import software.amazon.awssdk.services.ssm.model.ListCommandsResponse;import software.amazon.awssdk.services.ssm.model.GetParametersByPathRequest;import software.amazon.awssdk.services.ssm.model.GetParametersByPathResponse;import software.amazon.awssdk.services.ssm.model.GetParametersRequest;import software.amazon.awssdk.services.ssm.model.GetParametersResponse;import software.amazon.awssdk.services.ssm.model.LabelParameterVersionRequest;+import software.amazon.awssdk.services.ssm.model.ListCommandInvocationsRequest;+import software.amazon.awssdk.services.ssm.model.ListCommandInvocationsResponse;+import software.amazon.awssdk.services.ssm.model.ListCommandsRequest;+import software.amazon.awssdk.services.ssm.model.ListCommandsResponse;import software.amazon.awssdk.services.ssm.model.ListTagsForResourceRequest;import software.amazon.awssdk.services.ssm.model.ListTagsForResourceResponse;import software.amazon.awssdk.services.ssm.model.ParameterNotFoundException;@@ -37,11 +37,11 @@ import software.amazon.awssdk.services.ssm.model.SendCommandRequest;import software.amazon.awssdk.services.ssm.model.SendCommandResponse;import software.amazon.awssdk.services.ssm.model.SsmException;-import static org.assertj.core.api.Assertions.*;-import java.util.List;import java.util.Map;+import static org.assertj.core.api.Assertions.*;+@DisplayName("SSM Parameter Store")@TestMethodOrder(MethodOrderer.OrderAnnotation.class)class SsmTest {diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StepFunctionsDescribeMapRunTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StepFunctionsDescribeMapRunTest.javaindex c046b7bf8d..797d930a16 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StepFunctionsDescribeMapRunTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StepFunctionsDescribeMapRunTest.java@@ -1,5 +1,6 @@package com.floci.test;+import com.fasterxml.jackson.databind.ObjectMapper;import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;@@ -21,8 +22,6 @@ import software.amazon.awssdk.services.sfn.model.MapRunItemCounts;import software.amazon.awssdk.services.sfn.model.MapRunStatus;import software.amazon.awssdk.services.sfn.model.ResourceNotFoundException;-import com.fasterxml.jackson.databind.ObjectMapper;-import static org.assertj.core.api.Assertions.assertThat;import static org.assertj.core.api.Assertions.assertThatThrownBy;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StepFunctionsUpdateStateMachineTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StepFunctionsUpdateStateMachineTest.javaindex 8415a11d3e..e9a3857026 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StepFunctionsUpdateStateMachineTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StepFunctionsUpdateStateMachineTest.java@@ -1,8 +1,5 @@package com.floci.test;-import java.util.logging.Level;-import java.util.logging.Logger;-import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.DisplayName;@@ -13,6 +10,9 @@ import software.amazon.awssdk.services.sfn.model.IncludedData;import software.amazon.awssdk.services.sfn.model.LogLevel;import software.amazon.awssdk.services.sfn.model.UpdateStateMachineResponse;+import java.util.logging.Level;+import java.util.logging.Logger;+import static org.assertj.core.api.Assertions.assertThat;@DisplayName("SFN UpdateStateMachine")diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StsTest.javaindex affa8de185..11343da9da 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/StsTest.java@@ -1,12 +1,14 @@package com.floci.test;-import org.junit.jupiter.api.*;import org.bouncycastle.asn1.x500.X500Name;import org.bouncycastle.cert.X509CertificateHolder;import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;import org.bouncycastle.jce.provider.BouncyCastleProvider;import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;+import org.junit.jupiter.api.*;+import org.w3c.dom.Document;+import org.w3c.dom.Element;import software.amazon.awssdk.services.iam.IamClient;import software.amazon.awssdk.services.iam.model.CreateRoleRequest;import software.amazon.awssdk.services.iam.model.CreateSamlProviderRequest;@@ -15,8 +17,6 @@ import software.amazon.awssdk.services.iam.model.DeleteRoleRequest;import software.amazon.awssdk.services.iam.model.NoSuchEntityException;import software.amazon.awssdk.services.sts.StsClient;import software.amazon.awssdk.services.sts.model.*;-import org.w3c.dom.Document;-import org.w3c.dom.Element;import javax.xml.crypto.dsig.CanonicalizationMethod;import javax.xml.crypto.dsig.DigestMethod;@@ -35,7 +35,6 @@ import javax.xml.transform.Transformer;import javax.xml.transform.TransformerFactory;import javax.xml.transform.dom.DOMSource;import javax.xml.transform.stream.StreamResult;-import java.io.StringWriter;import java.math.BigInteger;import java.nio.charset.StandardCharsets;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SwfTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SwfTest.javaindex c6a3730d3a..adcc4d2d85 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SwfTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SwfTest.java@@ -25,12 +25,12 @@ import software.amazon.awssdk.services.swf.model.EventType;import software.amazon.awssdk.services.swf.model.ExecutionStatus;import software.amazon.awssdk.services.swf.model.GetWorkflowExecutionHistoryRequest;import software.amazon.awssdk.services.swf.model.GetWorkflowExecutionHistoryResponse;-import software.amazon.awssdk.services.swf.model.PollForActivityTaskResponse;-import software.amazon.awssdk.services.swf.model.PollForDecisionTaskResponse;import software.amazon.awssdk.services.swf.model.HistoryEvent;import software.amazon.awssdk.services.swf.model.ListDomainsRequest;import software.amazon.awssdk.services.swf.model.PollForActivityTaskRequest;+import software.amazon.awssdk.services.swf.model.PollForActivityTaskResponse;import software.amazon.awssdk.services.swf.model.PollForDecisionTaskRequest;+import software.amazon.awssdk.services.swf.model.PollForDecisionTaskResponse;import software.amazon.awssdk.services.swf.model.RegisterActivityTypeRequest;import software.amazon.awssdk.services.swf.model.RegisterDomainRequest;import software.amazon.awssdk.services.swf.model.RegisterWorkflowTypeRequest;diff --git a/compatibility-tests/sdk-test-java/src/test/java/io/github/hectorvent/floci/compat/RedshiftTest.java b/compatibility-tests/sdk-test-java/src/test/java/io/github/hectorvent/floci/compat/RedshiftTest.javaindex e5eab8f8b5..e160807ed2 100644--- a/compatibility-tests/sdk-test-java/src/test/java/io/github/hectorvent/floci/compat/RedshiftTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/io/github/hectorvent/floci/compat/RedshiftTest.java@@ -11,10 +11,10 @@ import software.amazon.awssdk.services.redshift.RedshiftClient;import software.amazon.awssdk.services.redshift.model.Cluster;import software.amazon.awssdk.services.redshift.model.CreateClusterRequest;import software.amazon.awssdk.services.redshift.model.CreateClusterResponse;-import software.amazon.awssdk.services.redshift.model.DescribeClustersRequest;-import software.amazon.awssdk.services.redshift.model.DescribeClustersResponse;import software.amazon.awssdk.services.redshift.model.DeleteClusterRequest;import software.amazon.awssdk.services.redshift.model.DeleteClusterResponse;+import software.amazon.awssdk.services.redshift.model.DescribeClustersRequest;+import software.amazon.awssdk.services.redshift.model.DescribeClustersResponse;import software.amazon.awssdk.services.redshift.model.GetClusterCredentialsResponse;import software.amazon.awssdk.services.redshift.model.GetClusterCredentialsWithIamResponse;import software.amazon.awssdk.services.s3.S3Client;@@ -31,7 +31,6 @@ import java.sql.DriverManager;import java.sql.PreparedStatement;import java.sql.ResultSet;import java.sql.Statement;-import java.time.Duration;import java.time.Instant;import java.util.function.Supplier;diff --git a/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java b/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.javaindex 8f542dd0e6..10fcf65c6b 100644--- a/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java+++ b/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.config;import io.smallrye.config.ConfigMapping;import io.smallrye.config.WithDefault;+import java.net.URI;import java.util.List;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/config/FlociCertificateAuthority.java b/src/main/java/io/github/hectorvent/floci/config/FlociCertificateAuthority.javaindex 774e56e51c..1296293e99 100644--- a/src/main/java/io/github/hectorvent/floci/config/FlociCertificateAuthority.java+++ b/src/main/java/io/github/hectorvent/floci/config/FlociCertificateAuthority.java@@ -26,8 +26,8 @@ import java.nio.file.StandardCopyOption;import java.nio.file.attribute.PosixFileAttributeView;import java.nio.file.attribute.PosixFilePermissions;import java.security.KeyPair;-import java.security.PrivateKey;import java.security.MessageDigest;+import java.security.PrivateKey;import java.security.PublicKey;import java.security.cert.X509Certificate;import java.time.Instant;diff --git a/src/main/java/io/github/hectorvent/floci/config/TlsProxyServer.java b/src/main/java/io/github/hectorvent/floci/config/TlsProxyServer.javaindex 78e9243785..39efac2ecb 100644--- a/src/main/java/io/github/hectorvent/floci/config/TlsProxyServer.java+++ b/src/main/java/io/github/hectorvent/floci/config/TlsProxyServer.java@@ -18,8 +18,8 @@ import java.util.ArrayList;import java.util.LinkedHashSet;import java.util.List;import java.util.Set;-import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.CompletionException;+import java.util.concurrent.ConcurrentHashMap;/*** A TCP proxy server that enables HTTP and HTTPS on the same port (LocalStack parity).diff --git a/src/main/java/io/github/hectorvent/floci/core/common/AwsJson11Controller.java b/src/main/java/io/github/hectorvent/floci/core/common/AwsJson11Controller.javaindex 2f32444e62..8bef704a59 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/AwsJson11Controller.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/AwsJson11Controller.java@@ -6,62 +6,62 @@ import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.ObjectReader;import io.github.hectorvent.floci.services.acm.AcmJsonHandler;+import io.github.hectorvent.floci.services.apigatewayv2.ApiGatewayV2JsonHandler;+import io.github.hectorvent.floci.services.applicationautoscaling.ApplicationAutoScalingJsonHandler;import io.github.hectorvent.floci.services.athena.AthenaJsonHandler;-import io.github.hectorvent.floci.services.redshiftdata.RedshiftDataJsonHandler;-import io.github.hectorvent.floci.services.redshiftserverless.RedshiftServerlessJsonHandler;+import io.github.hectorvent.floci.services.bcmdataexports.BcmDataExportsJsonHandler;+import io.github.hectorvent.floci.services.budgets.BudgetsJsonHandler;+import io.github.hectorvent.floci.services.ce.CostExplorerJsonHandler;+import io.github.hectorvent.floci.services.cloudcontrol.CloudControlJsonHandler;import io.github.hectorvent.floci.services.cloudhsmv2.CloudHsmV2JsonHandler;+import io.github.hectorvent.floci.services.cloudmap.CloudMapHandler;+import io.github.hectorvent.floci.services.cloudtrail.CloudTrailJsonHandler;+import io.github.hectorvent.floci.services.cloudwatch.logs.CloudWatchLogsHandler;import io.github.hectorvent.floci.services.codebuild.CodeBuildJsonHandler;import io.github.hectorvent.floci.services.codedeploy.CodeDeployJsonHandler;import io.github.hectorvent.floci.services.codepipeline.CodePipelineJsonHandler;+import io.github.hectorvent.floci.services.cognito.CognitoJsonHandler;+import io.github.hectorvent.floci.services.cognitoidentity.CognitoIdentityJsonHandler;+import io.github.hectorvent.floci.services.comprehend.ComprehendJsonHandler;+import io.github.hectorvent.floci.services.configservice.ConfigServiceJsonHandler;+import io.github.hectorvent.floci.services.cur.CurJsonHandler;+import io.github.hectorvent.floci.services.datasync.DataSyncJsonHandler;import io.github.hectorvent.floci.services.dms.DmsJsonHandler;import io.github.hectorvent.floci.services.ecr.EcrJsonHandler;-import io.github.hectorvent.floci.services.transfer.TransferHandler;import io.github.hectorvent.floci.services.ecs.EcsJsonHandler;+import io.github.hectorvent.floci.services.emr.EmrHandler;+import io.github.hectorvent.floci.services.eventbridge.EventBridgeHandler;import io.github.hectorvent.floci.services.firehose.FirehoseJsonHandler;+import io.github.hectorvent.floci.services.globalaccelerator.GlobalAcceleratorJsonHandler;import io.github.hectorvent.floci.services.glue.GlueJsonHandler;-import io.github.hectorvent.floci.services.lightsail.LightsailJsonHandler;-import io.github.hectorvent.floci.services.resourcegroupstagging.ResourceGroupsTaggingJsonHandler;-import io.github.hectorvent.floci.services.bcmdataexports.BcmDataExportsJsonHandler;-import io.github.hectorvent.floci.services.ce.CostExplorerJsonHandler;-import io.github.hectorvent.floci.services.cloudtrail.CloudTrailJsonHandler;-import io.github.hectorvent.floci.services.applicationautoscaling.ApplicationAutoScalingJsonHandler;-import io.github.hectorvent.floci.services.cloudcontrol.CloudControlJsonHandler;-import io.github.hectorvent.floci.services.ssoadmin.SsoAdminJsonHandler;import io.github.hectorvent.floci.services.identitystore.IdentityStoreJsonHandler;-import io.github.hectorvent.floci.services.budgets.BudgetsJsonHandler;-import io.github.hectorvent.floci.services.configservice.ConfigServiceJsonHandler;-import io.github.hectorvent.floci.services.cur.CurJsonHandler;-import io.github.hectorvent.floci.services.pricing.PricingJsonHandler;-import io.github.hectorvent.floci.services.textract.TextractJsonHandler;-import io.github.hectorvent.floci.services.comprehend.ComprehendJsonHandler;-import io.github.hectorvent.floci.services.rekognition.RekognitionJsonHandler;-import io.github.hectorvent.floci.services.transcribe.TranscribeJsonHandler;-import io.github.hectorvent.floci.services.translate.TranslateJsonHandler;-import io.github.hectorvent.floci.services.apigatewayv2.ApiGatewayV2JsonHandler;-import io.github.hectorvent.floci.services.cloudwatch.logs.CloudWatchLogsHandler;-import io.github.hectorvent.floci.services.cognito.CognitoJsonHandler;-import io.github.hectorvent.floci.services.cloudmap.CloudMapHandler;-import io.github.hectorvent.floci.services.eventbridge.EventBridgeHandler;-import io.github.hectorvent.floci.services.emr.EmrHandler;-import io.github.hectorvent.floci.services.memorydb.MemoryDbHandler;-import io.github.hectorvent.floci.services.marketplace.MarketplaceEntitlementController;-import io.github.hectorvent.floci.services.marketplace.MarketplaceMeteringController;-import io.github.hectorvent.floci.services.wafv2.WafV2Handler;import io.github.hectorvent.floci.services.kinesis.KinesisJsonHandler;import io.github.hectorvent.floci.services.kinesisanalytics.KinesisAnalyticsV2JsonHandler;import io.github.hectorvent.floci.services.kms.KmsJsonHandler;-import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerJsonHandler;+import io.github.hectorvent.floci.services.lightsail.LightsailJsonHandler;+import io.github.hectorvent.floci.services.marketplace.MarketplaceEntitlementController;+import io.github.hectorvent.floci.services.marketplace.MarketplaceMeteringController;+import io.github.hectorvent.floci.services.memorydb.MemoryDbHandler;+import io.github.hectorvent.floci.services.networkfirewall.NetworkFirewallJsonHandler;import io.github.hectorvent.floci.services.organizations.OrganizationsJsonHandler;-import io.github.hectorvent.floci.services.cognitoidentity.CognitoIdentityJsonHandler;-import io.github.hectorvent.floci.services.globalaccelerator.GlobalAcceleratorJsonHandler;-import io.github.hectorvent.floci.services.datasync.DataSyncJsonHandler;+import io.github.hectorvent.floci.services.pricing.PricingJsonHandler;+import io.github.hectorvent.floci.services.redshiftdata.RedshiftDataJsonHandler;+import io.github.hectorvent.floci.services.redshiftserverless.RedshiftServerlessJsonHandler;+import io.github.hectorvent.floci.services.rekognition.RekognitionJsonHandler;+import io.github.hectorvent.floci.services.resourcegroupstagging.ResourceGroupsTaggingJsonHandler;import io.github.hectorvent.floci.services.route53resolver.Route53ResolverJsonHandler;-import io.github.hectorvent.floci.services.networkfirewall.NetworkFirewallJsonHandler;+import io.github.hectorvent.floci.services.sagemaker.SageMakerJsonHandler;+import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerJsonHandler;import io.github.hectorvent.floci.services.servicecatalog.ServiceCatalogJsonHandler;import io.github.hectorvent.floci.services.servicequotas.ServiceQuotasJsonHandler;-import io.github.hectorvent.floci.services.sagemaker.SageMakerJsonHandler;import io.github.hectorvent.floci.services.ssm.Ec2MessagesJsonHandler;import io.github.hectorvent.floci.services.ssm.SsmJsonHandler;+import io.github.hectorvent.floci.services.ssoadmin.SsoAdminJsonHandler;+import io.github.hectorvent.floci.services.textract.TextractJsonHandler;+import io.github.hectorvent.floci.services.transcribe.TranscribeJsonHandler;+import io.github.hectorvent.floci.services.transfer.TransferHandler;+import io.github.hectorvent.floci.services.translate.TranslateJsonHandler;+import io.github.hectorvent.floci.services.wafv2.WafV2Handler;import jakarta.inject.Inject;import jakarta.ws.rs.*;import jakarta.ws.rs.core.Context;diff --git a/src/main/java/io/github/hectorvent/floci/core/common/AwsJsonCborController.java b/src/main/java/io/github/hectorvent/floci/core/common/AwsJsonCborController.javaindex 8b6073519d..1c8ec02466 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/AwsJsonCborController.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/AwsJsonCborController.java@@ -13,10 +13,10 @@ import io.github.hectorvent.floci.services.cloudwatch.metrics.CloudWatchMetricsJimport io.github.hectorvent.floci.services.dynamodb.DynamoDbJsonHandler;import io.github.hectorvent.floci.services.dynamodb.DynamoDbStreamsJsonHandler;import io.github.hectorvent.floci.services.kinesis.KinesisJsonHandler;+import io.github.hectorvent.floci.services.marketplace.MarketplaceEntitlementController;import io.github.hectorvent.floci.services.sns.SnsJsonHandler;import io.github.hectorvent.floci.services.sqs.SqsJsonHandler;import io.github.hectorvent.floci.services.stepfunctions.StepFunctionsJsonHandler;-import io.github.hectorvent.floci.services.marketplace.MarketplaceEntitlementController;import jakarta.inject.Inject;import jakarta.ws.rs.*;import jakarta.ws.rs.core.Context;diff --git a/src/main/java/io/github/hectorvent/floci/core/common/AwsJsonController.java b/src/main/java/io/github/hectorvent/floci/core/common/AwsJsonController.javaindex b9a7242393..1ada2fa700 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/AwsJsonController.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/AwsJsonController.java@@ -5,15 +5,15 @@ import com.fasterxml.jackson.databind.DeserializationFeature;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.ObjectReader;-import io.github.hectorvent.floci.services.cloudcontrol.CloudControlJsonHandler;import io.github.hectorvent.floci.services.bcmpricingcalculator.BcmPricingCalculatorJsonHandler;+import io.github.hectorvent.floci.services.cloudcontrol.CloudControlJsonHandler;import io.github.hectorvent.floci.services.cloudwatch.metrics.CloudWatchMetricsJsonHandler;import io.github.hectorvent.floci.services.dynamodb.DynamoDbJsonHandler;import io.github.hectorvent.floci.services.dynamodb.DynamoDbRequestShapes;import io.github.hectorvent.floci.services.dynamodb.DynamoDbResponses;import io.github.hectorvent.floci.services.dynamodb.DynamoDbStreamsJsonHandler;-import io.github.hectorvent.floci.services.networkfirewall.NetworkFirewallJsonHandler;import io.github.hectorvent.floci.services.marketplace.MarketplaceJsonHandler;+import io.github.hectorvent.floci.services.networkfirewall.NetworkFirewallJsonHandler;import io.github.hectorvent.floci.services.sns.SnsJsonHandler;import io.github.hectorvent.floci.services.sqs.SqsJsonHandler;import io.github.hectorvent.floci.services.stepfunctions.StepFunctionsJsonHandler;diff --git a/src/main/java/io/github/hectorvent/floci/core/common/AwsQueryController.java b/src/main/java/io/github/hectorvent/floci/core/common/AwsQueryController.javaindex 74e82b2085..14a87dbf6a 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/AwsQueryController.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/AwsQueryController.java@@ -1,25 +1,25 @@package io.github.hectorvent.floci.core.common;-import io.github.hectorvent.floci.services.neptune.NeptuneQueryHandler;-import io.github.hectorvent.floci.services.neptune.NeptuneService;-import io.github.hectorvent.floci.services.docdb.DocDbQueryHandler;-import io.github.hectorvent.floci.services.docdb.DocDbService;import io.github.hectorvent.floci.services.autoscaling.AutoScalingQueryHandler;import io.github.hectorvent.floci.services.cloudformation.CloudFormationQueryHandler;+import io.github.hectorvent.floci.services.cloudwatch.metrics.CloudWatchMetricsQueryHandler;+import io.github.hectorvent.floci.services.cognito.CognitoJsonHandler;+import io.github.hectorvent.floci.services.docdb.DocDbQueryHandler;+import io.github.hectorvent.floci.services.docdb.DocDbService;import io.github.hectorvent.floci.services.ec2.Ec2QueryHandler;+import io.github.hectorvent.floci.services.elasticache.ElastiCacheQueryHandler;import io.github.hectorvent.floci.services.elasticbeanstalk.ElasticBeanstalkQueryHandler;import io.github.hectorvent.floci.services.elb.ElbClassicQueryHandler;import io.github.hectorvent.floci.services.elbv2.ElbV2QueryHandler;-import io.github.hectorvent.floci.services.cloudwatch.metrics.CloudWatchMetricsQueryHandler;-import io.github.hectorvent.floci.services.cognito.CognitoJsonHandler;-import io.github.hectorvent.floci.services.elasticache.ElastiCacheQueryHandler;import io.github.hectorvent.floci.services.iam.IamQueryHandler;import io.github.hectorvent.floci.services.iam.StsQueryHandler;+import io.github.hectorvent.floci.services.neptune.NeptuneQueryHandler;+import io.github.hectorvent.floci.services.neptune.NeptuneService;import io.github.hectorvent.floci.services.rds.RdsQueryHandler;import io.github.hectorvent.floci.services.rds.RdsService;import io.github.hectorvent.floci.services.redshift.RedshiftQueryHandler;-import io.github.hectorvent.floci.services.sns.SnsQueryHandler;import io.github.hectorvent.floci.services.ses.SesQueryHandler;+import io.github.hectorvent.floci.services.sns.SnsQueryHandler;import io.github.hectorvent.floci.services.sqs.SqsQueryHandler;import jakarta.inject.Inject;import jakarta.ws.rs.Consumes;diff --git a/src/main/java/io/github/hectorvent/floci/core/common/JsonErrorResponseUtils.java b/src/main/java/io/github/hectorvent/floci/core/common/JsonErrorResponseUtils.javaindex 1274024575..1a5d97a910 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/JsonErrorResponseUtils.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/JsonErrorResponseUtils.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.core.common;-import io.github.hectorvent.floci.services.dynamodb.model.ConditionalCheckFailedException;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.dynamodb.model.ConditionalCheckFailedException;import jakarta.ws.rs.core.Response;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java b/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.javaindex a1932c75bf..f39ef69a99 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java@@ -1,43 +1,67 @@package io.github.hectorvent.floci.core.common;import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.services.accessanalyzer.AccessAnalyzerController;+import io.github.hectorvent.floci.services.account.AccountController;import io.github.hectorvent.floci.services.apigateway.ApiGatewayController;import io.github.hectorvent.floci.services.appconfig.AppConfigController;-import io.github.hectorvent.floci.services.backup.BackupController;-import io.github.hectorvent.floci.services.resourceexplorer2.ResourceExplorer2Controller;import io.github.hectorvent.floci.services.appconfig.AppConfigDataController;+import io.github.hectorvent.floci.services.appsync.AppSyncController;+import io.github.hectorvent.floci.services.aps.ApsController;+import io.github.hectorvent.floci.services.backup.BackupController;import io.github.hectorvent.floci.services.batch.BatchController;import io.github.hectorvent.floci.services.bedrock.BedrockController;+import io.github.hectorvent.floci.services.bedrockagentcore.BedrockAgentCoreController;+import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreControlController;+import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreGatewayController;+import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreGatewayRuleController;+import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreIdentityController;+import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreMemoryController;+import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreResourcePolicyController;+import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreToolsController;import io.github.hectorvent.floci.services.bedrockruntime.BedrockRuntimeController;+import io.github.hectorvent.floci.services.cloudfront.CloudFrontController;+import io.github.hectorvent.floci.services.cloudfront.CloudFrontServingController;import io.github.hectorvent.floci.services.codeartifact.CodeArtifactMavenController;import io.github.hectorvent.floci.services.codeartifact.CodeArtifactPypiController;import io.github.hectorvent.floci.services.cognito.CognitoOAuthController;import io.github.hectorvent.floci.services.cognito.CognitoWellKnownController;+import io.github.hectorvent.floci.services.controlcatalog.ControlCatalogController;+import io.github.hectorvent.floci.services.controltower.ControlTowerControlController;+import io.github.hectorvent.floci.services.controltower.ControlTowerController;+import io.github.hectorvent.floci.services.detective.DetectiveController;+import io.github.hectorvent.floci.services.dlm.DlmController;+import io.github.hectorvent.floci.services.efs.EfsController;import io.github.hectorvent.floci.services.eks.EksController;import io.github.hectorvent.floci.services.fis.FisController;-import io.github.hectorvent.floci.services.mwaa.MwaaController;+import io.github.hectorvent.floci.services.guardduty.GuardDutyController;+import io.github.hectorvent.floci.services.inspector2.Inspector2Controller;import io.github.hectorvent.floci.services.iot.IotAuthorizerController;import io.github.hectorvent.floci.services.iot.IotController;-import io.github.hectorvent.floci.services.iot.IotDomainConfigurationController;import io.github.hectorvent.floci.services.iot.IotDataController;-import io.github.hectorvent.floci.services.bedrockagentcore.BedrockAgentCoreController;-import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreControlController;-import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreGatewayController;-import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreGatewayRuleController;-import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreIdentityController;-import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreMemoryController;-import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreResourcePolicyController;-import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreToolsController;-import io.github.hectorvent.floci.services.pipes.PipesController;+import io.github.hectorvent.floci.services.iot.IotDomainConfigurationController;import io.github.hectorvent.floci.services.lambda.LambdaController;import io.github.hectorvent.floci.services.lambda.durable.DurableExecutionController;import io.github.hectorvent.floci.services.lambdamicrovms.LambdaMicrovmsController;import io.github.hectorvent.floci.services.lambdamicrovms.LambdaNetworkConnectorsController;-import io.github.hectorvent.floci.services.opensearch.OpenSearchController;+import io.github.hectorvent.floci.services.macie2.MacieController;+import io.github.hectorvent.floci.services.marketplace.MarketplaceCatalogController;+import io.github.hectorvent.floci.services.marketplace.MarketplaceDeploymentController;+import io.github.hectorvent.floci.services.marketplace.MarketplaceDiscoveryController;+import io.github.hectorvent.floci.services.marketplace.MarketplaceReportingController;+import io.github.hectorvent.floci.services.mwaa.MwaaController;import io.github.hectorvent.floci.services.oam.OamController;-import io.github.hectorvent.floci.services.cloudfront.CloudFrontController;-import io.github.hectorvent.floci.services.cloudfront.CloudFrontServingController;+import io.github.hectorvent.floci.services.opensearch.OpenSearchController;+import io.github.hectorvent.floci.services.pipes.PipesController;+import io.github.hectorvent.floci.services.rdsdata.RdsDataController;+import io.github.hectorvent.floci.services.resourceexplorer2.ResourceExplorer2Controller;import io.github.hectorvent.floci.services.route53.Route53Controller;+import io.github.hectorvent.floci.services.rum.RumController;+import io.github.hectorvent.floci.services.s3.S3Controller;+import io.github.hectorvent.floci.services.s3tables.S3TablesController;+import io.github.hectorvent.floci.services.s3vectors.S3VectorsController;+import io.github.hectorvent.floci.services.sagemaker.SageMakerRuntimeController;+import io.github.hectorvent.floci.services.securityhub.SecurityHubController;import io.github.hectorvent.floci.services.ses.SesAccountController;import io.github.hectorvent.floci.services.ses.SesConfigurationSetController;import io.github.hectorvent.floci.services.ses.SesContactController;@@ -53,37 +77,13 @@ import io.github.hectorvent.floci.services.ses.SesSuppressionController;import io.github.hectorvent.floci.services.ses.SesTagController;import io.github.hectorvent.floci.services.ses.SesTemplateController;import io.github.hectorvent.floci.services.ses.SesTenantController;-import io.github.hectorvent.floci.services.appsync.AppSyncController;-import io.github.hectorvent.floci.services.rdsdata.RdsDataController;-import io.github.hectorvent.floci.services.guardduty.GuardDutyController;-import io.github.hectorvent.floci.services.macie2.MacieController;-import io.github.hectorvent.floci.services.account.AccountController;-import io.github.hectorvent.floci.services.accessanalyzer.AccessAnalyzerController;-import io.github.hectorvent.floci.services.inspector2.Inspector2Controller;-import io.github.hectorvent.floci.services.securityhub.SecurityHubController;import io.github.hectorvent.floci.services.ssooidc.SsoOidcController;import io.github.hectorvent.floci.services.ssoportal.SsoPortalController;-import io.github.hectorvent.floci.services.detective.DetectiveController;-import io.github.hectorvent.floci.services.dlm.DlmController;-import io.github.hectorvent.floci.services.aps.ApsController;-import io.github.hectorvent.floci.services.controlcatalog.ControlCatalogController;-import io.github.hectorvent.floci.services.controltower.ControlTowerControlController;-import io.github.hectorvent.floci.services.controltower.ControlTowerController;-import io.github.hectorvent.floci.services.rum.RumController;-import io.github.hectorvent.floci.services.s3vectors.S3VectorsController;-import io.github.hectorvent.floci.services.s3tables.S3TablesController;-import io.github.hectorvent.floci.services.efs.EfsController;-import io.github.hectorvent.floci.services.marketplace.MarketplaceCatalogController;-import io.github.hectorvent.floci.services.marketplace.MarketplaceDeploymentController;-import io.github.hectorvent.floci.services.marketplace.MarketplaceDiscoveryController;-import io.github.hectorvent.floci.services.marketplace.MarketplaceReportingController;-import io.github.hectorvent.floci.services.sagemaker.SageMakerRuntimeController;-import io.github.hectorvent.floci.services.s3.S3Controller;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;-import java.util.EnumSet;import java.util.Arrays;+import java.util.EnumSet;import java.util.List;import java.util.Optional;import java.util.Set;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 4a0ec9c3c3..7fb9ff42c2 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@@ -1,7 +1,7 @@package io.github.hectorvent.floci.core.common;-import com.fasterxml.jackson.dataformat.cbor.CBORFactory;import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.dataformat.cbor.CBORFactory;import jakarta.inject.Inject;import jakarta.ws.rs.container.ContainerRequestContext;import jakarta.ws.rs.container.ContainerRequestFilter;diff --git a/src/main/java/io/github/hectorvent/floci/core/common/Totp.java b/src/main/java/io/github/hectorvent/floci/core/common/Totp.javaindex 77974fd709..64a957c4cd 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/Totp.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/Totp.java@@ -1,5 +1,7 @@package io.github.hectorvent.floci.core.common;+import javax.crypto.Mac;+import javax.crypto.spec.SecretKeySpec;import java.nio.ByteBuffer;import java.nio.charset.StandardCharsets;import java.security.GeneralSecurityException;@@ -7,8 +9,6 @@ import java.security.MessageDigest;import java.security.SecureRandom;import java.time.Instant;import java.util.Locale;-import javax.crypto.Mac;-import javax.crypto.spec.SecretKeySpec;/*** Time-based one-time passwords as specified in RFC 6238: HMAC-SHA1 over the number of 30-seconddiff --git a/src/main/java/io/github/hectorvent/floci/core/common/WebIdentityTokenVerifier.java b/src/main/java/io/github/hectorvent/floci/core/common/WebIdentityTokenVerifier.javaindex 46e02e9175..fd82542042 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/WebIdentityTokenVerifier.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/WebIdentityTokenVerifier.java@@ -1,5 +1,11 @@package io.github.hectorvent.floci.core.common;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import jakarta.enterprise.context.ApplicationScoped;+import jakarta.inject.Inject;+import org.jboss.logging.Logger;+import java.io.IOException;import java.nio.charset.StandardCharsets;import java.security.GeneralSecurityException;@@ -11,14 +17,6 @@ import java.util.Base64;import java.util.List;import java.util.Optional;-import org.jboss.logging.Logger;--import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;--import jakarta.enterprise.context.ApplicationScoped;-import jakarta.inject.Inject;-/*** Verifies RS256-signed web-identity JWTs against a Floci-known OIDC issuer.*diff --git a/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerLogStreamer.java b/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerLogStreamer.javaindex 16a102642e..a4e651ad97 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerLogStreamer.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/docker/ContainerLogStreamer.java@@ -1,12 +1,12 @@package io.github.hectorvent.floci.core.common.docker;-import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.services.cloudwatch.logs.CloudWatchLogsService;import com.github.dockerjava.api.DockerClient;import com.github.dockerjava.api.async.ResultCallback;import com.github.dockerjava.api.command.LogContainerCmd;import com.github.dockerjava.api.model.Frame;import com.github.dockerjava.api.model.StreamType;+import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.services.cloudwatch.logs.CloudWatchLogsService;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;@@ -28,8 +28,8 @@ import java.util.List;import java.util.Map;import java.util.Optional;import java.util.concurrent.ScheduledExecutorService;-import java.util.concurrent.ScheduledThreadPoolExecutor;import java.util.concurrent.ScheduledFuture;+import java.util.concurrent.ScheduledThreadPoolExecutor;import java.util.concurrent.TimeUnit;import java.util.concurrent.locks.ReentrantReadWriteLock;import java.util.function.Consumer;diff --git a/src/main/java/io/github/hectorvent/floci/core/common/docker/DockerClientProducer.java b/src/main/java/io/github/hectorvent/floci/core/common/docker/DockerClientProducer.javaindex aecb812f73..67b01c3157 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/docker/DockerClientProducer.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/docker/DockerClientProducer.java@@ -1,6 +1,5 @@package io.github.hectorvent.floci.core.common.docker;-import io.github.hectorvent.floci.config.EmulatorConfig;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.github.dockerjava.api.DockerClient;@@ -10,6 +9,7 @@ import com.github.dockerjava.core.DockerClientImpl;import com.github.dockerjava.core.SSLConfig;import com.github.dockerjava.core.util.CertificateUtils;import com.github.dockerjava.transport.DockerHttpClient;+import io.github.hectorvent.floci.config.EmulatorConfig;import jakarta.enterprise.context.ApplicationScoped;import jakarta.enterprise.inject.Produces;import jakarta.inject.Inject;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 7a00c04389..4f958b4f55 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@@ -1,9 +1,9 @@package io.github.hectorvent.floci.core.storage;+import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RequestContext;import io.github.hectorvent.floci.core.common.ServiceConfigAccess;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.enterprise.inject.Instance;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoController.java b/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoController.javaindex 3f6d21d210..8820dd75c0 100644--- a/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoController.java+++ b/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorInfoController.java@@ -5,22 +5,21 @@ import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.config.FlociCertificateAuthority;import io.github.hectorvent.floci.core.common.ContainerTeardown;import io.github.hectorvent.floci.core.common.ContainerTeardowns;+import io.github.hectorvent.floci.core.common.Resettable;import io.github.hectorvent.floci.core.common.ServiceRegistry;+import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.lifecycle.inithook.InitializationHook;import io.github.hectorvent.floci.services.dynamodb.backend.DynamoDbBackendSelector;+import jakarta.enterprise.inject.Instance;import jakarta.inject.Inject;import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;import jakarta.ws.rs.Path;import jakarta.ws.rs.Produces;import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.Response;import org.jboss.logging.Logger;-import io.github.hectorvent.floci.core.storage.StorageFactory;-import io.github.hectorvent.floci.core.common.Resettable;-import jakarta.enterprise.inject.Instance;-import jakarta.ws.rs.POST;-import java.io.IOException;import java.nio.file.Files;import java.security.GeneralSecurityException;diff --git a/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycle.java b/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycle.javaindex 8a3f01e277..4bf9c42e81 100644--- a/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycle.java+++ b/src/main/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycle.java@@ -8,38 +8,38 @@ import io.github.hectorvent.floci.core.storage.PersistentPathValidator;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.lifecycle.inithook.InitializationHook;import io.github.hectorvent.floci.lifecycle.inithook.InitializationHooksRunner;+import io.github.hectorvent.floci.services.amazonmq.container.RabbitMqManager;+import io.github.hectorvent.floci.services.appsync.graphql.SchemaCreationWorker;+import io.github.hectorvent.floci.services.docdb.container.DocDbContainerManager;+import io.github.hectorvent.floci.services.dynamodb.DynamoDbRuntime;import io.github.hectorvent.floci.services.ec2.Ec2MetadataServer;+import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;import io.github.hectorvent.floci.services.ecs.EcsService;import io.github.hectorvent.floci.services.ecs.container.EcsTaskRoleCredentialsServer;-import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;-import io.github.hectorvent.floci.services.floci.ui.FlociUiManager;-import io.github.hectorvent.floci.services.amazonmq.container.RabbitMqManager;-import io.github.hectorvent.floci.services.kinesisanalytics.container.FlinkContainerManager;-import io.github.hectorvent.floci.services.iam.IamService;import io.github.hectorvent.floci.services.elasticache.ElastiCacheMemcachedService;import io.github.hectorvent.floci.services.elasticache.ElastiCacheService;import io.github.hectorvent.floci.services.elasticache.container.ElastiCacheContainerManager;import io.github.hectorvent.floci.services.elasticache.container.ElastiCacheMemcachedContainerManager;import io.github.hectorvent.floci.services.elasticache.proxy.ElastiCacheProxyManager;-import io.github.hectorvent.floci.services.docdb.container.DocDbContainerManager;-import io.github.hectorvent.floci.services.dynamodb.DynamoDbRuntime;+import io.github.hectorvent.floci.services.elb.ElbClassicService;+import io.github.hectorvent.floci.services.elbv2.ElbV2Service;+import io.github.hectorvent.floci.services.floci.ui.FlociUiManager;+import io.github.hectorvent.floci.services.iam.IamService;+import io.github.hectorvent.floci.services.kinesisanalytics.container.FlinkContainerManager;import io.github.hectorvent.floci.services.lambda.DynamoDbStreamsEventSourcePoller;import io.github.hectorvent.floci.services.lambda.KinesisEventSourcePoller;import io.github.hectorvent.floci.services.lambda.SqsEventSourcePoller;import io.github.hectorvent.floci.services.lambda.durable.DurableExecutionService;+import io.github.hectorvent.floci.services.memorydb.container.MemoryDbContainerManager;+import io.github.hectorvent.floci.services.memorydb.proxy.MemoryDbProxyManager;import io.github.hectorvent.floci.services.neptune.container.NeptuneContainerManager;import io.github.hectorvent.floci.services.neptune.proxy.NeptuneProxyManager;import io.github.hectorvent.floci.services.pipes.PipesService;-import io.github.hectorvent.floci.services.appsync.graphql.SchemaCreationWorker;-import io.github.hectorvent.floci.services.elb.ElbClassicService;-import io.github.hectorvent.floci.services.elbv2.ElbV2Service;import io.github.hectorvent.floci.services.rds.RdsService;-import io.github.hectorvent.floci.services.stepfunctions.StepFunctionsService;-import io.github.hectorvent.floci.services.memorydb.container.MemoryDbContainerManager;-import io.github.hectorvent.floci.services.memorydb.proxy.MemoryDbProxyManager;import io.github.hectorvent.floci.services.rds.container.RdsContainerManager;import io.github.hectorvent.floci.services.rds.proxy.RdsProxyManager;import io.github.hectorvent.floci.services.redshift.RedshiftDynamoDbZeroEtlConsumer;+import io.github.hectorvent.floci.services.stepfunctions.StepFunctionsService;import io.github.hectorvent.floci.services.timestreaminfluxdb.TimestreamInfluxDbService;import io.quarkus.runtime.Quarkus;import io.quarkus.runtime.ShutdownDelayInitiatedEvent;diff --git a/src/main/java/io/github/hectorvent/floci/services/acm/CertificateGenerator.java b/src/main/java/io/github/hectorvent/floci/services/acm/CertificateGenerator.javaindex fc34c98aba..471231e7a2 100644--- a/src/main/java/io/github/hectorvent/floci/services/acm/CertificateGenerator.java+++ b/src/main/java/io/github/hectorvent/floci/services/acm/CertificateGenerator.java@@ -33,6 +33,11 @@ import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;import org.bouncycastle.util.io.pem.PemObject;import org.jboss.logging.Logger;+import javax.crypto.Cipher;+import javax.crypto.SecretKey;+import javax.crypto.SecretKeyFactory;+import javax.crypto.spec.PBEKeySpec;+import javax.crypto.spec.PBEParameterSpec;import java.io.StringReader;import java.io.StringWriter;import java.math.BigInteger;@@ -58,11 +63,6 @@ import java.util.LinkedHashSet;import java.util.List;import java.util.Locale;import java.util.regex.Pattern;-import javax.crypto.Cipher;-import javax.crypto.SecretKey;-import javax.crypto.SecretKeyFactory;-import javax.crypto.spec.PBEKeySpec;-import javax.crypto.spec.PBEParameterSpec;@ApplicationScopedpublic class CertificateGenerator {diff --git a/src/main/java/io/github/hectorvent/floci/services/amazonmq/AmazonMqService.java b/src/main/java/io/github/hectorvent/floci/services/amazonmq/AmazonMqService.javaindex 8652bddb8d..c81c7ccfee 100644--- a/src/main/java/io/github/hectorvent/floci/services/amazonmq/AmazonMqService.java+++ b/src/main/java/io/github/hectorvent/floci/services/amazonmq/AmazonMqService.java@@ -2,10 +2,10 @@ package io.github.hectorvent.floci.services.amazonmq;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;-import io.github.hectorvent.floci.core.common.docker.ContainerStorageHelper;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.common.docker.ContainerStorageHelper;import io.github.hectorvent.floci.core.resource.ExplorerResource;import io.github.hectorvent.floci.core.resource.ResourceProvider;import io.github.hectorvent.floci.core.resource.SupportedResourceType;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayController.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayController.javaindex 7dee3e1fd3..4b7548a7e2 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayController.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayController.java@@ -1,21 +1,10 @@package io.github.hectorvent.floci.services.apigateway;-import java.io.IOException;-import java.nio.charset.StandardCharsets;-import java.util.HexFormat;-import java.time.Instant;-import java.util.ArrayList;-import java.util.HashMap;-import java.util.List;-import java.util.Map;-import java.util.Set;-import com.fasterxml.jackson.core.io.JsonStringEncoder;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.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -60,6 +49,16 @@ import jakarta.ws.rs.core.HttpHeaders;import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.Response;+import java.io.IOException;+import java.nio.charset.StandardCharsets;+import java.time.Instant;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.HexFormat;+import java.util.List;+import java.util.Map;+import java.util.Set;+/*** Unified AWS API Gateway management endpoints (v1 REST and v2 HTTP).*/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 31de962cef..8bff5614c9 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,12 @@package io.github.hectorvent.floci.services.apigateway;+// REST and v2 both define Authorizer; the less-used REST type is qualified below.++import com.fasterxml.jackson.core.type.TypeReference;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;import com.jayway.jsonpath.Configuration;import com.jayway.jsonpath.InvalidPathException;import com.jayway.jsonpath.JsonPath;@@ -28,7 +35,6 @@ import io.github.hectorvent.floci.services.apigateway.model.UsagePlanKey;import io.github.hectorvent.floci.services.apigatewayv2.ApiGatewayV2Service;import io.github.hectorvent.floci.services.apigatewayv2.JwtSignatureVerifier;import io.github.hectorvent.floci.services.apigatewayv2.model.Api;-// REST and v2 both define Authorizer; the less-used REST type is qualified below.import io.github.hectorvent.floci.services.apigatewayv2.model.Authorizer;import io.github.hectorvent.floci.services.apigatewayv2.model.Route;import io.github.hectorvent.floci.services.apigatewayv2.websocket.ConnectionInfo;@@ -41,11 +47,6 @@ import io.github.hectorvent.floci.services.lambda.LambdaService;import io.github.hectorvent.floci.services.lambda.model.InvocationType;import io.github.hectorvent.floci.services.lambda.model.InvokeResult;import io.github.hectorvent.floci.services.sqs.SqsQueryHandler;-import com.fasterxml.jackson.core.type.TypeReference;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import io.smallrye.common.annotation.Blocking;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/AwsServiceRouter.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/AwsServiceRouter.javaindex 7dd2ba57e4..2b5eca9664 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/AwsServiceRouter.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/AwsServiceRouter.java@@ -1,7 +1,7 @@package io.github.hectorvent.floci.services.apigateway;-import io.github.hectorvent.floci.core.common.AwsArnUtils;import com.fasterxml.jackson.databind.JsonNode;+import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.acm.AcmJsonHandler;import io.github.hectorvent.floci.services.cloudwatch.logs.CloudWatchLogsHandler;@@ -22,6 +22,7 @@ import jakarta.inject.Inject;import jakarta.ws.rs.core.MultivaluedMap;import jakarta.ws.rs.core.Response;import org.jboss.logging.Logger;+import java.util.regex.Matcher;/**diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/VtlTemplateEngine.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/VtlTemplateEngine.javaindex 7fc6caa84d..f546b77f92 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/VtlTemplateEngine.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/VtlTemplateEngine.java@@ -2,11 +2,11 @@ package io.github.hectorvent.floci.services.apigateway;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;-import io.github.hectorvent.floci.core.common.vtl.VtlUtilFunctions;import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.core.common.vtl.VtlUtilFunctions;+import io.quarkus.runtime.annotations.RegisterForReflection;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;-import io.quarkus.runtime.annotations.RegisterForReflection;import org.apache.velocity.VelocityContext;import org.apache.velocity.app.VelocityEngine;import org.apache.velocity.runtime.ParserPoolImpl;@@ -30,8 +30,8 @@ import org.apache.velocity.util.introspection.TypeConversionHandlerImpl;import org.apache.velocity.util.introspection.UberspectImpl;import java.io.StringWriter;-import java.util.AbstractMap;import java.time.Duration;+import java.util.AbstractMap;import java.util.HashMap;import java.util.Map;import java.util.Set;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Account.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Account.javaindex 3ac75ab26e..019811592d 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Account.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Account.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.apigateway.model;+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.ArrayList;import java.util.List;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;-@JsonIgnoreProperties(ignoreUnknown = true)@RegisterForReflectionpublic class Account {diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/ApiGatewayResource.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/ApiGatewayResource.javaindex 0b0cf6593e..4b9516a327 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/ApiGatewayResource.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/ApiGatewayResource.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.apigateway.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Deployment.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Deployment.javaindex 030d31be99..9b3a501f48 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Deployment.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Deployment.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.apigateway.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonIgnoreProperties(ignoreUnknown = true)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/EndpointConfiguration.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/EndpointConfiguration.javaindex 1af943fca5..4dcc6b9eb3 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/EndpointConfiguration.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/EndpointConfiguration.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.apigateway.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.ArrayList;import java.util.List;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Integration.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Integration.javaindex f9f3ed8c67..9260533a12 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Integration.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Integration.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.apigateway.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.ArrayList;import java.util.HashMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/IntegrationResponse.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/IntegrationResponse.javaindex d3266318c4..1306de0a6f 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/IntegrationResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/IntegrationResponse.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.apigateway.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/MethodConfig.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/MethodConfig.javaindex ed87154fca..4b7ef19e88 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/MethodConfig.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/MethodConfig.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.apigateway.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.ArrayList;import java.util.HashMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/MethodResponse.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/MethodResponse.javaindex 9fee2341cd..3997f3ecd9 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/MethodResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/MethodResponse.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.apigateway.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/MethodSetting.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/MethodSetting.javaindex afbbe0262c..6e4d3b67a8 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/MethodSetting.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/MethodSetting.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.apigateway.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;/*** Per-method settings on an API Gateway v1 Stage, addressed by thediff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/RestApi.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/RestApi.javaindex 1d8bf10f6b..26cd64581b 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/RestApi.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/RestApi.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.apigateway.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.ArrayList;import java.util.HashMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Stage.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Stage.javaindex d4a7d058c2..29dff17700 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Stage.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/Stage.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.apigateway.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.HashMap;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/ThrottleSettings.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/ThrottleSettings.javaindex 18d2f84465..ab18c7262b 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/ThrottleSettings.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/ThrottleSettings.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.apigateway.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonIgnoreProperties(ignoreUnknown = true)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/VpcLink.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/VpcLink.javaindex b948e3832a..953ca44654 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/model/VpcLink.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/model/VpcLink.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.apigateway.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.ArrayList;import java.util.HashMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/ApiGatewayV2JsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/ApiGatewayV2JsonHandler.javaindex 28e3af53bb..5903a961c8 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/ApiGatewayV2JsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/ApiGatewayV2JsonHandler.java@@ -1,10 +1,10 @@package io.github.hectorvent.floci.services.apigatewayv2;-import io.github.hectorvent.floci.core.common.AwsException;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.services.apigatewayv2.model.*;import jakarta.enterprise.context.ApplicationScoped;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/ApiGatewayV2Service.java b/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/ApiGatewayV2Service.javaindex bd4230a0cf..f3d0082d46 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/ApiGatewayV2Service.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/ApiGatewayV2Service.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.apigatewayv2;+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.AwsEndpoints;@@ -9,7 +10,6 @@ import io.github.hectorvent.floci.core.common.ReservedTags;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 com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.services.apigatewayv2.model.*;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/model/IntegrationResponse.java b/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/model/IntegrationResponse.javaindex 03d494e276..480a275366 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/model/IntegrationResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/model/IntegrationResponse.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.apigatewayv2.model;import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.Map;@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/model/RouteResponse.java b/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/model/RouteResponse.javaindex 72453ff296..2a1a788f47 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/model/RouteResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/model/RouteResponse.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.apigatewayv2.model;import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.Map;@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/HttpProxyInvoker.java b/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/HttpProxyInvoker.javaindex 02f08690a3..e65d5100d5 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/HttpProxyInvoker.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigatewayv2/proxy/HttpProxyInvoker.java@@ -8,7 +8,6 @@ import javax.net.ssl.SSLContext;import javax.net.ssl.SSLParameters;import javax.net.ssl.TrustManager;import javax.net.ssl.X509TrustManager;-import java.io.IOException;import java.io.InputStream;import java.net.InetAddress;diff --git a/src/main/java/io/github/hectorvent/floci/services/appconfig/AppConfigController.java b/src/main/java/io/github/hectorvent/floci/services/appconfig/AppConfigController.javaindex cb88d460a0..49d7a9b427 100644--- a/src/main/java/io/github/hectorvent/floci/services/appconfig/AppConfigController.java+++ b/src/main/java/io/github/hectorvent/floci/services/appconfig/AppConfigController.java@@ -23,6 +23,7 @@ import jakarta.ws.rs.Produces;import jakarta.ws.rs.QueryParam;import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.Response;+import java.io.IOException;import java.util.List;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/ScalableTarget.java b/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/ScalableTarget.javaindex 2a68977219..25706d1f60 100644--- a/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/ScalableTarget.java+++ b/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/ScalableTarget.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.applicationautoscaling.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.Collection;import java.util.Collections;import java.util.HashMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/ScalingPolicy.java b/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/ScalingPolicy.javaindex 77ca4e16b5..3ad24ba613 100644--- a/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/ScalingPolicy.java+++ b/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/ScalingPolicy.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.applicationautoscaling.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.ArrayList;import java.util.List;diff --git a/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/StepScalingConfiguration.java b/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/StepScalingConfiguration.javaindex ddf3a3884d..230a9ba3bc 100644--- a/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/StepScalingConfiguration.java+++ b/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/StepScalingConfiguration.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.applicationautoscaling.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.ArrayList;import java.util.List;diff --git a/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/TargetTrackingConfiguration.java b/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/TargetTrackingConfiguration.javaindex 755962eba3..f7fad4159f 100644--- a/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/TargetTrackingConfiguration.java+++ b/src/main/java/io/github/hectorvent/floci/services/applicationautoscaling/model/TargetTrackingConfiguration.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.applicationautoscaling.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.Map;/**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 ec7f9bfdc9..7ef32c59ee 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@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.appsync;-import io.github.hectorvent.floci.core.common.AwsArnUtils;import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.ObjectMapper;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.CloudFrontEdgeDomain;import io.github.hectorvent.floci.core.common.RegionResolver;diff --git a/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/ReturnDirective.java b/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/ReturnDirective.javaindex 0ea04e2853..31feca071e 100644--- a/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/ReturnDirective.java+++ b/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/ReturnDirective.java@@ -4,8 +4,8 @@ import org.apache.velocity.context.InternalContextAdapter;import org.apache.velocity.runtime.directive.Directive;import org.apache.velocity.runtime.parser.node.Node;-import java.io.Writer;import java.io.IOException;+import java.io.Writer;public class ReturnDirective extends Directive {diff --git a/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/js/NodeAppSyncJsRuntime.java b/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/js/NodeAppSyncJsRuntime.javaindex 3b8480911d..16a756f1d7 100644--- a/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/js/NodeAppSyncJsRuntime.java+++ b/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/js/NodeAppSyncJsRuntime.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.appsync.graphql.js;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;+import com.github.dockerjava.api.model.Container;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.ContainerTeardown;@@ -14,7 +15,6 @@ import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.Eimport 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.ContainerStorageHelper;-import com.github.dockerjava.api.model.Container;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/appsync/model/ChannelNamespace.java b/src/main/java/io/github/hectorvent/floci/services/appsync/model/ChannelNamespace.javaindex 39fc495aba..91f3f42241 100644--- a/src/main/java/io/github/hectorvent/floci/services/appsync/model/ChannelNamespace.java+++ b/src/main/java/io/github/hectorvent/floci/services/appsync/model/ChannelNamespace.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.appsync.model;import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import com.fasterxml.jackson.annotation.JsonInclude;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/aps/ApsController.java b/src/main/java/io/github/hectorvent/floci/services/aps/ApsController.javaindex 99465ef932..1638a74979 100644--- a/src/main/java/io/github/hectorvent/floci/services/aps/ApsController.java+++ b/src/main/java/io/github/hectorvent/floci/services/aps/ApsController.java@@ -1,13 +1,13 @@package io.github.hectorvent.floci.services.aps;+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.PaginatedResult;import io.github.hectorvent.floci.core.common.Pagination;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.services.aps.model.PrometheusWorkspace;import io.github.hectorvent.floci.services.aps.model.RuleGroupsNamespace;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.inject.Inject;import jakarta.ws.rs.Consumes;import jakarta.ws.rs.DELETE;diff --git a/src/main/java/io/github/hectorvent/floci/services/aps/ApsService.java b/src/main/java/io/github/hectorvent/floci/services/aps/ApsService.javaindex cf39427442..0581c9ca2d 100644--- a/src/main/java/io/github/hectorvent/floci/services/aps/ApsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/aps/ApsService.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.aps;+import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsEndpoints;import io.github.hectorvent.floci.core.common.AwsException;@@ -11,7 +12,6 @@ import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.aps.model.PrometheusWorkspace;import io.github.hectorvent.floci.services.aps.model.RuleGroupsNamespace;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;diff --git a/src/main/java/io/github/hectorvent/floci/services/athena/model/QueryExecutionStatus.java b/src/main/java/io/github/hectorvent/floci/services/athena/model/QueryExecutionStatus.javaindex 8864de60de..178307d27a 100644--- a/src/main/java/io/github/hectorvent/floci/services/athena/model/QueryExecutionStatus.java+++ b/src/main/java/io/github/hectorvent/floci/services/athena/model/QueryExecutionStatus.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.athena.model;import com.fasterxml.jackson.annotation.JsonFormat;import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/athena/model/ResultSet.java b/src/main/java/io/github/hectorvent/floci/services/athena/model/ResultSet.javaindex 8d7742779a..cbe69d3017 100644--- a/src/main/java/io/github/hectorvent/floci/services/athena/model/ResultSet.java+++ b/src/main/java/io/github/hectorvent/floci/services/athena/model/ResultSet.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.athena.model;import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingReconciler.java b/src/main/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingReconciler.javaindex 402947ce1f..869418f3a7 100644--- a/src/main/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingReconciler.java+++ b/src/main/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingReconciler.java@@ -17,13 +17,13 @@ import io.github.hectorvent.floci.services.elbv2.ElbV2Service;import io.github.hectorvent.floci.services.elbv2.model.TargetDescription;import io.github.hectorvent.floci.services.elbv2.model.TargetHealth;import io.github.hectorvent.floci.services.ssm.SsmCommandService;+import io.quarkus.runtime.StartupEvent;import jakarta.annotation.PostConstruct;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;import jakarta.enterprise.event.Observes;import jakarta.inject.Inject;import org.jboss.logging.Logger;-import io.quarkus.runtime.StartupEvent;import java.util.ArrayList;import java.util.LinkedHashMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/backup/BackupService.java b/src/main/java/io/github/hectorvent/floci/services/backup/BackupService.javaindex 61a7711dfc..0c49935fb8 100644--- a/src/main/java/io/github/hectorvent/floci/services/backup/BackupService.java+++ b/src/main/java/io/github/hectorvent/floci/services/backup/BackupService.java@@ -19,7 +19,6 @@ import org.jboss.logging.Logger;import java.time.Instant;import java.time.temporal.ChronoUnit;import java.util.*;-import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.Executors;import java.util.concurrent.ScheduledExecutorService;diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcore/BedrockAgentCoreController.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcore/BedrockAgentCoreController.javaindex 2d6e098ea1..02593bfbb2 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcore/BedrockAgentCoreController.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcore/BedrockAgentCoreController.java@@ -1,32 +1,33 @@package io.github.hectorvent.floci.services.bedrockagentcore;+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;import io.github.hectorvent.floci.core.common.AwsErrorResponse;+import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.services.bedrockagentcorecontrol.BedrockAgentCoreControlService;+import io.smallrye.common.annotation.Blocking;import jakarta.inject.Inject;import jakarta.ws.rs.Consumes;-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.smallrye.common.annotation.Blocking;-import jakarta.ws.rs.core.GenericEntity;-import jakarta.ws.rs.core.StreamingOutput;-import java.io.IOException;-import java.io.OutputStream;-import java.util.function.Consumer;import jakarta.ws.rs.POST;import jakarta.ws.rs.Path;import jakarta.ws.rs.PathParam;import jakarta.ws.rs.Produces;import jakarta.ws.rs.QueryParam;import jakarta.ws.rs.core.Context;+import jakarta.ws.rs.core.GenericEntity;import jakarta.ws.rs.core.HttpHeaders;import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.StreamingOutput;import org.jboss.logging.Logger;+import java.io.IOException;+import java.io.OutputStream;+import java.util.function.Consumer;+/*** Amazon Bedrock AgentCore data-plane stub ({@code InvokeAgentRuntime}).*diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreControlController.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreControlController.javaindex 42e672e2df..8e6c4371db 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreControlController.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreControlController.java@@ -4,8 +4,8 @@ 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.Pagination;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 io.github.hectorvent.floci.services.bedrockagentcorecontrol.model.AgentRuntime;import io.github.hectorvent.floci.services.bedrockagentcorecontrol.model.AgentRuntimeEndpoint;diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreControlService.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreControlService.javaindex a7fbcc8e10..f0e719b430 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreControlService.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreControlService.java@@ -3,8 +3,8 @@ package io.github.hectorvent.floci.services.bedrockagentcorecontrol;import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.JsonNode;import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.Pagination;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 io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreCredentialProviderService.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreCredentialProviderService.javaindex 6f8b626bd9..730ecaf8fb 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreCredentialProviderService.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreCredentialProviderService.java@@ -7,8 +7,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsEndpoints;import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.Pagination;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 io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayController.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayController.javaindex bed23d754e..e7f813e222 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayController.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayController.java@@ -4,8 +4,8 @@ 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.Pagination;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 io.github.hectorvent.floci.services.bedrockagentcorecontrol.model.Gateway;import io.github.hectorvent.floci.services.bedrockagentcorecontrol.model.GatewayTarget;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 1d74116a3a..ec4e752620 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@@ -5,8 +5,8 @@ import com.fasterxml.jackson.databind.JsonNode;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.Pagination;import io.github.hectorvent.floci.core.common.PaginatedResult;+import io.github.hectorvent.floci.core.common.Pagination;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;diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayService.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayService.javaindex bd1d48c40f..0e4dc2af53 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayService.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreGatewayService.java@@ -4,8 +4,8 @@ import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.JsonNode;import io.github.hectorvent.floci.core.common.AwsEndpoints;import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.Pagination;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 io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreIdentityService.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreIdentityService.javaindex d59ca8a613..ed9cb271d5 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreIdentityService.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreIdentityService.java@@ -2,8 +2,8 @@ package io.github.hectorvent.floci.services.bedrockagentcorecontrol;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.Pagination;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 io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreMemoryController.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreMemoryController.javaindex 5e0d682b51..22cd40a33e 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreMemoryController.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreMemoryController.java@@ -5,8 +5,8 @@ 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.Pagination;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 io.github.hectorvent.floci.services.bedrockagentcore.BedrockAgentCoreEventService;import io.github.hectorvent.floci.services.bedrockagentcore.model.Branch;diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreMemoryService.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreMemoryService.javaindex a446d755e5..8bd6779ad8 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreMemoryService.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreMemoryService.java@@ -2,8 +2,8 @@ package io.github.hectorvent.floci.services.bedrockagentcorecontrol;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.Pagination;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 io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreToolsService.java b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreToolsService.javaindex 8b26548079..47b42ce4dd 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreToolsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockagentcorecontrol/BedrockAgentCoreToolsService.java@@ -5,8 +5,8 @@ import com.fasterxml.jackson.databind.JsonNode;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.Pagination;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 io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockruntime/backend/BedrockOpenAiTranslator.java b/src/main/java/io/github/hectorvent/floci/services/bedrockruntime/backend/BedrockOpenAiTranslator.javaindex fbd1bc7b7a..208dd12d97 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockruntime/backend/BedrockOpenAiTranslator.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockruntime/backend/BedrockOpenAiTranslator.java@@ -1,10 +1,10 @@package io.github.hectorvent.floci.services.bedrockruntime.backend;-import io.github.hectorvent.floci.core.common.AwsEventStreamWriter;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.AwsEventStreamWriter;import io.github.hectorvent.floci.core.common.AwsException;import org.jboss.logging.Logger;diff --git a/src/main/java/io/github/hectorvent/floci/services/bedrockruntime/backend/StubBackend.java b/src/main/java/io/github/hectorvent/floci/services/bedrockruntime/backend/StubBackend.javaindex ca5e6071c3..fcafd35e9d 100644--- a/src/main/java/io/github/hectorvent/floci/services/bedrockruntime/backend/StubBackend.java+++ b/src/main/java/io/github/hectorvent/floci/services/bedrockruntime/backend/StubBackend.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.bedrockruntime.backend;-import io.github.hectorvent.floci.core.common.AwsEventStreamWriter;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.AwsEventStreamWriter;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CfnCreateOnlyProperties.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CfnCreateOnlyProperties.javaindex 658b77f4cc..5261f4dd86 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CfnCreateOnlyProperties.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CfnCreateOnlyProperties.java@@ -2,7 +2,6 @@ package io.github.hectorvent.floci.services.cloudformation;import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.ObjectMapper;-import org.jboss.logging.Logger;import java.io.InputStream;diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationService.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationService.javaindex b862fa7a41..d289408a4b 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationService.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationService.java@@ -1,5 +1,8 @@package io.github.hectorvent.floci.services.cloudformation;+import com.fasterxml.jackson.core.type.TypeReference;+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.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;@@ -8,6 +11,9 @@ import io.github.hectorvent.floci.core.common.AwsRegions;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.RequestScopes;import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;+import io.github.hectorvent.floci.core.resource.ExplorerResource;+import io.github.hectorvent.floci.core.resource.ResourceProvider;+import io.github.hectorvent.floci.core.resource.SupportedResourceType;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.cloudformation.model.ChangeSet;@@ -22,9 +28,6 @@ import io.github.hectorvent.floci.services.cloudformation.provisioners.UpdateCleimport io.github.hectorvent.floci.services.s3.S3Service;import io.github.hectorvent.floci.services.s3.model.S3Object;import io.github.hectorvent.floci.services.ssm.SsmService;-import com.fasterxml.jackson.core.type.TypeReference;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;import jakarta.annotation.PostConstruct;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;@@ -35,23 +38,20 @@ import java.net.URI;import java.time.Clock;import java.time.Instant;import java.util.*;-import java.util.regex.Matcher;-import java.util.regex.Pattern;+import java.util.ArrayList;+import java.util.List;+import java.util.Map;+import java.util.Set;+import java.util.concurrent.ArrayBlockingQueue;import java.util.concurrent.CompletableFuture;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;-import java.util.concurrent.ArrayBlockingQueue;import java.util.concurrent.RejectedExecutionException;import java.util.concurrent.ThreadPoolExecutor;import java.util.concurrent.TimeUnit;-import io.github.hectorvent.floci.core.resource.ExplorerResource;-import io.github.hectorvent.floci.core.resource.ResourceProvider;-import io.github.hectorvent.floci.core.resource.SupportedResourceType;-import java.util.ArrayList;-import java.util.List;-import java.util.Map;-import java.util.Set;+import java.util.regex.Matcher;+import java.util.regex.Pattern;import java.util.stream.Collectors;/**diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/StackSetService.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/StackSetService.javaindex 8c4acb43e6..48d77d9ef6 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/StackSetService.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/StackSetService.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.cloudformation;+import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -15,7 +16,6 @@ import io.github.hectorvent.floci.services.organizations.OrganizationsService;import io.github.hectorvent.floci.services.organizations.model.Organization;import io.github.hectorvent.floci.services.organizations.model.OrganizationAccount;import io.github.hectorvent.floci.services.organizations.model.OrganizationalUnit;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnResourceProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnResourceProvisioner.javaindex 72676ca1ff..bd4c68cbcd 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnResourceProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CfnResourceProvisioner.java@@ -1,8 +1,8 @@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.cloudformation.model.StackEvent;+import io.github.hectorvent.floci.services.cloudformation.model.StackResource;import java.util.Set;import java.util.function.Consumer;diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CloudTrailCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CloudTrailCfnProvisioner.javaindex e67ee662b6..2a9a1432b4 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CloudTrailCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CloudTrailCfnProvisioner.java@@ -3,8 +3,8 @@ package io.github.hectorvent.floci.services.cloudformation.provisioners;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.cloudtrail.CloudTrailService;import io.github.hectorvent.floci.services.cloudtrail.CloudTrailSelectorJson;+import io.github.hectorvent.floci.services.cloudtrail.CloudTrailService;import io.github.hectorvent.floci.services.cloudtrail.model.AdvancedEventSelector;import io.github.hectorvent.floci.services.cloudtrail.model.EventSelector;import io.github.hectorvent.floci.services.cloudtrail.model.Trail;diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CodePipelineCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CodePipelineCfnProvisioner.javaindex 8aa464664f..5167bd8073 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CodePipelineCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CodePipelineCfnProvisioner.java@@ -2,9 +2,9 @@ package io.github.hectorvent.floci.services.cloudformation.provisioners;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;-import io.github.hectorvent.floci.core.common.AwsArnUtils;import com.fasterxml.jackson.databind.node.ArrayNode;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.RegionResolver;import io.github.hectorvent.floci.services.cloudformation.model.StackResource;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 fafe9e64bd..6bc90c132f 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@@ -31,9 +31,9 @@ import java.util.List;import java.util.Map;import java.util.Objects;import java.util.Set;-import java.util.stream.Collectors;import java.util.TreeSet;import java.util.regex.Pattern;+import java.util.stream.Collectors;/*** CloudFormation provisioning for EventBridge: {@code AWS::Events::Rule},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 7e566b74ab..ff80b44537 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@@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsErrorResponse;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.services.cloudhsmv2.model.Backup;+import io.github.hectorvent.floci.services.cloudhsmv2.model.BackupRetentionPolicy;import io.github.hectorvent.floci.services.cloudhsmv2.model.Certificates;import io.github.hectorvent.floci.services.cloudhsmv2.model.Cluster;import io.github.hectorvent.floci.services.cloudhsmv2.model.Hsm;@@ -22,8 +24,6 @@ import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import io.github.hectorvent.floci.services.cloudhsmv2.model.Backup;-import io.github.hectorvent.floci.services.cloudhsmv2.model.BackupRetentionPolicy;import java.util.stream.Collectors;diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/model/Backup.java b/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/model/Backup.javaindex 54665b09e8..7138ad4d4c 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/model/Backup.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/model/Backup.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.cloudhsmv2.model;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;import java.util.LinkedHashMap;import java.util.Map;-import io.quarkus.runtime.annotations.RegisterForReflection;-/*** Domain model for a CloudHSM v2 Backup.*/diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/model/Cluster.java b/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/model/Cluster.javaindex bc4fe8e466..c3cafa8b7f 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/model/Cluster.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/model/Cluster.java@@ -1,13 +1,13 @@package io.github.hectorvent.floci.services.cloudhsmv2.model;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;import java.util.ArrayList;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import io.quarkus.runtime.annotations.RegisterForReflection;-/*** Domain model for a CloudHSM v2 cluster.*diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/model/Hsm.java b/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/model/Hsm.javaindex 6a7563669d..9caabca9dc 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/model/Hsm.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/model/Hsm.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.cloudhsmv2.model;-import java.time.Instant;-import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;+/*** Represents an HSM instance within a CloudHSM v2 cluster.*/diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandler.java b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandler.javaindex efe6d58bfc..efe66ca3fe 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandler.java@@ -1,5 +1,9 @@package io.github.hectorvent.floci.services.cloudwatch.logs;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsErrorResponse;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.cloudwatch.logs.model.AccountPolicy;@@ -9,10 +13,6 @@ import io.github.hectorvent.floci.services.cloudwatch.logs.model.LogGroup;import io.github.hectorvent.floci.services.cloudwatch.logs.model.LogStream;import io.github.hectorvent.floci.services.cloudwatch.logs.model.ResourcePolicy;import io.github.hectorvent.floci.services.cloudwatch.logs.model.SubscriptionFilter;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsService.java b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsService.javaindex 274b95a796..c847df0619 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsService.java@@ -1,9 +1,13 @@package io.github.hectorvent.floci.services.cloudwatch.logs;+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.resource.ExplorerResource;+import io.github.hectorvent.floci.core.resource.ResourceProvider;+import io.github.hectorvent.floci.core.resource.SupportedResourceType;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;@@ -17,13 +21,13 @@ import io.github.hectorvent.floci.services.cloudwatch.logs.model.LogStream;import io.github.hectorvent.floci.services.cloudwatch.logs.model.MetricFilter;import io.github.hectorvent.floci.services.cloudwatch.logs.model.ResourcePolicy;import io.github.hectorvent.floci.services.cloudwatch.logs.model.SubscriptionFilter;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.enterprise.event.Event;import jakarta.inject.Inject;import org.jboss.logging.Logger;import java.nio.charset.StandardCharsets;+import java.time.Instant;import java.util.ArrayList;import java.util.Base64;import java.util.Collections;@@ -33,15 +37,11 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.Optional;+import java.util.Set;import java.util.UUID;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.atomic.AtomicLong;import java.util.function.LongSupplier;-import io.github.hectorvent.floci.core.resource.ExplorerResource;-import io.github.hectorvent.floci.core.resource.ResourceProvider;-import io.github.hectorvent.floci.core.resource.SupportedResourceType;-import java.time.Instant;-import java.util.Set;import static io.github.hectorvent.floci.services.cloudwatch.logs.MetricFilterRules.invalid;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 747d0226ad..7269a66567 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@@ -8,23 +8,24 @@ import io.github.hectorvent.floci.core.common.AwsErrorResponse;import io.github.hectorvent.floci.core.common.PaginatedResult;import io.github.hectorvent.floci.services.cloudwatch.dashboards.CloudWatchDashboardsService;import io.github.hectorvent.floci.services.cloudwatch.dashboards.model.Dashboard;-import io.github.hectorvent.floci.services.cloudwatch.metricstreams.CloudWatchMetricStreamsService;-import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStream;-import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStreamFilter;-import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStreamStatisticsConfiguration;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.AlarmMetricDataQuery;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.Dimension;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.MetricAlarm;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.MetricDatum;+import io.github.hectorvent.floci.services.cloudwatch.metricstreams.CloudWatchMetricStreamsService;+import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStream;+import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStreamFilter;+import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStreamStatisticsConfiguration;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;+import org.jboss.logging.Logger;+import java.time.Instant;import java.util.ArrayList;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import org.jboss.logging.Logger;/*** Handles CloudWatch Metrics requests via the JSON 1.0 protocol.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 80a1775a6f..40c5c21ae6 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@@ -7,25 +7,26 @@ import io.github.hectorvent.floci.core.common.Pagination;import io.github.hectorvent.floci.core.common.XmlBuilder;import io.github.hectorvent.floci.services.cloudwatch.dashboards.CloudWatchDashboardsService;import io.github.hectorvent.floci.services.cloudwatch.dashboards.model.Dashboard;-import io.github.hectorvent.floci.services.cloudwatch.metricstreams.CloudWatchMetricStreamsService;-import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStream;-import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStreamFilter;-import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStreamStatisticsConfiguration;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.AlarmMetricDataQuery;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.Dimension;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.MetricAlarm;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.MetricDatum;+import io.github.hectorvent.floci.services.cloudwatch.metricstreams.CloudWatchMetricStreamsService;+import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStream;+import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStreamFilter;+import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStreamStatisticsConfiguration;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.MultivaluedMap;import jakarta.ws.rs.core.Response;+import org.jboss.logging.Logger;+import java.time.Instant;import java.time.format.DateTimeFormatter;import java.util.ArrayList;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import org.jboss.logging.Logger;@ApplicationScopedpublic class CloudWatchMetricsQueryHandler {diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsService.java b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsService.javaindex 6ea32a109e..3a6fa352c1 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsService.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.cloudwatch.metrics;+import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;@@ -8,7 +9,6 @@ import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.Dimension;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.MetricAlarm;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.MetricDatum;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;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 6b4bd55ba1..3424d00971 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@@ -5,9 +5,9 @@ import com.github.dockerjava.api.async.ResultCallback;import com.github.dockerjava.api.model.Frame;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.ContainerTeardown;import io.github.hectorvent.floci.core.common.RegionResolver;-import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;import io.github.hectorvent.floci.core.common.docker.ContainerDetector;diff --git a/src/main/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployService.java b/src/main/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployService.javaindex e196f60da6..60d3e6d03b 100644--- a/src/main/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployService.java+++ b/src/main/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployService.java@@ -21,9 +21,9 @@ import io.github.hectorvent.floci.services.ecs.model.TaskSet;import io.github.hectorvent.floci.services.elbv2.ElbV2Service;import io.github.hectorvent.floci.services.elbv2.model.TargetGroup;import io.github.hectorvent.floci.services.lambda.LambdaService;-import io.github.hectorvent.floci.services.ssm.SsmCommandService;import io.github.hectorvent.floci.services.lambda.model.InvocationType;import io.github.hectorvent.floci.services.lambda.model.InvokeResult;+import io.github.hectorvent.floci.services.ssm.SsmCommandService;import jakarta.annotation.PostConstruct;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineService.java b/src/main/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineService.javaindex 330d71fff1..cee4b9fadc 100644--- a/src/main/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineService.java+++ b/src/main/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineService.java@@ -26,8 +26,8 @@ import io.github.hectorvent.floci.services.lambda.model.InvocationType;import io.github.hectorvent.floci.services.lambda.model.InvokeResult;import io.github.hectorvent.floci.services.s3.S3Service;import io.github.hectorvent.floci.services.s3.model.S3Object;-import jakarta.annotation.PreDestroy;import jakarta.annotation.PostConstruct;+import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;diff --git a/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoJsonHandler.javaindex 8d510cc711..daf01f3f2e 100644--- a/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoJsonHandler.java@@ -10,13 +10,13 @@ import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.cognito.model.CognitoGroup;import io.github.hectorvent.floci.services.cognito.model.CognitoUser;import io.github.hectorvent.floci.services.cognito.model.IdentityProvider;+import io.github.hectorvent.floci.services.cognito.model.ManagedLoginBranding;import io.github.hectorvent.floci.services.cognito.model.ResourceServer;import io.github.hectorvent.floci.services.cognito.model.ResourceServerScope;import io.github.hectorvent.floci.services.cognito.model.UserPool;import io.github.hectorvent.floci.services.cognito.model.UserPoolClient;import io.github.hectorvent.floci.services.cognito.model.UserPoolClientSecret;import io.github.hectorvent.floci.services.cognito.model.UserPoolDomain;-import io.github.hectorvent.floci.services.cognito.model.ManagedLoginBranding;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;diff --git a/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoOAuthController.java b/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoOAuthController.javaindex cff9d69a26..3ee0e921e9 100644--- a/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoOAuthController.java+++ b/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoOAuthController.java@@ -16,8 +16,8 @@ import jakarta.ws.rs.GET;import jakarta.ws.rs.HeaderParam;import jakarta.ws.rs.POST;import jakarta.ws.rs.Path;-import jakarta.ws.rs.QueryParam;import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;import jakarta.ws.rs.container.ContainerRequestContext;import jakarta.ws.rs.core.Context;import jakarta.ws.rs.core.HttpHeaders;diff --git a/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoService.java b/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoService.javaindex 7c7822703a..dd4f28975f 100644--- a/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoService.java+++ b/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoService.java@@ -5,18 +5,17 @@ import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ArrayNode;-import io.github.hectorvent.floci.services.cognito.model.EmailMfaSettings;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.config.TlsCertificateManager;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.common.ReservedTags;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;-import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.resource.ExplorerResource;import io.github.hectorvent.floci.core.resource.ResourceProvider;import io.github.hectorvent.floci.core.resource.SupportedResourceType;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;+import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.acm.AcmService;@@ -24,7 +23,9 @@ import io.github.hectorvent.floci.services.acm.model.Certificate;import io.github.hectorvent.floci.services.acm.model.CertificateStatus;import io.github.hectorvent.floci.services.cognito.model.CognitoGroup;import io.github.hectorvent.floci.services.cognito.model.CognitoUser;+import io.github.hectorvent.floci.services.cognito.model.EmailMfaSettings;import io.github.hectorvent.floci.services.cognito.model.IdentityProvider;+import io.github.hectorvent.floci.services.cognito.model.ManagedLoginBranding;import io.github.hectorvent.floci.services.cognito.model.ResourceServer;import io.github.hectorvent.floci.services.cognito.model.ResourceServerScope;import io.github.hectorvent.floci.services.cognito.model.RevokedTokenInfo;@@ -33,7 +34,6 @@ import io.github.hectorvent.floci.services.cognito.model.UserPool;import io.github.hectorvent.floci.services.cognito.model.UserPoolClient;import io.github.hectorvent.floci.services.cognito.model.UserPoolClientSecret;import io.github.hectorvent.floci.services.cognito.model.UserPoolDomain;-import io.github.hectorvent.floci.services.cognito.model.ManagedLoginBranding;import io.github.hectorvent.floci.services.cognito.verification.CognitoMessageDispatcher;import io.github.hectorvent.floci.services.cognito.verification.VerificationCode;import io.github.hectorvent.floci.services.cognito.verification.VerificationCodeException;@@ -75,8 +75,8 @@ import java.util.LinkedHashMap;import java.util.LinkedHashSet;import java.util.List;import java.util.Locale;-import java.util.Objects;import java.util.Map;+import java.util.Objects;import java.util.Optional;import java.util.Set;import java.util.UUID;diff --git a/src/main/java/io/github/hectorvent/floci/services/cognito/model/CognitoGroup.java b/src/main/java/io/github/hectorvent/floci/services/cognito/model/CognitoGroup.javaindex 6992c37f1d..837d217ddc 100644--- a/src/main/java/io/github/hectorvent/floci/services/cognito/model/CognitoGroup.java+++ b/src/main/java/io/github/hectorvent/floci/services/cognito/model/CognitoGroup.java@@ -1,12 +1,12 @@package io.github.hectorvent.floci.services.cognito.model;+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.ArrayList;import java.util.Collections;import java.util.List;-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;-import io.quarkus.runtime.annotations.RegisterForReflection;-@RegisterForReflection@JsonIgnoreProperties(ignoreUnknown = true)public class CognitoGroup {diff --git a/src/main/java/io/github/hectorvent/floci/services/cognito/model/RevokedTokenInfo.java b/src/main/java/io/github/hectorvent/floci/services/cognito/model/RevokedTokenInfo.javaindex ac77da831b..fff885234d 100644--- a/src/main/java/io/github/hectorvent/floci/services/cognito/model/RevokedTokenInfo.java+++ b/src/main/java/io/github/hectorvent/floci/services/cognito/model/RevokedTokenInfo.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.cognito.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonCreator;import com.fasterxml.jackson.annotation.JsonProperty;+import io.quarkus.runtime.annotations.RegisterForReflection;/*** Information about a revoked token for tracking and validation purposes.diff --git a/src/main/java/io/github/hectorvent/floci/services/cognito/model/UserPool.java b/src/main/java/io/github/hectorvent/floci/services/cognito/model/UserPool.javaindex f7cfd3f915..a1abeb4f06 100644--- a/src/main/java/io/github/hectorvent/floci/services/cognito/model/UserPool.java+++ b/src/main/java/io/github/hectorvent/floci/services/cognito/model/UserPool.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.cognito.model;import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.ArrayList;import java.util.HashMap;import java.util.List;diff --git a/src/main/java/io/github/hectorvent/floci/services/cognitoidentity/model/IdentityPool.java b/src/main/java/io/github/hectorvent/floci/services/cognitoidentity/model/IdentityPool.javaindex 4309178fb9..158c690026 100644--- a/src/main/java/io/github/hectorvent/floci/services/cognitoidentity/model/IdentityPool.java+++ b/src/main/java/io/github/hectorvent/floci/services/cognitoidentity/model/IdentityPool.java@@ -1,8 +1,8 @@package io.github.hectorvent.floci.services.cognitoidentity.model;import com.fasterxml.jackson.databind.JsonNode;-import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;import java.util.ArrayList;import java.util.LinkedHashMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/cognitoidentity/model/PrincipalTagAttributeMap.java b/src/main/java/io/github/hectorvent/floci/services/cognitoidentity/model/PrincipalTagAttributeMap.javaindex a611492fdf..ba9505238b 100644--- a/src/main/java/io/github/hectorvent/floci/services/cognitoidentity/model/PrincipalTagAttributeMap.java+++ b/src/main/java/io/github/hectorvent/floci/services/cognitoidentity/model/PrincipalTagAttributeMap.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.cognitoidentity.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.LinkedHashMap;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/comprehend/ComprehendService.java b/src/main/java/io/github/hectorvent/floci/services/comprehend/ComprehendService.javaindex ee04050309..da2e008683 100644--- a/src/main/java/io/github/hectorvent/floci/services/comprehend/ComprehendService.java+++ b/src/main/java/io/github/hectorvent/floci/services/comprehend/ComprehendService.java@@ -8,6 +8,7 @@ import io.github.hectorvent.floci.core.common.AwsException;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;+import java.util.Optional;import java.util.Set;/**diff --git a/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerService.java b/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerService.javaindex 1ff892e109..b680abc48c 100644--- a/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerService.java+++ b/src/main/java/io/github/hectorvent/floci/services/controltower/ControlTowerService.java@@ -17,17 +17,17 @@ import jakarta.inject.Inject;import java.util.ArrayList;import java.util.Collections;+import java.util.Comparator;+import java.util.HashSet;import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import java.util.HashSet;import java.util.Optional;import java.util.Set;-import java.util.Comparator;-import java.util.stream.Collectors;import java.util.UUID;import java.util.concurrent.ConcurrentHashMap;+import java.util.stream.Collectors;/*** Control Tower landing-zone and baseline emulation, backed by the configured Floci storage mode.diff --git a/src/main/java/io/github/hectorvent/floci/services/cur/CurEmissionScheduler.java b/src/main/java/io/github/hectorvent/floci/services/cur/CurEmissionScheduler.javaindex 52a47938af..283bcd0b93 100644--- a/src/main/java/io/github/hectorvent/floci/services/cur/CurEmissionScheduler.java+++ b/src/main/java/io/github/hectorvent/floci/services/cur/CurEmissionScheduler.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.cur;import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.core.common.RequestContext;import io.github.hectorvent.floci.services.bcmdataexports.BcmDataExportsService;import io.github.hectorvent.floci.services.bcmdataexports.model.DestinationConfiguration;import io.github.hectorvent.floci.services.bcmdataexports.model.Export;import io.github.hectorvent.floci.services.bcmdataexports.model.ExportExecution;-import io.github.hectorvent.floci.core.common.RequestContext;import io.github.hectorvent.floci.services.cur.model.ReportDefinition;import io.quarkus.arc.Arc;import io.quarkus.arc.ManagedContext;@@ -13,11 +13,11 @@ import io.quarkus.runtime.ShutdownEvent;import io.quarkus.runtime.Startup;import jakarta.annotation.PostConstruct;import jakarta.enterprise.context.ApplicationScoped;-import java.util.Map;import jakarta.enterprise.event.Observes;import jakarta.inject.Inject;import org.jboss.logging.Logger;+import java.util.Map;import java.util.concurrent.Executors;import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.TimeUnit;diff --git a/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncAgent.java b/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncAgent.javaindex 1075ee0316..f8dc8cd696 100644--- a/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncAgent.java+++ b/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncAgent.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.datasync.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;import java.util.ArrayList;import java.util.LinkedHashMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncLocation.java b/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncLocation.javaindex 603b53755b..133a0b6d16 100644--- a/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncLocation.java+++ b/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncLocation.java@@ -1,8 +1,8 @@package io.github.hectorvent.floci.services.datasync.model;import com.fasterxml.jackson.databind.JsonNode;-import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;import java.util.LinkedHashMap;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncLocationType.java b/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncLocationType.javaindex 1c49caa896..141b74fd57 100644--- a/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncLocationType.java+++ b/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncLocationType.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.datasync.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;import java.util.Optional;diff --git a/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncTask.java b/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncTask.javaindex 10a66230e1..e58f543a7b 100644--- a/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncTask.java+++ b/src/main/java/io/github/hectorvent/floci/services/datasync/model/DataSyncTask.java@@ -1,8 +1,8 @@package io.github.hectorvent.floci.services.datasync.model;import com.fasterxml.jackson.databind.JsonNode;-import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;import java.util.LinkedHashMap;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/docdb/DocDbQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/docdb/DocDbQueryHandler.javaindex bcc1e40e28..bd9b058cea 100644--- a/src/main/java/io/github/hectorvent/floci/services/docdb/DocDbQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/docdb/DocDbQueryHandler.java@@ -4,13 +4,13 @@ import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsNamespaces;import io.github.hectorvent.floci.core.common.AwsQueryResponse;+import io.github.hectorvent.floci.core.common.BackupWindows;import io.github.hectorvent.floci.core.common.RdsFamilyQuerySupport;import io.github.hectorvent.floci.core.common.XmlBuilder;-import io.github.hectorvent.floci.core.common.BackupWindows;import io.github.hectorvent.floci.services.docdb.model.DocDbCluster;import io.github.hectorvent.floci.services.docdb.model.DocDbClusterSettings;-import io.github.hectorvent.floci.services.docdb.model.DocDbInstanceSettings;import io.github.hectorvent.floci.services.docdb.model.DocDbInstance;+import io.github.hectorvent.floci.services.docdb.model.DocDbInstanceSettings;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.MultivaluedMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/docdb/DocDbService.java b/src/main/java/io/github/hectorvent/floci/services/docdb/DocDbService.javaindex e2e603e721..e4619de1e2 100644--- a/src/main/java/io/github/hectorvent/floci/services/docdb/DocDbService.java+++ b/src/main/java/io/github/hectorvent/floci/services/docdb/DocDbService.java@@ -4,33 +4,33 @@ 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.BackupWindows;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.docdb.container.DocDbContainerHandle;import io.github.hectorvent.floci.services.docdb.container.DocDbContainerManager;import io.github.hectorvent.floci.services.docdb.model.DocDbCluster;-import io.github.hectorvent.floci.services.docdb.model.DocDbInstance;-import jakarta.enterprise.context.ApplicationScoped;-import jakarta.inject.Inject;-import org.jboss.logging.Logger;--import java.time.Instant;-import io.github.hectorvent.floci.core.common.BackupWindows;import io.github.hectorvent.floci.services.docdb.model.DocDbClusterSettings;+import io.github.hectorvent.floci.services.docdb.model.DocDbInstance;import io.github.hectorvent.floci.services.docdb.model.DocDbInstanceSettings;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.kms.KmsService;import io.github.hectorvent.floci.services.kms.model.KmsKey;import io.github.hectorvent.floci.services.rds.RdsService;import io.github.hectorvent.floci.services.rds.model.DbClusterParameterGroup;+import jakarta.enterprise.context.ApplicationScoped;+import jakarta.inject.Inject;+import org.jboss.logging.Logger;++import java.time.Instant;import java.util.ArrayList;import java.util.Collection;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import java.util.Optional;import java.util.Objects;+import java.util.Optional;import java.util.UUID;import java.util.concurrent.ConcurrentHashMap;import java.util.function.Function;diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.javaindex dc72bb0aaf..e60a87950e 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java@@ -1,33 +1,34 @@package io.github.hectorvent.floci.services.dynamodb;+import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.core.type.TypeReference;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.JsonNodeFactory;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.RequestScopes;+import io.github.hectorvent.floci.core.resource.ExplorerResource;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 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.ExportDescription;import io.github.hectorvent.floci.services.dynamodb.model.ExportSummary;import io.github.hectorvent.floci.services.dynamodb.model.GlobalSecondaryIndex;import io.github.hectorvent.floci.services.dynamodb.model.ImportSummary;import io.github.hectorvent.floci.services.dynamodb.model.ImportTableDescription;-import io.github.hectorvent.floci.services.dynamodb.model.LocalSecondaryIndex;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.StreamDescription;import io.github.hectorvent.floci.services.dynamodb.model.TableDefinition;import io.github.hectorvent.floci.services.dynamodb.model.VectorIndex;-import io.github.hectorvent.floci.services.dynamodb.model.ConditionalCheckFailedException;import io.github.hectorvent.floci.services.s3.S3Service;-import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.core.type.TypeReference;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.JsonNodeFactory;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;@@ -49,9 +50,9 @@ import java.util.Comparator;import java.util.HashMap;import java.util.HashSet;import java.util.HexFormat;+import java.util.Iterator;import java.util.LinkedHashMap;import java.util.LinkedHashSet;-import java.util.Iterator;import java.util.List;import java.util.Map;import java.util.Objects;@@ -70,7 +71,6 @@ import java.util.function.Supplier;import java.util.stream.Collectors;import java.util.zip.GZIPInputStream;import java.util.zip.GZIPOutputStream;-import io.github.hectorvent.floci.core.resource.ExplorerResource;@ApplicationScopedpublic class DynamoDbService {diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbStreamService.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbStreamService.javaindex f4bb01ee1b..023737132e 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbStreamService.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbStreamService.java@@ -1,5 +1,9 @@package io.github.hectorvent.floci.services.dynamodb;+import com.fasterxml.jackson.core.type.TypeReference;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;@@ -9,10 +13,6 @@ 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.StreamDescription;import io.github.hectorvent.floci.services.dynamodb.model.TableDefinition;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ObjectNode;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/KinesisStreamingForwarder.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/KinesisStreamingForwarder.javaindex 02aaf82f7f..8632558ddb 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/KinesisStreamingForwarder.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/KinesisStreamingForwarder.java@@ -1,13 +1,13 @@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;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.TableDefinition;import io.github.hectorvent.floci.services.kinesis.KinesisService;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/NativeDynamoDbStreamsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/NativeDynamoDbStreamsJsonHandler.javaindex bc7c4288f0..0dd885d355 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/NativeDynamoDbStreamsJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/NativeDynamoDbStreamsJsonHandler.java@@ -1,5 +1,9 @@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.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsErrorResponse;import io.github.hectorvent.floci.core.common.AwsException;@@ -8,10 +12,6 @@ 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.StreamDescription;import io.github.hectorvent.floci.services.dynamodb.model.TableDefinition;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/model/GlobalSecondaryIndex.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/model/GlobalSecondaryIndex.javaindex f83dfffa80..a246915374 100644--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/model/GlobalSecondaryIndex.java+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/model/GlobalSecondaryIndex.java@@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore;import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;import java.util.ArrayList;+import java.util.List;@RegisterForReflection@JsonIgnoreProperties(ignoreUnknown = true)diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/ContainerNetworkReachability.java b/src/main/java/io/github/hectorvent/floci/services/ec2/ContainerNetworkReachability.javaindex ecfe63b379..d71dc50087 100644--- a/src/main/java/io/github/hectorvent/floci/services/ec2/ContainerNetworkReachability.java+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/ContainerNetworkReachability.java@@ -1,8 +1,8 @@package io.github.hectorvent.floci.services.ec2;+import com.github.dockerjava.api.DockerClient;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.docker.ContainerDetector;-import com.github.dockerjava.api.DockerClient;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManager.java b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManager.javaindex 5bdfbe2195..dd567f3c4b 100644--- a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManager.java@@ -1,5 +1,14 @@package io.github.hectorvent.floci.services.ec2;+import com.github.dockerjava.api.DockerClient;+import com.github.dockerjava.api.async.ResultCallback;+import com.github.dockerjava.api.command.InspectContainerResponse;+import com.github.dockerjava.api.exception.NotFoundException;+import com.github.dockerjava.api.model.Container;+import com.github.dockerjava.api.model.ContainerNetwork;+import com.github.dockerjava.api.model.Frame;+import com.github.dockerjava.api.model.Mount;+import com.github.dockerjava.api.model.MountType;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsRegions;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -16,21 +25,13 @@ import io.github.hectorvent.floci.core.common.docker.PortAllocator;import io.github.hectorvent.floci.core.common.docker.RetryingTarCopier;import io.github.hectorvent.floci.core.common.docker.UserDataPipeline;import io.github.hectorvent.floci.services.ec2.Ec2InstanceTypeCatalog.CatalogInstanceType;+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.InstanceNetworkInterface;import io.github.hectorvent.floci.services.ec2.model.InstanceState;-import io.github.hectorvent.floci.services.ec2.model.GroupIdentifier;+import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;import io.github.hectorvent.floci.services.ec2.net.VpcNetworkManager;import io.github.hectorvent.floci.services.ec2.portforward.Ec2PortForwardManager;-import com.github.dockerjava.api.DockerClient;-import com.github.dockerjava.api.command.InspectContainerResponse;-import com.github.dockerjava.api.exception.NotFoundException;-import com.github.dockerjava.api.async.ResultCallback;-import com.github.dockerjava.api.model.Container;-import com.github.dockerjava.api.model.ContainerNetwork;-import com.github.dockerjava.api.model.Frame;-import com.github.dockerjava.api.model.Mount;-import com.github.dockerjava.api.model.MountType;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;@@ -50,8 +51,6 @@ import java.util.Map;import java.util.Objects;import java.util.Optional;import java.util.Set;-import java.util.function.Consumer;-import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;import java.util.concurrent.ArrayBlockingQueue;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.ExecutorService;@@ -60,8 +59,9 @@ import java.util.concurrent.RejectedExecutionHandler;import java.util.concurrent.Semaphore;import java.util.concurrent.ThreadPoolExecutor;import java.util.concurrent.TimeUnit;-import java.util.function.BiPredicate;import java.util.concurrent.atomic.AtomicBoolean;+import java.util.function.BiPredicate;+import java.util.function.Consumer;import java.util.regex.Matcher;import java.util.regex.Pattern;import java.util.stream.Collectors;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 fdcfc1c78c..9468c12ec0 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@@ -9,14 +9,13 @@ 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 io.github.hectorvent.floci.services.ec2.model.AsnAssociation;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.IpamScope;-import io.github.hectorvent.floci.services.ec2.model.AsnAssociation;import io.github.hectorvent.floci.services.ec2.model.Tag;-import jakarta.enterprise.context.ApplicationScoped;import jakarta.enterprise.context.ContextNotActiveException;import jakarta.enterprise.inject.Instance;diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandler.javaindex 2b911c44f9..226de8b8c2 100644--- a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandler.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.ec2;+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.AwsNamespaces;@@ -7,7 +8,6 @@ import io.github.hectorvent.floci.core.common.AwsPartition;import io.github.hectorvent.floci.core.common.AwsPartitions;import io.github.hectorvent.floci.core.common.AwsRegionFacts;import io.github.hectorvent.floci.core.common.XmlBuilder;-import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.services.ec2.model.*;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/SecurityGroupFirewallManager.java b/src/main/java/io/github/hectorvent/floci/services/ec2/SecurityGroupFirewallManager.javaindex e4b40a3fe5..67187c233b 100644--- a/src/main/java/io/github/hectorvent/floci/services/ec2/SecurityGroupFirewallManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/SecurityGroupFirewallManager.java@@ -7,8 +7,6 @@ import com.github.dockerjava.api.exception.NotFoundException;import com.github.dockerjava.api.model.Container;import com.github.dockerjava.api.model.Frame;import com.github.dockerjava.api.model.Info;-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;-import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;@@ -20,6 +18,8 @@ import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;import jakarta.annotation.PostConstruct;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;import org.jboss.logging.Logger;import java.io.ByteArrayInputStream;diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/portforward/Ec2PortForwardManager.java b/src/main/java/io/github/hectorvent/floci/services/ec2/portforward/Ec2PortForwardManager.javaindex acdb072161..bd49a9cd73 100644--- a/src/main/java/io/github/hectorvent/floci/services/ec2/portforward/Ec2PortForwardManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/portforward/Ec2PortForwardManager.java@@ -1,5 +1,8 @@package io.github.hectorvent.floci.services.ec2.portforward;+import com.github.dockerjava.api.DockerClient;+import com.github.dockerjava.api.command.InspectContainerResponse;+import com.github.dockerjava.api.model.ContainerNetwork;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager;@@ -9,9 +12,6 @@ import io.github.hectorvent.floci.core.common.docker.PortAllocator;import io.github.hectorvent.floci.services.ec2.model.Instance;import io.github.hectorvent.floci.services.ec2.model.IpPermission;import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;-import com.github.dockerjava.api.DockerClient;-import com.github.dockerjava.api.command.InspectContainerResponse;-import com.github.dockerjava.api.model.ContainerNetwork;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;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 3514305f25..b9166d2da1 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@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.ecr;+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;@@ -14,16 +15,15 @@ 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 io.github.hectorvent.floci.services.ecr.model.AuthorizationData;+import io.github.hectorvent.floci.services.ecr.model.Image;import io.github.hectorvent.floci.services.ecr.model.ImageDetail;import io.github.hectorvent.floci.services.ecr.model.ImageFailure;import io.github.hectorvent.floci.services.ecr.model.ImageIdentifier;import io.github.hectorvent.floci.services.ecr.model.ImageMetadata;-import io.github.hectorvent.floci.services.ecr.model.Image;import io.github.hectorvent.floci.services.ecr.model.PullThroughCacheRule;import io.github.hectorvent.floci.services.ecr.model.Repository;import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;import io.github.hectorvent.floci.services.ecr.registry.RegistryHttpClient;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;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 56eb77d387..fbdafcb026 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@@ -1,5 +1,13 @@package io.github.hectorvent.floci.services.ecr.registry;+import com.github.dockerjava.api.DockerClient;+import com.github.dockerjava.api.async.ResultCallback;+import com.github.dockerjava.api.command.ExecCreateCmdResponse;+import com.github.dockerjava.api.command.InspectExecResponse;+import com.github.dockerjava.api.exception.NotFoundException;+import com.github.dockerjava.api.model.Container;+import com.github.dockerjava.api.model.ContainerPort;+import com.github.dockerjava.api.model.Frame;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsPartitions;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -9,18 +17,10 @@ import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.ContainerInfo;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.ContainerPresence;import io.github.hectorvent.floci.core.common.docker.ContainerLogStreamer;-import io.github.hectorvent.floci.core.common.docker.CurrentContainerNetworkResolver;import io.github.hectorvent.floci.core.common.docker.ContainerSpec;import io.github.hectorvent.floci.core.common.docker.ContainerStorageHelper;+import io.github.hectorvent.floci.core.common.docker.CurrentContainerNetworkResolver;import io.github.hectorvent.floci.core.common.docker.PortAllocator;-import com.github.dockerjava.api.DockerClient;-import com.github.dockerjava.api.async.ResultCallback;-import com.github.dockerjava.api.command.ExecCreateCmdResponse;-import com.github.dockerjava.api.command.InspectExecResponse;-import com.github.dockerjava.api.exception.NotFoundException;-import com.github.dockerjava.api.model.Container;-import com.github.dockerjava.api.model.ContainerPort;-import com.github.dockerjava.api.model.Frame;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;diff --git a/src/main/java/io/github/hectorvent/floci/services/ecs/EcsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/ecs/EcsJsonHandler.javaindex 070cce439b..61cbe91905 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecs/EcsJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecs/EcsJsonHandler.java@@ -1,5 +1,9 @@package io.github.hectorvent.floci.services.ecs;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsErrorResponse;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.ecs.container.HostVolumePolicy;@@ -15,16 +19,16 @@ import io.github.hectorvent.floci.services.ecs.model.ContainerOverride;import io.github.hectorvent.floci.services.ecs.model.CreateClusterRequest;import io.github.hectorvent.floci.services.ecs.model.CreateServiceRequest;import io.github.hectorvent.floci.services.ecs.model.CreateTaskSetRequest;-import io.github.hectorvent.floci.services.ecs.model.RegisterContainerInstanceRequest;-import io.github.hectorvent.floci.services.ecs.model.EnvironmentFile;-import io.github.hectorvent.floci.services.ecs.model.Failure;-import io.github.hectorvent.floci.services.ecs.model.EphemeralStorage;-import io.github.hectorvent.floci.services.ecs.model.FirelensConfiguration;-import io.github.hectorvent.floci.services.ecs.model.HealthCheck;import io.github.hectorvent.floci.services.ecs.model.EcsCluster;import io.github.hectorvent.floci.services.ecs.model.EcsLoadBalancer;import io.github.hectorvent.floci.services.ecs.model.EcsServiceModel;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.EnvironmentFile;+import io.github.hectorvent.floci.services.ecs.model.EphemeralStorage;+import io.github.hectorvent.floci.services.ecs.model.Failure;+import io.github.hectorvent.floci.services.ecs.model.FirelensConfiguration;+import io.github.hectorvent.floci.services.ecs.model.HealthCheck;import io.github.hectorvent.floci.services.ecs.model.KeyValuePair;import io.github.hectorvent.floci.services.ecs.model.LaunchType;import io.github.hectorvent.floci.services.ecs.model.ListTasksRequest;@@ -34,23 +38,19 @@ import io.github.hectorvent.floci.services.ecs.model.NetworkConfiguration;import io.github.hectorvent.floci.services.ecs.model.NetworkMode;import io.github.hectorvent.floci.services.ecs.model.PortMapping;import io.github.hectorvent.floci.services.ecs.model.ProtectedTask;+import io.github.hectorvent.floci.services.ecs.model.RegisterContainerInstanceRequest;import io.github.hectorvent.floci.services.ecs.model.RegisterTaskDefinitionRequest;import io.github.hectorvent.floci.services.ecs.model.RunTaskRequest;import io.github.hectorvent.floci.services.ecs.model.RuntimePlatform;+import io.github.hectorvent.floci.services.ecs.model.Secret;import io.github.hectorvent.floci.services.ecs.model.ServiceDeployment;import io.github.hectorvent.floci.services.ecs.model.ServiceRevision;-import io.github.hectorvent.floci.services.ecs.model.Secret;import io.github.hectorvent.floci.services.ecs.model.TaskDefinition;import io.github.hectorvent.floci.services.ecs.model.TaskOverride;import io.github.hectorvent.floci.services.ecs.model.TaskSet;-import io.github.hectorvent.floci.services.ecs.model.EfsVolumeConfiguration;import io.github.hectorvent.floci.services.ecs.model.UpdateServiceRequest;import io.github.hectorvent.floci.services.ecs.model.Volume;import io.github.hectorvent.floci.services.ecs.model.VolumeFrom;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;diff --git a/src/main/java/io/github/hectorvent/floci/services/ecs/EcsResponseWriter.java b/src/main/java/io/github/hectorvent/floci/services/ecs/EcsResponseWriter.javaindex e7cc8d7b1f..d8cfe2dabb 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecs/EcsResponseWriter.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecs/EcsResponseWriter.java@@ -1,5 +1,8 @@package io.github.hectorvent.floci.services.ecs;+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.ecs.model.Attribute;import io.github.hectorvent.floci.services.ecs.model.AwsVpcConfiguration;import io.github.hectorvent.floci.services.ecs.model.CapacityProvider;@@ -39,9 +42,6 @@ import io.github.hectorvent.floci.services.ecs.model.TaskOverride;import io.github.hectorvent.floci.services.ecs.model.TaskSet;import io.github.hectorvent.floci.services.ecs.model.Volume;import io.github.hectorvent.floci.services.ecs.model.VolumeFrom;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/ecs/EcsService.java b/src/main/java/io/github/hectorvent/floci/services/ecs/EcsService.javaindex 1d355871bf..ede10ae55d 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecs/EcsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecs/EcsService.java@@ -6,8 +6,11 @@ import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.ContainerTeardown;import io.github.hectorvent.floci.core.common.RegionResolver;-import io.github.hectorvent.floci.core.common.Resettable;import io.github.hectorvent.floci.core.common.RequestScopes;+import io.github.hectorvent.floci.core.common.Resettable;+import io.github.hectorvent.floci.core.resource.ExplorerResource;+import io.github.hectorvent.floci.core.resource.ResourceProvider;+import io.github.hectorvent.floci.core.resource.SupportedResourceType;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageBackedMap;import io.github.hectorvent.floci.core.storage.StorageFactory;@@ -28,18 +31,18 @@ import io.github.hectorvent.floci.services.ecs.model.ContainerDefinition;import io.github.hectorvent.floci.services.ecs.model.ContainerDependency;import io.github.hectorvent.floci.services.ecs.model.ContainerImage;import io.github.hectorvent.floci.services.ecs.model.ContainerInstance;+import io.github.hectorvent.floci.services.ecs.model.ContainerOverride;import io.github.hectorvent.floci.services.ecs.model.CreateClusterRequest;import io.github.hectorvent.floci.services.ecs.model.CreateServiceRequest;import io.github.hectorvent.floci.services.ecs.model.CreateTaskSetRequest;import io.github.hectorvent.floci.services.ecs.model.Deployment;-import io.github.hectorvent.floci.services.ecs.model.EphemeralStorage;-import io.github.hectorvent.floci.services.ecs.model.Failure;-import io.github.hectorvent.floci.services.ecs.model.ContainerOverride;import io.github.hectorvent.floci.services.ecs.model.EcsCluster;import io.github.hectorvent.floci.services.ecs.model.EcsLoadBalancer;import io.github.hectorvent.floci.services.ecs.model.EcsServiceModel;import io.github.hectorvent.floci.services.ecs.model.EcsTask;import io.github.hectorvent.floci.services.ecs.model.EcsTaskAddress;+import io.github.hectorvent.floci.services.ecs.model.EphemeralStorage;+import io.github.hectorvent.floci.services.ecs.model.Failure;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.LaunchType;@@ -71,11 +74,12 @@ import org.jboss.logging.Logger;import java.nio.charset.StandardCharsets;import java.time.Instant;-import java.util.Base64;-import java.util.ArrayList;+import java.util.Base64;import java.util.Collection;import java.util.Collections;+import java.util.Comparator;+import java.util.HashSet;import java.util.LinkedHashMap;import java.util.LinkedHashSet;import java.util.List;@@ -83,23 +87,17 @@ import java.util.Locale;import java.util.Map;import java.util.Objects;import java.util.Optional;-import java.util.stream.Collectors;import java.util.Set;-import java.util.Comparator;-import java.util.HashSet;import java.util.UUID;-import java.util.function.Function;-import java.util.function.Predicate;-import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.Executors;import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.TimeUnit;+import java.util.function.Function;+import java.util.function.Predicate;import java.util.regex.Pattern;+import java.util.stream.Collectors;import java.util.stream.Stream;-import io.github.hectorvent.floci.core.resource.ExplorerResource;-import io.github.hectorvent.floci.core.resource.ResourceProvider;-import io.github.hectorvent.floci.core.resource.SupportedResourceType;@ApplicationScopedpublic class EcsService implements ContainerTeardown, ResourceProvider, Resettable {diff --git a/src/main/java/io/github/hectorvent/floci/services/ecs/EcsTaskMetadataController.java b/src/main/java/io/github/hectorvent/floci/services/ecs/EcsTaskMetadataController.javaindex 20bb00fca1..7d74b67db5 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecs/EcsTaskMetadataController.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecs/EcsTaskMetadataController.java@@ -1,5 +1,10 @@package io.github.hectorvent.floci.services.ecs;+import com.fasterxml.jackson.annotation.JsonInclude;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.json.JsonMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+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;@@ -14,11 +19,6 @@ import io.github.hectorvent.floci.services.ecs.model.EcsTask;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 com.fasterxml.jackson.annotation.JsonInclude;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.json.JsonMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.GET;@@ -27,7 +27,6 @@ import jakarta.ws.rs.PathParam;import jakarta.ws.rs.Produces;import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.Response;-import org.jboss.logging.Logger;import java.time.Instant;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 75cc966a47..43ee68224c 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,8 +1,18 @@package io.github.hectorvent.floci.services.ecs.container;+import com.github.dockerjava.api.DockerClient;+import com.github.dockerjava.api.async.ResultCallback;+import com.github.dockerjava.api.command.InspectContainerResponse;+import com.github.dockerjava.api.command.StatsCmd;+import com.github.dockerjava.api.exception.NotFoundException;+import com.github.dockerjava.api.model.ContainerNetwork;+import com.github.dockerjava.api.model.ExposedPort;+import com.github.dockerjava.api.model.LogConfig;import com.github.dockerjava.api.model.Ports;-import io.github.hectorvent.floci.core.common.AwsArnUtils;+import com.github.dockerjava.api.model.StatisticNetworksConfig;+import com.github.dockerjava.api.model.Statistics;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.common.docker.ContainerBuilder;@@ -13,13 +23,13 @@ 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.ContainerStorageHelper;import io.github.hectorvent.floci.core.common.docker.LaunchedContainerAwsEnv;-import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.SecurityGroupFirewallManager;import io.github.hectorvent.floci.services.ec2.SecurityGroupNftCompiler;import io.github.hectorvent.floci.services.ec2.model.NetworkInterface;import io.github.hectorvent.floci.services.ec2.model.PrefixListEntry;import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;+import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;import io.github.hectorvent.floci.services.ecs.model.AwsVpcConfiguration;import io.github.hectorvent.floci.services.ecs.model.Container;import io.github.hectorvent.floci.services.ecs.model.ContainerDefinition;@@ -46,16 +56,6 @@ 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;-import com.github.dockerjava.api.command.InspectContainerResponse;-import com.github.dockerjava.api.command.StatsCmd;-import com.github.dockerjava.api.exception.NotFoundException;-import com.github.dockerjava.api.model.ContainerNetwork;-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;@@ -63,9 +63,9 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry;import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;import org.jboss.logging.Logger;-import java.io.Closeable;import java.io.ByteArrayInputStream;import java.io.ByteArrayOutputStream;+import java.io.Closeable;import java.io.IOException;import java.nio.charset.StandardCharsets;import java.security.MessageDigest;diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/EfsService.java b/src/main/java/io/github/hectorvent/floci/services/efs/EfsService.javaindex 976a90af78..6fe26c2f23 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/EfsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/EfsService.java@@ -20,8 +20,8 @@ import io.github.hectorvent.floci.services.efs.model.DescribeMountTargetsResponsimport io.github.hectorvent.floci.services.efs.model.FileSystem;import io.github.hectorvent.floci.services.efs.model.FileSystemProtectionDescription;import io.github.hectorvent.floci.services.efs.model.FileSystemSize;-import io.github.hectorvent.floci.services.efs.model.LifecyclePolicy;import io.github.hectorvent.floci.services.efs.model.LifeCycleState;+import io.github.hectorvent.floci.services.efs.model.LifecyclePolicy;import io.github.hectorvent.floci.services.efs.model.ListTagsForResourceResponse;import io.github.hectorvent.floci.services.efs.model.ModifyMountTargetSecurityGroupsRequest;import io.github.hectorvent.floci.services.efs.model.MountTarget;diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/AccessPointDescription.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/AccessPointDescription.javaindex e1b3121e61..c96bf519c4 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/AccessPointDescription.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/AccessPointDescription.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectionpublic class AccessPointDescription {diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/BackupPolicy.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/BackupPolicy.javaindex 8a2a3dedd1..0f506492ac 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/BackupPolicy.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/BackupPolicy.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateAccessPointRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateAccessPointRequest.javaindex 7abb9e883c..e8602399a6 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateAccessPointRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateAccessPointRequest.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectionpublic class CreateAccessPointRequest {diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateFileSystemRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateFileSystemRequest.javaindex 6d8f0fa331..9a88422202 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateFileSystemRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateFileSystemRequest.java@@ -1,10 +1,10 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import java.util.List;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateMountTargetRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateMountTargetRequest.javaindex 88ee8b8038..31ee055178 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateMountTargetRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateMountTargetRequest.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectionpublic class CreateMountTargetRequest {diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateTagsRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateTagsRequest.javaindex bcec5f7567..328316e7ee 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateTagsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/CreateTagsRequest.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectionpublic class CreateTagsRequest {diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/CreationInfo.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/CreationInfo.javaindex 2d47a75122..db5475abd8 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/CreationInfo.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/CreationInfo.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/DeleteTagsRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/DeleteTagsRequest.javaindex e9d0445824..1c56697397 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/DeleteTagsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/DeleteTagsRequest.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectionpublic class DeleteTagsRequest {diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeAccessPointsResponse.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeAccessPointsResponse.javaindex b9bc05ab30..60319250f3 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeAccessPointsResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeAccessPointsResponse.java@@ -1,10 +1,10 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeFileSystemPolicyResponse.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeFileSystemPolicyResponse.javaindex 1eb9f1aa7d..441567a8d9 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeFileSystemPolicyResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeFileSystemPolicyResponse.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeFileSystemsRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeFileSystemsRequest.javaindex 678b4e67e1..76eb225105 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeFileSystemsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeFileSystemsRequest.java@@ -1,10 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;-+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;import jakarta.ws.rs.QueryParam;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeFileSystemsResponse.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeFileSystemsResponse.javaindex e02d023bd0..b75b899135 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeFileSystemsResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeFileSystemsResponse.java@@ -1,10 +1,10 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import java.util.List;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetSecurityGroupsRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetSecurityGroupsRequest.javaindex 338d4a5ab5..e465b5a7f9 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetSecurityGroupsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetSecurityGroupsRequest.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetSecurityGroupsResponse.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetSecurityGroupsResponse.javaindex 05536ea051..aea66df038 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetSecurityGroupsResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetSecurityGroupsResponse.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectionpublic class DescribeMountTargetSecurityGroupsResponse {diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetsRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetsRequest.javaindex e5a6883917..bb3cdee70e 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetsRequest.java@@ -1,10 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;-+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;import jakarta.ws.rs.QueryParam;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetsResponse.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetsResponse.javaindex 44bfe5d0f5..22f67d12f3 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetsResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeMountTargetsResponse.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectionpublic class DescribeMountTargetsResponse {diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeTagsResponse.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeTagsResponse.javaindex 77be13d901..12fe69b505 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeTagsResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/DescribeTagsResponse.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectionpublic class DescribeTagsResponse {diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/FileSystem.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/FileSystem.javaindex 81d7435ea9..641c6879fa 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/FileSystem.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/FileSystem.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectionpublic class FileSystem {diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/FileSystemProtectionDescription.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/FileSystemProtectionDescription.javaindex 82d9f6dc0b..e70f616cee 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/FileSystemProtectionDescription.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/FileSystemProtectionDescription.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/FileSystemSize.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/FileSystemSize.javaindex d3f8da7236..597cd1beb5 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/FileSystemSize.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/FileSystemSize.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/LifecyclePolicy.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/LifecyclePolicy.javaindex bfc3dde347..e7d4a8c5c4 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/LifecyclePolicy.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/LifecyclePolicy.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/ListTagsForResourceResponse.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/ListTagsForResourceResponse.javaindex dfc5c6639c..bf24a39da7 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/ListTagsForResourceResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/ListTagsForResourceResponse.java@@ -1,8 +1,9 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/ModifyMountTargetSecurityGroupsRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/ModifyMountTargetSecurityGroupsRequest.javaindex 37045de775..e02d18596b 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/ModifyMountTargetSecurityGroupsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/ModifyMountTargetSecurityGroupsRequest.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectionpublic class ModifyMountTargetSecurityGroupsRequest {diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/MountTarget.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/MountTarget.javaindex 22763248b5..762d8b0fa7 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/MountTarget.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/MountTarget.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectionpublic class MountTarget {diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/PosixUser.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/PosixUser.javaindex 182988a4af..7976dd1058 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/PosixUser.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/PosixUser.java@@ -1,12 +1,11 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;-@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectionpublic class PosixUser {diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/PutBackupPolicyRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/PutBackupPolicyRequest.javaindex fe7f36c832..e7b6e39d2f 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/PutBackupPolicyRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/PutBackupPolicyRequest.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/PutBackupPolicyResponse.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/PutBackupPolicyResponse.javaindex 8b171a143f..12f609637f 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/PutBackupPolicyResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/PutBackupPolicyResponse.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/PutFileSystemPolicyRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/PutFileSystemPolicyRequest.javaindex 1bd2d4f63a..972729d033 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/PutFileSystemPolicyRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/PutFileSystemPolicyRequest.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/PutFileSystemPolicyResponse.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/PutFileSystemPolicyResponse.javaindex 7627061adf..73a76a3744 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/PutFileSystemPolicyResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/PutFileSystemPolicyResponse.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/PutLifecycleConfigurationRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/PutLifecycleConfigurationRequest.javaindex 9ec1ef3b6d..24ce0b0694 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/PutLifecycleConfigurationRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/PutLifecycleConfigurationRequest.java@@ -1,10 +1,10 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/PutLifecycleConfigurationResponse.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/PutLifecycleConfigurationResponse.javaindex 2a9a8cfeea..a6669bcc24 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/PutLifecycleConfigurationResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/PutLifecycleConfigurationResponse.java@@ -1,10 +1,10 @@package io.github.hectorvent.floci.services.efs.model;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.List;-import com.fasterxml.jackson.databind.annotation.JsonNaming;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/RootDirectory.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/RootDirectory.javaindex e9b0b11cc1..9b001976f8 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/RootDirectory.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/RootDirectory.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/TagResourceRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/TagResourceRequest.javaindex 0f7e131c9e..04ab7d3cb0 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/TagResourceRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/TagResourceRequest.java@@ -1,8 +1,9 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)diff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/UpdateFileSystemProtectionRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/UpdateFileSystemProtectionRequest.javaindex 2f806a8517..d514049a83 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/UpdateFileSystemProtectionRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/UpdateFileSystemProtectionRequest.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/efs/model/UpdateFileSystemRequest.java b/src/main/java/io/github/hectorvent/floci/services/efs/model/UpdateFileSystemRequest.javaindex aa6e53a60e..3aa8f1988b 100644--- a/src/main/java/io/github/hectorvent/floci/services/efs/model/UpdateFileSystemRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/efs/model/UpdateFileSystemRequest.java@@ -1,9 +1,8 @@package io.github.hectorvent.floci.services.efs.model;-import io.quarkus.runtime.annotations.RegisterForReflection;--import com.fasterxml.jackson.databind.annotation.JsonNaming;import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/eks/EksOidcTokenController.java b/src/main/java/io/github/hectorvent/floci/services/eks/EksOidcTokenController.javaindex 734f3b0177..678d3d8eb4 100644--- a/src/main/java/io/github/hectorvent/floci/services/eks/EksOidcTokenController.java+++ b/src/main/java/io/github/hectorvent/floci/services/eks/EksOidcTokenController.java@@ -1,8 +1,5 @@package io.github.hectorvent.floci.services.eks;-import java.util.LinkedHashMap;-import java.util.Map;-import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.eks.model.Cluster;import jakarta.enterprise.context.ApplicationScoped;@@ -15,6 +12,9 @@ import jakarta.ws.rs.Produces;import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.Response;+import java.util.LinkedHashMap;+import java.util.Map;+/*** Mints an IRSA service-account token signed by a cluster's OIDC key.*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 b3795dd2d1..0f42b25660 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@@ -1,7 +1,7 @@package io.github.hectorvent.floci.services.eks;-import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.eks.model.Cluster;import io.github.hectorvent.floci.services.eks.model.ClusterOidcKey;import jakarta.enterprise.context.ApplicationScoped;diff --git a/src/main/java/io/github/hectorvent/floci/services/eks/EksService.java b/src/main/java/io/github/hectorvent/floci/services/eks/EksService.javaindex b3cd5dd318..a62d4825c6 100644--- a/src/main/java/io/github/hectorvent/floci/services/eks/EksService.java+++ b/src/main/java/io/github/hectorvent/floci/services/eks/EksService.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.eks;+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;@@ -8,6 +9,9 @@ import io.github.hectorvent.floci.core.common.RequestScopes;import io.github.hectorvent.floci.core.common.ReservedTags;import io.github.hectorvent.floci.core.common.TagHandler;import io.github.hectorvent.floci.core.common.docker.UserDataPipeline;+import io.github.hectorvent.floci.core.resource.ExplorerResource;+import io.github.hectorvent.floci.core.resource.ResourceProvider;+import io.github.hectorvent.floci.core.resource.SupportedResourceType;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;@@ -22,9 +26,9 @@ import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;import io.github.hectorvent.floci.services.ec2.model.Tag;import io.github.hectorvent.floci.services.ec2.model.UserIdGroupPair;import io.github.hectorvent.floci.services.ec2.model.Vpc;+import io.github.hectorvent.floci.services.eks.model.AccessConfig;import io.github.hectorvent.floci.services.eks.model.CertificateAuthority;import io.github.hectorvent.floci.services.eks.model.Cluster;-import io.github.hectorvent.floci.services.eks.model.AccessConfig;import io.github.hectorvent.floci.services.eks.model.ClusterIdentity;import io.github.hectorvent.floci.services.eks.model.ClusterStatus;import io.github.hectorvent.floci.services.eks.model.CreateClusterRequest;@@ -42,7 +46,6 @@ import io.github.hectorvent.floci.services.eks.model.NodegroupStatus;import io.github.hectorvent.floci.services.eks.model.OidcIdentity;import io.github.hectorvent.floci.services.eks.model.Provider;import io.github.hectorvent.floci.services.eks.model.ResourcesVpcConfig;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.annotation.PostConstruct;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;@@ -62,19 +65,16 @@ import java.util.Map;import java.util.Optional;import java.util.Set;import java.util.UUID;-import java.util.function.Consumer;import java.util.concurrent.CompletableFuture;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.Executors;import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.ThreadLocalRandom;import java.util.concurrent.TimeUnit;+import java.util.function.Consumer;import java.util.regex.Matcher;import java.util.regex.Pattern;import java.util.stream.Collectors;-import io.github.hectorvent.floci.core.resource.ExplorerResource;-import io.github.hectorvent.floci.core.resource.ResourceProvider;-import io.github.hectorvent.floci.core.resource.SupportedResourceType;@ApplicationScopedpublic class EksService implements TagHandler, ResourceProvider, Ec2InstanceLaunchListener {diff --git a/src/main/java/io/github/hectorvent/floci/services/eks/model/Nodegroup.java b/src/main/java/io/github/hectorvent/floci/services/eks/model/Nodegroup.javaindex acc788b781..4bd623dbf9 100644--- a/src/main/java/io/github/hectorvent/floci/services/eks/model/Nodegroup.java+++ b/src/main/java/io/github/hectorvent/floci/services/eks/model/Nodegroup.java@@ -2,8 +2,8 @@ package io.github.hectorvent.floci.services.eks.model;import com.fasterxml.jackson.annotation.JsonFormat;import com.fasterxml.jackson.annotation.JsonIgnore;-import com.fasterxml.jackson.annotation.JsonInclude;import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import com.fasterxml.jackson.annotation.JsonInclude;import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;diff --git a/src/main/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheQueryHandler.javaindex 8273d671f2..e3093f85e9 100644--- a/src/main/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheQueryHandler.java@@ -2,10 +2,10 @@ package io.github.hectorvent.floci.services.elasticache;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.AwsRegions;-import io.github.hectorvent.floci.core.common.BackupWindows;import io.github.hectorvent.floci.core.common.AwsNamespaces;import io.github.hectorvent.floci.core.common.AwsQueryResponse;+import io.github.hectorvent.floci.core.common.AwsRegions;+import io.github.hectorvent.floci.core.common.BackupWindows;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.XmlBuilder;import io.github.hectorvent.floci.services.elasticache.model.AuthMode;diff --git a/src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2Service.java b/src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2Service.javaindex 7c5ab43243..cc650372e8 100644--- a/src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2Service.java+++ b/src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2Service.java@@ -8,6 +8,9 @@ import io.github.hectorvent.floci.core.common.AwsRegionFacts;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.SsrfProtection;import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;+import io.github.hectorvent.floci.core.resource.ExplorerResource;+import io.github.hectorvent.floci.core.resource.ResourceProvider;+import io.github.hectorvent.floci.core.resource.SupportedResourceType;import io.github.hectorvent.floci.core.storage.StorageBackedMap;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.ec2.Ec2Service;@@ -22,15 +25,12 @@ import java.io.IOException;import java.net.InetAddress;import java.time.Instant;import java.util.*;-import java.util.concurrent.ConcurrentHashMap;-import java.util.stream.Collectors;-import io.github.hectorvent.floci.core.resource.ExplorerResource;-import io.github.hectorvent.floci.core.resource.ResourceProvider;-import io.github.hectorvent.floci.core.resource.SupportedResourceType;import java.util.ArrayList;import java.util.List;import java.util.Map;import java.util.Set;+import java.util.concurrent.ConcurrentHashMap;+import java.util.stream.Collectors;@ApplicationScopedpublic class ElbV2Service implements ResourceProvider, ServerCertificateReferenceProvider {diff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/EmrServerlessController.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/EmrServerlessController.javaindex 28672b6cfb..b09b7e76e9 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/EmrServerlessController.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/EmrServerlessController.java@@ -1,13 +1,13 @@package io.github.hectorvent.floci.services.emrserverless;+import io.github.hectorvent.floci.core.common.PaginatedResult;+import io.github.hectorvent.floci.core.common.Pagination;import io.github.hectorvent.floci.services.emrserverless.model.Application;import io.github.hectorvent.floci.services.emrserverless.model.ApplicationSummary;import io.github.hectorvent.floci.services.emrserverless.model.CreateApplicationRequest;import io.github.hectorvent.floci.services.emrserverless.model.CreateApplicationResponse;import io.github.hectorvent.floci.services.emrserverless.model.DeleteApplicationResponse;import io.github.hectorvent.floci.services.emrserverless.model.GetApplicationResponse;-import io.github.hectorvent.floci.core.common.PaginatedResult;-import io.github.hectorvent.floci.core.common.Pagination;import io.github.hectorvent.floci.services.emrserverless.model.ListApplicationsRequest;import io.github.hectorvent.floci.services.emrserverless.model.ListApplicationsResponse;import io.github.hectorvent.floci.services.emrserverless.model.StartApplicationResponse;diff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/Application.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/Application.javaindex 57abacd103..378c800518 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/Application.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/Application.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.emrserverless.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.Date;import java.util.List;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/CreateApplicationRequest.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/CreateApplicationRequest.javaindex a0dd6e8070..74d8549156 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/CreateApplicationRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/CreateApplicationRequest.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.emrserverless.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.Map;@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/DiskEncryptionConfiguration.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/DiskEncryptionConfiguration.javaindex 3eaf2b1b84..f3cec6cc37 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/DiskEncryptionConfiguration.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/DiskEncryptionConfiguration.java@@ -1,8 +1,9 @@package io.github.hectorvent.floci.services.emrserverless.model;-import io.quarkus.runtime.annotations.RegisterForReflection;import com.fasterxml.jackson.annotation.JsonAnyGetter;import com.fasterxml.jackson.annotation.JsonAnySetter;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.LinkedHashMap;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/IdentityCenterConfiguration.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/IdentityCenterConfiguration.javaindex 43f791c3ec..3d1b3e9a85 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/IdentityCenterConfiguration.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/IdentityCenterConfiguration.java@@ -1,8 +1,9 @@package io.github.hectorvent.floci.services.emrserverless.model;-import io.quarkus.runtime.annotations.RegisterForReflection;import com.fasterxml.jackson.annotation.JsonAnyGetter;import com.fasterxml.jackson.annotation.JsonAnySetter;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.LinkedHashMap;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/InteractiveConfiguration.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/InteractiveConfiguration.javaindex b2da2daa5d..69cf303ce2 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/InteractiveConfiguration.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/InteractiveConfiguration.java@@ -1,8 +1,9 @@package io.github.hectorvent.floci.services.emrserverless.model;-import io.quarkus.runtime.annotations.RegisterForReflection;import com.fasterxml.jackson.annotation.JsonAnyGetter;import com.fasterxml.jackson.annotation.JsonAnySetter;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.LinkedHashMap;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/JobLevelCostAllocationConfiguration.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/JobLevelCostAllocationConfiguration.javaindex e6e6d61517..5bff2c52fe 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/JobLevelCostAllocationConfiguration.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/JobLevelCostAllocationConfiguration.java@@ -1,8 +1,9 @@package io.github.hectorvent.floci.services.emrserverless.model;-import io.quarkus.runtime.annotations.RegisterForReflection;import com.fasterxml.jackson.annotation.JsonAnyGetter;import com.fasterxml.jackson.annotation.JsonAnySetter;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.LinkedHashMap;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/ListApplicationsRequest.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/ListApplicationsRequest.javaindex e55e537ed8..1a55bddaae 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/ListApplicationsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/ListApplicationsRequest.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.emrserverless.model;-import java.util.List;-import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;+@RegisterForReflectionpublic class ListApplicationsRequest {private Integer maxResults;diff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/ListApplicationsResponse.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/ListApplicationsResponse.javaindex 32bb9eae95..c28f7dc916 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/ListApplicationsResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/ListApplicationsResponse.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.emrserverless.model;-import java.util.List;-import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;+@RegisterForReflectionpublic class ListApplicationsResponse {private List<ApplicationSummary> applications;diff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/MonitoringConfiguration.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/MonitoringConfiguration.javaindex b1613b22e3..490d8ba6ca 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/MonitoringConfiguration.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/MonitoringConfiguration.java@@ -1,8 +1,9 @@package io.github.hectorvent.floci.services.emrserverless.model;-import io.quarkus.runtime.annotations.RegisterForReflection;import com.fasterxml.jackson.annotation.JsonAnyGetter;import com.fasterxml.jackson.annotation.JsonAnySetter;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.LinkedHashMap;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/NetworkConfiguration.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/NetworkConfiguration.javaindex 0a777a278e..4a0e0d0a23 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/NetworkConfiguration.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/NetworkConfiguration.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.emrserverless.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/RuntimeConfiguration.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/RuntimeConfiguration.javaindex 7f39d9cbab..f190d8364a 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/RuntimeConfiguration.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/RuntimeConfiguration.java@@ -1,8 +1,9 @@package io.github.hectorvent.floci.services.emrserverless.model;-import io.quarkus.runtime.annotations.RegisterForReflection;import com.fasterxml.jackson.annotation.JsonAnyGetter;import com.fasterxml.jackson.annotation.JsonAnySetter;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.LinkedHashMap;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/SchedulerConfiguration.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/SchedulerConfiguration.javaindex 1343bbfcd7..cf4d8344f4 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/SchedulerConfiguration.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/SchedulerConfiguration.java@@ -1,8 +1,9 @@package io.github.hectorvent.floci.services.emrserverless.model;-import io.quarkus.runtime.annotations.RegisterForReflection;import com.fasterxml.jackson.annotation.JsonAnyGetter;import com.fasterxml.jackson.annotation.JsonAnySetter;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.LinkedHashMap;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/UpdateApplicationRequest.java b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/UpdateApplicationRequest.javaindex 24b5782066..4cb186fe6b 100644--- a/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/UpdateApplicationRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/emrserverless/model/UpdateApplicationRequest.java@@ -1,10 +1,10 @@package io.github.hectorvent.floci.services.emrserverless.model;+import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;import java.util.Map;-import io.quarkus.runtime.annotations.RegisterForReflection;-@RegisterForReflectionpublic class UpdateApplicationRequest {diff --git a/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeHandler.java b/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeHandler.javaindex 645e9c30f8..cd051af87e 100644--- a/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeHandler.java@@ -1,5 +1,9 @@package io.github.hectorvent.floci.services.eventbridge;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsErrorResponse;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsJson11Controller;@@ -19,10 +23,6 @@ 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;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;diff --git a/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeInvoker.java b/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeInvoker.javaindex ce3b20b004..81971287c7 100644--- a/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeInvoker.java+++ b/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeInvoker.java@@ -37,8 +37,8 @@ import java.io.IOException;import java.io.UncheckedIOException;import java.net.InetAddress;import java.net.URI;-import java.net.UnknownHostException;import java.net.URLEncoder;+import java.net.UnknownHostException;import java.net.http.HttpClient;import java.net.http.HttpRequest;import java.net.http.HttpResponse;diff --git a/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeService.java b/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeService.javaindex 03624a6750..acce8dd642 100644--- a/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeService.java+++ b/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeService.java@@ -1,10 +1,20 @@package io.github.hectorvent.floci.services.eventbridge;+import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.core.type.TypeReference;+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 io.github.hectorvent.floci.core.common.AwsArnUtils;+import com.fasterxml.jackson.databind.node.ObjectNode;+import com.fasterxml.jackson.databind.node.TextNode;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.resource.ExplorerResource;+import io.github.hectorvent.floci.core.resource.ResourceProvider;+import io.github.hectorvent.floci.core.resource.SupportedResourceType;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;@@ -22,13 +32,6 @@ 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.Target;import io.github.hectorvent.floci.services.resourcegroupstagging.ResourceGroupsTaggingService;-import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.core.type.TypeReference;-import com.fasterxml.jackson.databind.DeserializationFeature;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ObjectNode;-import com.fasterxml.jackson.databind.node.TextNode;import jakarta.annotation.PostConstruct;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;@@ -42,13 +45,10 @@ import java.util.Comparator;import java.util.HashMap;import java.util.List;import java.util.Map;-import java.util.UUID;-import java.util.regex.Pattern;-import io.github.hectorvent.floci.core.resource.ExplorerResource;-import io.github.hectorvent.floci.core.resource.ResourceProvider;-import io.github.hectorvent.floci.core.resource.SupportedResourceType;import java.util.Optional;import java.util.Set;+import java.util.UUID;+import java.util.regex.Pattern;@ApplicationScopedpublic class EventBridgeService implements ResourceProvider {diff --git a/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseCompression.java b/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseCompression.javaindex 9c02677f80..a6bda03728 100644--- a/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseCompression.java+++ b/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseCompression.java@@ -1,6 +1,8 @@package io.github.hectorvent.floci.services.firehose;import org.jboss.logging.Logger;+import org.xerial.snappy.SnappyHadoopCompatibleOutputStream;+import org.xerial.snappy.SnappyOutputStream;import java.io.ByteArrayOutputStream;import java.io.IOException;@@ -11,9 +13,6 @@ import java.util.zip.GZIPOutputStream;import java.util.zip.ZipEntry;import java.util.zip.ZipOutputStream;-import org.xerial.snappy.SnappyHadoopCompatibleOutputStream;-import org.xerial.snappy.SnappyOutputStream;-/*** The {@code CompressionFormat} values Firehose applies when it delivers to S3,* each paired with the object-key extension and {@code Content-Encoding} AWSdiff --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 e7303ef494..19d8db3342 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@@ -18,10 +18,10 @@ import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescriptimport io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.ParquetSerDe;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.S3Destination;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.SchemaConfiguration;+import io.github.hectorvent.floci.services.floci.duck.FlociDuckClient;import io.github.hectorvent.floci.services.glue.GlueService;import io.github.hectorvent.floci.services.glue.model.Column;import io.github.hectorvent.floci.services.glue.model.Table;-import io.github.hectorvent.floci.services.floci.duck.FlociDuckClient;import io.github.hectorvent.floci.services.s3.S3Service;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;@@ -36,10 +36,10 @@ import java.time.Instant;import java.time.LocalDate;import java.time.LocalDateTime;import java.time.ZoneOffset;-import java.time.temporal.ChronoField;import java.time.format.DateTimeFormatter;import java.time.format.DateTimeFormatterBuilder;import java.time.format.SignStyle;+import java.time.temporal.ChronoField;import java.util.ArrayList;import java.util.Base64;import java.util.HashSet;diff --git a/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseService.java b/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseService.javaindex 447652bf61..aa5b744fdc 100644--- a/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseService.java+++ b/src/main/java/io/github/hectorvent/floci/services/firehose/FirehoseService.java@@ -6,8 +6,10 @@ 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.common.RequestScopes;+import io.github.hectorvent.floci.core.resource.ExplorerResource;+import io.github.hectorvent.floci.core.resource.ResourceProvider;+import io.github.hectorvent.floci.core.resource.SupportedResourceType;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;-import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.KinesisStreamSource;@@ -30,18 +32,15 @@ import java.io.ByteArrayOutputStream;import java.time.Clock;import java.time.Instant;import java.util.*;-import java.util.concurrent.ConcurrentHashMap;-import java.util.concurrent.Executors;-import java.util.concurrent.ScheduledExecutorService;-import java.util.concurrent.TimeUnit;-import io.github.hectorvent.floci.core.resource.ExplorerResource;-import io.github.hectorvent.floci.core.resource.ResourceProvider;-import io.github.hectorvent.floci.core.resource.SupportedResourceType;-import java.util.LinkedHashMap;import java.util.ArrayList;+import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.Set;+import java.util.concurrent.ConcurrentHashMap;+import java.util.concurrent.Executors;+import java.util.concurrent.ScheduledExecutorService;+import java.util.concurrent.TimeUnit;@ApplicationScopedpublic class FirehoseService implements ResourceProvider {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 d629444494..876ded3c15 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@@ -14,8 +14,8 @@ import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescriptimport java.util.ArrayList;import java.util.List;-import java.util.Set;import java.util.Map;+import java.util.Set;import java.util.regex.Pattern;/**diff --git a/src/main/java/io/github/hectorvent/floci/services/firehose/S3ObjectKeyResolver.java b/src/main/java/io/github/hectorvent/floci/services/firehose/S3ObjectKeyResolver.javaindex 098acf6ac1..17a8292a27 100644--- a/src/main/java/io/github/hectorvent/floci/services/firehose/S3ObjectKeyResolver.java+++ b/src/main/java/io/github/hectorvent/floci/services/firehose/S3ObjectKeyResolver.java@@ -1,8 +1,7 @@package io.github.hectorvent.floci.services.firehose;-import org.jboss.logging.Logger;-import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.S3Destination;+import org.jboss.logging.Logger;import java.time.Instant;import java.time.ZoneId;diff --git a/src/main/java/io/github/hectorvent/floci/services/firehose/model/DeliveryStreamDescription.java b/src/main/java/io/github/hectorvent/floci/services/firehose/model/DeliveryStreamDescription.javaindex 5d8866ca76..8208913b08 100644--- a/src/main/java/io/github/hectorvent/floci/services/firehose/model/DeliveryStreamDescription.java+++ b/src/main/java/io/github/hectorvent/floci/services/firehose/model/DeliveryStreamDescription.java@@ -6,11 +6,12 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import com.fasterxml.jackson.annotation.JsonInclude;import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;+import java.util.ArrayList;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import java.util.ArrayList;@RegisterForReflection@JsonIgnoreProperties(ignoreUnknown = true)diff --git a/src/main/java/io/github/hectorvent/floci/services/floci/ui/ConsoleProfileResolver.java b/src/main/java/io/github/hectorvent/floci/services/floci/ui/ConsoleProfileResolver.javaindex d1475774ec..cd07321166 100644--- a/src/main/java/io/github/hectorvent/floci/services/floci/ui/ConsoleProfileResolver.java+++ b/src/main/java/io/github/hectorvent/floci/services/floci/ui/ConsoleProfileResolver.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.floci.ui;-import java.util.Map;-import java.util.Optional;-import io.github.hectorvent.floci.config.EmulatorConfig.UiServiceConfig;import org.jboss.logging.Logger;+import java.util.Map;+import java.util.Optional;+/*** Resolves the {@link ConsoleProfile} for the configured console image.*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 4af87273cd..df45ea42e6 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,21 +1,10 @@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;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;-import java.util.Optional;-import java.util.concurrent.ExecutorService;-import java.util.concurrent.Executors;-import java.util.concurrent.atomic.AtomicBoolean;-import java.util.regex.Pattern;-import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;+import com.github.dockerjava.api.exception.DockerClientException;+import com.github.dockerjava.api.exception.NotFoundException;+import com.github.dockerjava.api.model.Container;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;@@ -31,13 +20,24 @@ import io.github.hectorvent.floci.core.common.docker.CurrentContainerNetworkResoimport io.github.hectorvent.floci.core.common.docker.DockerHostResolver;import io.github.hectorvent.floci.core.common.docker.LaunchedContainerAwsEnv;import io.github.hectorvent.floci.services.iam.model.SessionCreds;-import com.github.dockerjava.api.exception.DockerClientException;-import com.github.dockerjava.api.exception.NotFoundException;-import com.github.dockerjava.api.model.Container;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;+import java.io.Closeable;+import java.io.InputStream;+import java.net.HttpURLConnection;+import java.net.URI;+import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Optional;+import java.util.concurrent.ExecutorService;+import java.util.concurrent.Executors;+import java.util.concurrent.atomic.AtomicBoolean;+import java.util.regex.Pattern;+/*** Manages the lifecycle of the web-console sidecar container, the browser-facing Floci console.* The container is started lazily on the first {@code /_floci/ui} hit and reused across restartsdiff --git a/src/main/java/io/github/hectorvent/floci/services/floci/ui/UiPages.java b/src/main/java/io/github/hectorvent/floci/services/floci/ui/UiPages.javaindex 05adc688de..1b6da98c68 100644--- a/src/main/java/io/github/hectorvent/floci/services/floci/ui/UiPages.java+++ b/src/main/java/io/github/hectorvent/floci/services/floci/ui/UiPages.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.floci.ui;+import jakarta.enterprise.context.ApplicationScoped;+import java.io.IOException;import java.io.InputStream;import java.nio.charset.StandardCharsets;-import jakarta.enterprise.context.ApplicationScoped;-/*** Loads and caches the small embedded HTML pages served to browsers: the Floci* landing page and the "starting the UI" interstitial. Resources are read fromdiff --git a/src/main/java/io/github/hectorvent/floci/services/glue/model/Crawler.java b/src/main/java/io/github/hectorvent/floci/services/glue/model/Crawler.javaindex 85de429ebf..a7847a4bc8 100644--- a/src/main/java/io/github/hectorvent/floci/services/glue/model/Crawler.java+++ b/src/main/java/io/github/hectorvent/floci/services/glue/model/Crawler.java@@ -1,8 +1,9 @@package io.github.hectorvent.floci.services.glue.model;-import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.annotation.JsonFormat;+import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;import java.util.List;diff --git a/src/main/java/io/github/hectorvent/floci/services/glue/model/Database.java b/src/main/java/io/github/hectorvent/floci/services/glue/model/Database.javaindex 0eb7efbeea..eb6807bc27 100644--- a/src/main/java/io/github/hectorvent/floci/services/glue/model/Database.java+++ b/src/main/java/io/github/hectorvent/floci/services/glue/model/Database.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.glue.model;import com.fasterxml.jackson.annotation.JsonFormat;import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/glue/model/LastCrawlInfo.java b/src/main/java/io/github/hectorvent/floci/services/glue/model/LastCrawlInfo.javaindex 7a18eea816..b5a4155ed5 100644--- a/src/main/java/io/github/hectorvent/floci/services/glue/model/LastCrawlInfo.java+++ b/src/main/java/io/github/hectorvent/floci/services/glue/model/LastCrawlInfo.java@@ -1,8 +1,9 @@package io.github.hectorvent.floci.services.glue.model;-import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.annotation.JsonFormat;+import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;@RegisterForReflectiondiff --git a/src/main/java/io/github/hectorvent/floci/services/glue/model/Partition.java b/src/main/java/io/github/hectorvent/floci/services/glue/model/Partition.javaindex aa52d5c997..f143c8ed8c 100644--- a/src/main/java/io/github/hectorvent/floci/services/glue/model/Partition.java+++ b/src/main/java/io/github/hectorvent/floci/services/glue/model/Partition.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.glue.model;import com.fasterxml.jackson.annotation.JsonFormat;import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;import java.util.List;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/glue/model/StorageDescriptor.java b/src/main/java/io/github/hectorvent/floci/services/glue/model/StorageDescriptor.javaindex 9f93d4ba33..af937047b6 100644--- a/src/main/java/io/github/hectorvent/floci/services/glue/model/StorageDescriptor.java+++ b/src/main/java/io/github/hectorvent/floci/services/glue/model/StorageDescriptor.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.glue.model;import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/glue/model/Table.java b/src/main/java/io/github/hectorvent/floci/services/glue/model/Table.javaindex 46a66987b4..fcea6717ac 100644--- a/src/main/java/io/github/hectorvent/floci/services/glue/model/Table.java+++ b/src/main/java/io/github/hectorvent/floci/services/glue/model/Table.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.glue.model;import com.fasterxml.jackson.annotation.JsonFormat;import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;import java.util.List;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/guardduty/GuardDutyController.java b/src/main/java/io/github/hectorvent/floci/services/guardduty/GuardDutyController.javaindex c8533bb93a..bb34409bbc 100644--- a/src/main/java/io/github/hectorvent/floci/services/guardduty/GuardDutyController.java+++ b/src/main/java/io/github/hectorvent/floci/services/guardduty/GuardDutyController.java@@ -6,9 +6,9 @@ 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.services.guardduty.model.MemberAccount;import io.github.hectorvent.floci.services.guardduty.model.Detector;import io.github.hectorvent.floci.services.guardduty.model.DetectorFeature;+import io.github.hectorvent.floci.services.guardduty.model.MemberAccount;import io.github.hectorvent.floci.services.guardduty.model.OrganizationConfiguration;import io.github.hectorvent.floci.services.guardduty.model.OrganizationFeature;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/guardduty/GuardDutyService.java b/src/main/java/io/github/hectorvent/floci/services/guardduty/GuardDutyService.javaindex dc979114be..e19e70568c 100644--- a/src/main/java/io/github/hectorvent/floci/services/guardduty/GuardDutyService.java+++ b/src/main/java/io/github/hectorvent/floci/services/guardduty/GuardDutyService.java@@ -10,10 +10,10 @@ 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 io.github.hectorvent.floci.services.guardduty.model.AdminAccount;-import io.github.hectorvent.floci.services.guardduty.model.MemberAccount;import io.github.hectorvent.floci.services.guardduty.model.Detector;import io.github.hectorvent.floci.services.guardduty.model.DetectorAdditionalConfiguration;import io.github.hectorvent.floci.services.guardduty.model.DetectorFeature;+import io.github.hectorvent.floci.services.guardduty.model.MemberAccount;import io.github.hectorvent.floci.services.guardduty.model.OrganizationAdditionalConfiguration;import io.github.hectorvent.floci.services.guardduty.model.OrganizationConfiguration;import io.github.hectorvent.floci.services.guardduty.model.OrganizationFeature;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 db3dd23b95..34ef9b79bc 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@@ -16,9 +16,9 @@ import io.github.hectorvent.floci.services.iam.model.OutboundWebIdentityFederatiimport io.github.hectorvent.floci.services.iam.model.PolicyVersion;import io.github.hectorvent.floci.services.iam.model.SAMLProvider;import io.github.hectorvent.floci.services.iam.model.ServerCertificate;-import io.github.hectorvent.floci.services.iam.model.ServiceSpecificCredential;import io.github.hectorvent.floci.services.iam.model.ServiceLastAccessedEntity;import io.github.hectorvent.floci.services.iam.model.ServiceLastAccessedJob;+import io.github.hectorvent.floci.services.iam.model.ServiceSpecificCredential;import io.github.hectorvent.floci.services.iam.model.SigningCertificate;import io.github.hectorvent.floci.services.iam.model.SshPublicKey;import io.github.hectorvent.floci.services.iam.model.VirtualMfaDevice;diff --git a/src/main/java/io/github/hectorvent/floci/services/iam/model/OrganizationRootFeatures.java b/src/main/java/io/github/hectorvent/floci/services/iam/model/OrganizationRootFeatures.javaindex dbaec2a72e..b17bcb830a 100644--- a/src/main/java/io/github/hectorvent/floci/services/iam/model/OrganizationRootFeatures.java+++ b/src/main/java/io/github/hectorvent/floci/services/iam/model/OrganizationRootFeatures.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.iam.model;import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.LinkedHashSet;import java.util.Set;diff --git a/src/main/java/io/github/hectorvent/floci/services/iot/IotService.java b/src/main/java/io/github/hectorvent/floci/services/iot/IotService.javaindex e42fadecf6..a3c0cc0516 100644--- a/src/main/java/io/github/hectorvent/floci/services/iot/IotService.java+++ b/src/main/java/io/github/hectorvent/floci/services/iot/IotService.java@@ -15,10 +15,15 @@ import io.github.hectorvent.floci.core.common.Pem;import io.github.hectorvent.floci.core.common.RegionResolver;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 io.github.hectorvent.floci.services.acm.CertificateGenerator;import io.github.hectorvent.floci.services.cloudwatch.logs.CloudWatchLogsService;+import io.github.hectorvent.floci.services.dynamodb.DynamoDbFacade;+import io.github.hectorvent.floci.services.dynamodb.backend.DynamoDbOperations.Scope;+import io.github.hectorvent.floci.services.firehose.FirehoseService;+import io.github.hectorvent.floci.services.firehose.model.Record;import io.github.hectorvent.floci.services.iam.IamPolicyEvaluator;import io.github.hectorvent.floci.services.iam.model.CallerContext;-import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.iot.model.IotCertificate;import io.github.hectorvent.floci.services.iot.model.IotJob;import io.github.hectorvent.floci.services.iot.model.IotJobExecution;@@ -28,17 +33,12 @@ import io.github.hectorvent.floci.services.iot.model.IotShadow;import io.github.hectorvent.floci.services.iot.model.IotThingGroup;import io.github.hectorvent.floci.services.iot.model.IotThingType;import io.github.hectorvent.floci.services.iot.model.IotTopicRule;-import io.github.hectorvent.floci.services.acm.CertificateGenerator;import io.github.hectorvent.floci.services.iot.model.Thing;import io.github.hectorvent.floci.services.iot.rules.RuleSql;import io.github.hectorvent.floci.services.iot.rules.RuleSqlContext;import io.github.hectorvent.floci.services.iot.rules.RuleSqlEvaluator;import io.github.hectorvent.floci.services.iot.rules.RuleSqlParseException;import io.github.hectorvent.floci.services.iot.rules.RuleSqlParser;-import io.github.hectorvent.floci.services.dynamodb.DynamoDbFacade;-import io.github.hectorvent.floci.services.dynamodb.backend.DynamoDbOperations.Scope;-import io.github.hectorvent.floci.services.firehose.FirehoseService;-import io.github.hectorvent.floci.services.firehose.model.Record;import io.github.hectorvent.floci.services.kinesis.KinesisService;import io.github.hectorvent.floci.services.lambda.LambdaService;import io.github.hectorvent.floci.services.lambda.model.InvocationType;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 ce5f34e895..807ff1537d 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@@ -1,17 +1,17 @@package io.github.hectorvent.floci.services.kinesis;+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.AwsErrorResponse;import io.github.hectorvent.floci.core.common.AwsEventStreamEncoder;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.services.kinesis.model.KinesisConsumer;import io.github.hectorvent.floci.services.kinesis.model.KinesisRecord;import io.github.hectorvent.floci.services.kinesis.model.KinesisShard;import io.github.hectorvent.floci.services.kinesis.model.KinesisStream;-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.kinesis.model.KinesisConsumer;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;diff --git a/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisService.java b/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisService.javaindex 6c5e5c5a47..c67ab53068 100644--- a/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisService.java+++ b/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisService.java@@ -1,7 +1,12 @@package io.github.hectorvent.floci.services.kinesis;+import com.fasterxml.jackson.core.type.TypeReference;+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.resource.ExplorerResource;+import io.github.hectorvent.floci.core.resource.ResourceProvider;+import io.github.hectorvent.floci.core.resource.SupportedResourceType;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;@@ -9,7 +14,6 @@ import io.github.hectorvent.floci.services.kinesis.model.KinesisConsumer;import io.github.hectorvent.floci.services.kinesis.model.KinesisRecord;import io.github.hectorvent.floci.services.kinesis.model.KinesisShard;import io.github.hectorvent.floci.services.kinesis.model.KinesisStream;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;@@ -20,14 +24,10 @@ import java.time.Clock;import java.time.Duration;import java.time.Instant;import java.util.*;-import java.util.concurrent.ConcurrentHashMap;-import java.util.concurrent.atomic.AtomicLong;-import io.github.hectorvent.floci.core.resource.ExplorerResource;-import io.github.hectorvent.floci.core.resource.ResourceProvider;-import io.github.hectorvent.floci.core.resource.SupportedResourceType;-import io.github.hectorvent.floci.core.common.AwsArnUtils;import java.util.ArrayList;import java.util.Set;+import java.util.concurrent.ConcurrentHashMap;+import java.util.concurrent.atomic.AtomicLong;@ApplicationScopedpublic class KinesisService implements ResourceProvider {diff --git a/src/main/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2Service.java b/src/main/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2Service.javaindex e8093f331e..8e9aec27ad 100644--- a/src/main/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2Service.java+++ b/src/main/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2Service.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.kinesisanalytics;import com.fasterxml.jackson.core.type.TypeReference;-import io.github.hectorvent.floci.core.common.docker.ContainerStorageHelper;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.common.docker.ContainerStorageHelper;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;diff --git a/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.javaindex a22e82d8e4..437a9f7b90 100644--- a/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java@@ -1,5 +1,9 @@package io.github.hectorvent.floci.services.kms;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsErrorResponse;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -7,10 +11,6 @@ import io.github.hectorvent.floci.core.common.ReservedTags;import io.github.hectorvent.floci.services.kms.model.KmsAlias;import io.github.hectorvent.floci.services.kms.model.KmsGrant;import io.github.hectorvent.floci.services.kms.model.KmsKey;-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.kms.model.KmsKeySpec;import io.github.hectorvent.floci.services.kms.model.KmsKeyUsage;import io.github.hectorvent.floci.services.kms.model.KmsMessageType;diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/LakeFormationService.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/LakeFormationService.javaindex c1f74192e2..2789972afa 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/LakeFormationService.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/LakeFormationService.java@@ -1,7 +1,7 @@package io.github.hectorvent.floci.services.lakeformation;-import io.github.hectorvent.floci.core.common.AwsException;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.services.lakeformation.model.*;import jakarta.enterprise.context.ApplicationScoped;diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/LakeFormationStorage.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/LakeFormationStorage.javaindex 983fd508c1..8bf442d9d4 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/LakeFormationStorage.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/LakeFormationStorage.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.lakeformation;import io.github.hectorvent.floci.services.lakeformation.model.*;+import java.util.List;import java.util.Optional;diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/MemoryLakeFormationStorage.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/MemoryLakeFormationStorage.javaindex cb3283afb6..7be43431e8 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/MemoryLakeFormationStorage.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/MemoryLakeFormationStorage.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.lakeformation;+import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.lakeformation.model.*;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/AddLFTagsToResourceRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/AddLFTagsToResourceRequest.javaindex e33e9c2e32..170a81c3f4 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/AddLFTagsToResourceRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/AddLFTagsToResourceRequest.java@@ -1,12 +1,12 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/AddLFTagsToResourceResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/AddLFTagsToResourceResponse.javaindex d1dec2b6f1..2736fd82d0 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/AddLFTagsToResourceResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/AddLFTagsToResourceResponse.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/CatalogResource.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/CatalogResource.javaindex c550fa332d..19be09558e 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/CatalogResource.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/CatalogResource.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ColumnWildcard.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ColumnWildcard.javaindex 1a33b02f14..f7bb5743f4 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ColumnWildcard.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ColumnWildcard.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/Condition.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/Condition.javaindex 0f08b9268a..0eadd8c409 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/Condition.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/Condition.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/CreateLFTagRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/CreateLFTagRequest.javaindex 66386ee6a3..8f6bfbd179 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/CreateLFTagRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/CreateLFTagRequest.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/CreateLFTagResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/CreateLFTagResponse.javaindex 17cb1a2134..b52a306bd2 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/CreateLFTagResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/CreateLFTagResponse.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataCellsFilterResource.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataCellsFilterResource.javaindex e3a76312b0..6900870cb6 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataCellsFilterResource.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataCellsFilterResource.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataLakePrincipal.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataLakePrincipal.javaindex 767719d9d4..64192313ca 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataLakePrincipal.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataLakePrincipal.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataLakeSettings.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataLakeSettings.javaindex b9b7e3342b..33ec3707bd 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataLakeSettings.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataLakeSettings.java@@ -1,12 +1,12 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;+import com.fasterxml.jackson.databind.PropertyNamingStrategies;+import com.fasterxml.jackson.databind.annotation.JsonNaming;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;import java.util.Map;--import com.fasterxml.jackson.databind.PropertyNamingStrategies;-import com.fasterxml.jackson.databind.annotation.JsonNaming;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataLocationResource.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataLocationResource.javaindex 3f1e863b31..5db5ed73c7 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataLocationResource.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DataLocationResource.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DatabaseResource.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DatabaseResource.javaindex 16f69f4824..6e40aa5907 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DatabaseResource.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DatabaseResource.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeleteLFTagRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeleteLFTagRequest.javaindex 46072720b4..07988762bc 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeleteLFTagRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeleteLFTagRequest.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeleteLFTagResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeleteLFTagResponse.javaindex 410121ca5f..9b0378b6be 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeleteLFTagResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeleteLFTagResponse.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeregisterResourceRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeregisterResourceRequest.javaindex 5005b8d647..a2037e92bf 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeregisterResourceRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeregisterResourceRequest.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeregisterResourceResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeregisterResourceResponse.javaindex 89e6639b77..7e4fabdcf8 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeregisterResourceResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DeregisterResourceResponse.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DescribeResourceRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DescribeResourceRequest.javaindex 20bb54a2c3..67a965473e 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DescribeResourceRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DescribeResourceRequest.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DescribeResourceResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DescribeResourceResponse.javaindex 42a15d96b6..d468937e5c 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DescribeResourceResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DescribeResourceResponse.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DetailsMap.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DetailsMap.javaindex 341df186c1..fd8bc00ef9 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DetailsMap.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/DetailsMap.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ErrorDetail.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ErrorDetail.javaindex f499e968f6..b338069460 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ErrorDetail.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ErrorDetail.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/FilterCondition.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/FilterCondition.javaindex db10ba9b75..dcad8360b7 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/FilterCondition.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/FilterCondition.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetDataLakeSettingsRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetDataLakeSettingsRequest.javaindex e4b119171a..8b1d2f8908 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetDataLakeSettingsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetDataLakeSettingsRequest.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetDataLakeSettingsResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetDataLakeSettingsResponse.javaindex 99cedc811e..01d42ba62f 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetDataLakeSettingsResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetDataLakeSettingsResponse.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetLFTagRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetLFTagRequest.javaindex f9a1dea6b5..e2270df373 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetLFTagRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetLFTagRequest.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetLFTagResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetLFTagResponse.javaindex db34b30bb1..db881b15a4 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetLFTagResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GetLFTagResponse.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GrantPermissionsRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GrantPermissionsRequest.javaindex 6184be67a2..65cc310cf0 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GrantPermissionsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GrantPermissionsRequest.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GrantPermissionsResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GrantPermissionsResponse.javaindex e7ca975c25..45a5357f61 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GrantPermissionsResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/GrantPermissionsResponse.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTag.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTag.javaindex 4367c77538..d6345e10ce 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTag.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTag.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagError.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagError.javaindex dc8d7332ec..6da25bd0c7 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagError.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagError.java@@ -1,11 +1,10 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagExpressionResource.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagExpressionResource.javaindex 9d22b6d7c2..a7bcd984cf 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagExpressionResource.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagExpressionResource.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagKeyResource.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagKeyResource.javaindex cbcd3f28e3..c841657db5 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagKeyResource.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagKeyResource.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagPair.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagPair.javaindex 76826f240e..d0eeae725e 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagPair.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagPair.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagPolicyResource.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagPolicyResource.javaindex 67ab34e044..52e949e21e 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagPolicyResource.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/LFTagPolicyResource.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListLFTagsRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListLFTagsRequest.javaindex d0815ab5da..f20f0843d8 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListLFTagsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListLFTagsRequest.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListLFTagsResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListLFTagsResponse.javaindex 2cac70a041..65f06a9ed8 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListLFTagsResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListLFTagsResponse.java@@ -1,12 +1,12 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListPermissionsRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListPermissionsRequest.javaindex e83ab46fff..551a13948c 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListPermissionsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListPermissionsRequest.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListPermissionsResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListPermissionsResponse.javaindex a616489a06..35ace5c515 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListPermissionsResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListPermissionsResponse.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListResourcesRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListResourcesRequest.javaindex 2eb409e5ce..6d0813ec8f 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListResourcesRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListResourcesRequest.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListResourcesResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListResourcesResponse.javaindex 79eec74912..015689701a 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListResourcesResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ListResourcesResponse.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PrincipalPermissions.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PrincipalPermissions.javaindex e53ec65ef9..53e197dbe1 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PrincipalPermissions.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PrincipalPermissions.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PrincipalResourcePermissions.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PrincipalResourcePermissions.javaindex f5b7fad003..fed859f886 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PrincipalResourcePermissions.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PrincipalResourcePermissions.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PutDataLakeSettingsRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PutDataLakeSettingsRequest.javaindex 5965df6d97..24e5761637 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PutDataLakeSettingsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PutDataLakeSettingsRequest.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PutDataLakeSettingsResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PutDataLakeSettingsResponse.javaindex 12f54cfd89..214a38a56c 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PutDataLakeSettingsResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/PutDataLakeSettingsResponse.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RegisterResourceRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RegisterResourceRequest.javaindex 3d1320b3d5..99237d55f8 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RegisterResourceRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RegisterResourceRequest.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RegisterResourceResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RegisterResourceResponse.javaindex 4bf2460dd5..e3645f742a 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RegisterResourceResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RegisterResourceResponse.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RemoveLFTagsFromResourceRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RemoveLFTagsFromResourceRequest.javaindex 81b09bc153..6b62c5923d 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RemoveLFTagsFromResourceRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RemoveLFTagsFromResourceRequest.java@@ -1,12 +1,12 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RemoveLFTagsFromResourceResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RemoveLFTagsFromResourceResponse.javaindex 7025625381..97b582ae7e 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RemoveLFTagsFromResourceResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RemoveLFTagsFromResourceResponse.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/Resource.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/Resource.javaindex 887e714f14..1b7dc127ff 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/Resource.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/Resource.java@@ -1,11 +1,10 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ResourceInfo.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ResourceInfo.javaindex 6df5f9c40a..a170875a87 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ResourceInfo.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/ResourceInfo.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RevokePermissionsRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RevokePermissionsRequest.javaindex e39a68228d..38e279a1b3 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RevokePermissionsRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RevokePermissionsRequest.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RevokePermissionsResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RevokePermissionsResponse.javaindex 69b7000fbe..a2da9c46e8 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RevokePermissionsResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/RevokePermissionsResponse.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/TableResource.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/TableResource.javaindex 65962fa705..580a9dbcf6 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/TableResource.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/TableResource.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/TableWildcard.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/TableWildcard.javaindex 2b1f409a99..960ce7514d 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/TableWildcard.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/TableWildcard.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/TableWithColumnsResource.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/TableWithColumnsResource.javaindex 49ac6ab379..be3f03c2f9 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/TableWithColumnsResource.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/TableWithColumnsResource.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/UpdateLFTagRequest.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/UpdateLFTagRequest.javaindex e3a981dfd3..bcd936e7ef 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/UpdateLFTagRequest.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/UpdateLFTagRequest.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import java.util.List;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.List;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/UpdateLFTagResponse.java b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/UpdateLFTagResponse.javaindex 7cc9bf98b7..7b8ab542ed 100644--- a/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/UpdateLFTagResponse.java+++ b/src/main/java/io/github/hectorvent/floci/services/lakeformation/model/UpdateLFTagResponse.java@@ -1,10 +1,9 @@package io.github.hectorvent.floci.services.lakeformation.model;import com.fasterxml.jackson.annotation.JsonInclude;-import io.quarkus.runtime.annotations.RegisterForReflection;-import com.fasterxml.jackson.databind.PropertyNamingStrategies;import com.fasterxml.jackson.databind.annotation.JsonNaming;+import io.quarkus.runtime.annotations.RegisterForReflection;@RegisterForReflection@JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class)@JsonInclude(JsonInclude.Include.NON_NULL)diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/ApiGatewayController.java b/src/main/java/io/github/hectorvent/floci/services/lambda/ApiGatewayController.javaindex 777ea98e3a..b9f3ebe265 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/ApiGatewayController.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/ApiGatewayController.java@@ -1,13 +1,13 @@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.ObjectNode;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.services.cloudwatch.logs.CloudWatchLogsService;-import io.github.hectorvent.floci.services.lambda.model.InvokeResult;import io.github.hectorvent.floci.services.lambda.model.InvocationType;-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.lambda.model.InvokeResult;import jakarta.inject.Inject;import jakarta.ws.rs.DELETE;import jakarta.ws.rs.GET;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/DynamoDbStreamsEventSourcePoller.java b/src/main/java/io/github/hectorvent/floci/services/lambda/DynamoDbStreamsEventSourcePoller.javaindex a22c52dc9e..406f71bf0f 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/DynamoDbStreamsEventSourcePoller.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/DynamoDbStreamsEventSourcePoller.java@@ -7,8 +7,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.Resettable;import io.github.hectorvent.floci.core.common.RequestScopes;+import io.github.hectorvent.floci.core.common.Resettable;import io.github.hectorvent.floci.services.dynamodb.backend.DynamoDbStreamReader;import io.github.hectorvent.floci.services.lambda.model.EventSourceMapping;import io.github.hectorvent.floci.services.lambda.model.InvocationType;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 35a38bf681..74d3d88d97 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@@ -1,10 +1,10 @@package io.github.hectorvent.floci.services.lambda;+import com.fasterxml.jackson.core.type.TypeReference;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 io.github.hectorvent.floci.services.lambda.model.EventSourceMapping;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaAliasStore.java b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaAliasStore.javaindex 0f5c9385f4..caaa1506d2 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaAliasStore.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaAliasStore.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.lambda;+import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.common.AwsArnUtils;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 io.github.hectorvent.floci.services.lambda.model.LambdaAlias;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaExecutorService.java b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaExecutorService.javaindex c5800aa1a1..f1ea20594f 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaExecutorService.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaExecutorService.java@@ -8,8 +8,8 @@ import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.Resettable;import io.github.hectorvent.floci.services.lambda.launcher.ContainerHandle;import io.github.hectorvent.floci.services.lambda.model.FunctionEventInvokeConfig;-import io.github.hectorvent.floci.services.lambda.model.InvokeResult;import io.github.hectorvent.floci.services.lambda.model.InvocationType;+import io.github.hectorvent.floci.services.lambda.model.InvokeResult;import io.github.hectorvent.floci.services.lambda.model.LambdaFunction;import io.github.hectorvent.floci.services.lambda.model.PendingInvocation;import jakarta.annotation.PreDestroy;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaFunctionStore.java b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaFunctionStore.javaindex 202efdcd32..9a322be87c 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaFunctionStore.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaFunctionStore.java@@ -1,12 +1,12 @@package io.github.hectorvent.floci.services.lambda;+import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.Resettable;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 io.github.hectorvent.floci.services.lambda.model.LambdaFunction;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;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 86c793d317..cc5397cd0d 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@@ -11,10 +11,10 @@ import io.github.hectorvent.floci.services.s3.S3Service;import io.github.hectorvent.floci.services.s3.model.S3Object;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;-import javax.crypto.Mac;-import javax.crypto.spec.SecretKeySpec;import org.jboss.logging.Logger;+import javax.crypto.Mac;+import javax.crypto.spec.SecretKeySpec;import java.io.IOException;import java.nio.charset.StandardCharsets;import java.nio.file.Files;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaLayerStore.java b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaLayerStore.javaindex b49e97a549..5e8091d4c4 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaLayerStore.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaLayerStore.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.lambda;+import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.lambda.model.LambdaLayerVersion;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaService.java b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaService.javaindex 021a298df8..b78ff5fd2b 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaService.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaService.java@@ -10,11 +10,11 @@ import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.CustomResourceLiveness;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.RequestScopes;-import io.github.hectorvent.floci.core.storage.StorageBackedMap;-import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.core.resource.ExplorerResource;import io.github.hectorvent.floci.core.resource.ResourceProvider;import io.github.hectorvent.floci.core.resource.SupportedResourceType;+import io.github.hectorvent.floci.core.storage.StorageBackedMap;+import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.model.Subnet;import io.github.hectorvent.floci.services.lambda.durable.DurableExecutionService;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaUrlController.java b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaUrlController.javaindex ed2a98fed4..7bbca32617 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaUrlController.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaUrlController.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.lambda;+import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.services.lambda.model.LambdaUrlConfig;-import com.fasterxml.jackson.databind.ObjectMapper;import jakarta.inject.Inject;import jakarta.ws.rs.Consumes;import jakarta.ws.rs.DELETE;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaUrlInvocationController.java b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaUrlInvocationController.javaindex 2cdc18ef22..68966a17c1 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaUrlInvocationController.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaUrlInvocationController.java@@ -1,5 +1,9 @@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.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.CookieHeaders;@@ -9,10 +13,6 @@ import io.github.hectorvent.floci.services.lambda.model.InvocationType;import io.github.hectorvent.floci.services.lambda.model.InvokeResult;import io.github.hectorvent.floci.services.lambda.model.LambdaAlias;import io.github.hectorvent.floci.services.lambda.model.LambdaFunction;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.inject.Inject;import jakarta.ws.rs.Consumes;import jakarta.ws.rs.DELETE;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 29bc02039f..22d56cc686 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@@ -6,8 +6,8 @@ import com.fasterxml.jackson.databind.node.ArrayNode;import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsArnUtils;-import io.github.hectorvent.floci.core.common.Resettable;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.common.Resettable;import io.github.hectorvent.floci.services.lambda.model.EventSourceMapping;import io.github.hectorvent.floci.services.lambda.model.InvocationType;import io.github.hectorvent.floci.services.lambda.model.InvokeResult;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/durable/DurableExecutionService.java b/src/main/java/io/github/hectorvent/floci/services/lambda/durable/DurableExecutionService.javaindex b665e4e40f..3d8adf898c 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/durable/DurableExecutionService.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/durable/DurableExecutionService.java@@ -5,8 +5,8 @@ import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.Pagination;import io.github.hectorvent.floci.core.common.PaginatedResult;+import io.github.hectorvent.floci.core.common.Pagination;import io.github.hectorvent.floci.core.common.Resettable;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend.AccountEntry;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncher.java b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncher.javaindex 6881d76be3..accb5c0971 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncher.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncher.java@@ -1,6 +1,8 @@package io.github.hectorvent.floci.services.lambda.launcher;+import com.github.dockerjava.api.DockerClient;import com.github.dockerjava.api.command.ExecCreateCmd;+import com.github.dockerjava.api.exception.NotFoundException;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;@@ -9,8 +11,8 @@ 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.ContainerStorageHelper;import io.github.hectorvent.floci.core.common.docker.DockerHostResolver;-import io.github.hectorvent.floci.core.common.docker.RetryingTarCopier;import io.github.hectorvent.floci.core.common.docker.LaunchedContainerAwsEnv;+import io.github.hectorvent.floci.core.common.docker.RetryingTarCopier;import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;import io.github.hectorvent.floci.services.iam.model.SessionCreds;import io.github.hectorvent.floci.services.lambda.LambdaLayerService;@@ -19,18 +21,15 @@ 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 com.github.dockerjava.api.DockerClient;-import com.github.dockerjava.api.exception.NotFoundException;import jakarta.annotation.PostConstruct;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;import jakarta.enterprise.inject.Typed;import jakarta.inject.Inject;-import org.jboss.logging.Logger;-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;+import org.jboss.logging.Logger;import java.io.Closeable;import java.io.IOException;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 968f6c1311..150642c83c 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,7 +8,6 @@ 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;@@ -39,6 +38,7 @@ import java.security.spec.PKCS8EncodedKeySpec;import java.time.Duration;import java.util.ArrayList;import java.util.Base64;+import java.util.Collection;import java.util.List;import java.util.Locale;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/model/EventSourceMapping.java b/src/main/java/io/github/hectorvent/floci/services/lambda/model/EventSourceMapping.javaindex 649c31a596..382c5b7022 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/model/EventSourceMapping.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/model/EventSourceMapping.java@@ -1,7 +1,6 @@package io.github.hectorvent.floci.services.lambda.model;import com.fasterxml.jackson.annotation.JsonIgnoreProperties;-import io.quarkus.runtime.annotations.RegisterForReflection;import java.util.ArrayList;diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/model/RegisteredExtension.java b/src/main/java/io/github/hectorvent/floci/services/lambda/model/RegisteredExtension.javaindex 526f02f997..f776ae43f5 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/model/RegisteredExtension.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/model/RegisteredExtension.java@@ -1,8 +1,9 @@package io.github.hectorvent.floci.services.lambda.model;+import io.vertx.ext.web.RoutingContext;+import java.util.ArrayDeque;import java.util.List;-import io.vertx.ext.web.RoutingContext;/*** Tracks one extension's Extensions API registration state within a single container'sdiff --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 11167feff6..616cac3a49 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@@ -6,9 +6,9 @@ import jakarta.inject.Inject;import org.jboss.logging.Logger;import java.io.IOException;-import java.nio.file.StandardCopyOption;import java.nio.file.Files;import java.nio.file.Path;+import java.nio.file.StandardCopyOption;import java.util.Comparator;import java.util.stream.Stream;diff --git a/src/main/java/io/github/hectorvent/floci/services/msk/MskService.java b/src/main/java/io/github/hectorvent/floci/services/msk/MskService.javaindex b2256a51ba..d2a92286d7 100644--- a/src/main/java/io/github/hectorvent/floci/services/msk/MskService.java+++ b/src/main/java/io/github/hectorvent/floci/services/msk/MskService.java@@ -1,12 +1,13 @@package io.github.hectorvent.floci.services.msk;+import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;-import io.github.hectorvent.floci.core.common.docker.ContainerStorageHelper;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.Pagination;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 io.github.hectorvent.floci.core.common.docker.ContainerStorageHelper;import io.github.hectorvent.floci.core.resource.ExplorerResource;import io.github.hectorvent.floci.core.resource.ResourceProvider;import io.github.hectorvent.floci.core.resource.SupportedResourceType;@@ -15,9 +16,9 @@ import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.msk.model.BrokerNodeGroupInfo;import io.github.hectorvent.floci.services.msk.model.ClusterState;+import io.github.hectorvent.floci.services.msk.model.ConfigurationInfo;import io.github.hectorvent.floci.services.msk.model.ConfigurationRevision;import io.github.hectorvent.floci.services.msk.model.ConfigurationRevisionDetail;-import io.github.hectorvent.floci.services.msk.model.ConfigurationInfo;import io.github.hectorvent.floci.services.msk.model.ConfigurationState;import io.github.hectorvent.floci.services.msk.model.CreateClusterRequest;import io.github.hectorvent.floci.services.msk.model.CreateClusterV2Request;@@ -25,7 +26,6 @@ import io.github.hectorvent.floci.services.msk.model.EncryptionInTransit;import io.github.hectorvent.floci.services.msk.model.EncryptionInfo;import io.github.hectorvent.floci.services.msk.model.MskCluster;import io.github.hectorvent.floci.services.msk.model.MskConfiguration;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.annotation.PostConstruct;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;diff --git a/src/main/java/io/github/hectorvent/floci/services/msk/model/MskCluster.java b/src/main/java/io/github/hectorvent/floci/services/msk/model/MskCluster.javaindex b183eaf00e..9c028ea82a 100644--- a/src/main/java/io/github/hectorvent/floci/services/msk/model/MskCluster.java+++ b/src/main/java/io/github/hectorvent/floci/services/msk/model/MskCluster.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.msk.model;import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/msk/model/Serverless.java b/src/main/java/io/github/hectorvent/floci/services/msk/model/Serverless.javaindex 984b8158ad..56b25c8add 100644--- a/src/main/java/io/github/hectorvent/floci/services/msk/model/Serverless.java+++ b/src/main/java/io/github/hectorvent/floci/services/msk/model/Serverless.java@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import com.fasterxml.jackson.annotation.JsonInclude;import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;/**diff --git a/src/main/java/io/github/hectorvent/floci/services/msk/model/VpcConfig.java b/src/main/java/io/github/hectorvent/floci/services/msk/model/VpcConfig.javaindex 71e5a3658b..897bdf7d31 100644--- a/src/main/java/io/github/hectorvent/floci/services/msk/model/VpcConfig.java+++ b/src/main/java/io/github/hectorvent/floci/services/msk/model/VpcConfig.java@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import com.fasterxml.jackson.annotation.JsonInclude;import com.fasterxml.jackson.annotation.JsonProperty;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;/** The VPC a serverless cluster's clients connect from. */diff --git a/src/main/java/io/github/hectorvent/floci/services/mwaa/MwaaEnvironmentManager.java b/src/main/java/io/github/hectorvent/floci/services/mwaa/MwaaEnvironmentManager.javaindex c4a9b92094..0e782c7168 100644--- a/src/main/java/io/github/hectorvent/floci/services/mwaa/MwaaEnvironmentManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/mwaa/MwaaEnvironmentManager.java@@ -1,5 +1,8 @@package io.github.hectorvent.floci.services.mwaa;+import com.github.dockerjava.api.command.InspectContainerResponse;+import com.github.dockerjava.api.exception.NotFoundException;+import com.github.dockerjava.api.model.ContainerNetwork;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;@@ -12,9 +15,6 @@ import io.github.hectorvent.floci.core.common.docker.ContainerStorageHelper;import io.github.hectorvent.floci.core.common.docker.LaunchedContainerAwsEnv;import io.github.hectorvent.floci.core.common.docker.RetryingTarCopier;import io.github.hectorvent.floci.services.mwaa.model.Environment;-import com.github.dockerjava.api.command.InspectContainerResponse;-import com.github.dockerjava.api.exception.NotFoundException;-import com.github.dockerjava.api.model.ContainerNetwork;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;diff --git a/src/main/java/io/github/hectorvent/floci/services/mwaa/MwaaService.java b/src/main/java/io/github/hectorvent/floci/services/mwaa/MwaaService.javaindex 4b4912b980..9f65cfead8 100644--- a/src/main/java/io/github/hectorvent/floci/services/mwaa/MwaaService.java+++ b/src/main/java/io/github/hectorvent/floci/services/mwaa/MwaaService.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.mwaa;+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;@@ -16,7 +17,6 @@ import io.github.hectorvent.floci.services.mwaa.model.UpdateEnvironmentRequest;import io.github.hectorvent.floci.services.mwaa.proxy.MwaaProxyManager;import io.github.hectorvent.floci.services.s3.S3Service;import io.github.hectorvent.floci.services.s3.model.S3Object;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.annotation.PostConstruct;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;diff --git a/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchController.java b/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchController.javaindex 16aee852d3..19e7fb0f31 100644--- a/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchController.java+++ b/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchController.java@@ -1,5 +1,9 @@package io.github.hectorvent.floci.services.opensearch;+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;import io.github.hectorvent.floci.services.opensearch.model.AdvancedSecurityOptions;@@ -10,10 +14,6 @@ import io.github.hectorvent.floci.services.opensearch.model.EbsOptions;import io.github.hectorvent.floci.services.opensearch.model.EncryptionAtRestOptions;import io.github.hectorvent.floci.services.opensearch.model.NodeToNodeEncryptionOptions;import io.github.hectorvent.floci.services.opensearch.model.VpcOptions;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.inject.Inject;import jakarta.ws.rs.*;import jakarta.ws.rs.core.Context;diff --git a/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchService.java b/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchService.javaindex e9dd12a45f..580cbc4efe 100644--- a/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchService.java+++ b/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchService.java@@ -1,11 +1,15 @@package io.github.hectorvent.floci.services.opensearch;+import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;-import io.github.hectorvent.floci.core.common.docker.ContainerStorageHelper;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsRegions;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.common.docker.ContainerStorageHelper;+import io.github.hectorvent.floci.core.resource.ExplorerResource;+import io.github.hectorvent.floci.core.resource.ResourceProvider;+import io.github.hectorvent.floci.core.resource.SupportedResourceType;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;@@ -17,7 +21,6 @@ import io.github.hectorvent.floci.services.opensearch.model.EbsOptions;import io.github.hectorvent.floci.services.opensearch.model.EncryptionAtRestOptions;import io.github.hectorvent.floci.services.opensearch.model.NodeToNodeEncryptionOptions;import io.github.hectorvent.floci.services.opensearch.model.VpcOptions;-import com.fasterxml.jackson.core.type.TypeReference;import jakarta.annotation.PostConstruct;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;@@ -33,9 +36,6 @@ import java.util.Set;import java.util.concurrent.Executors;import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.TimeUnit;-import io.github.hectorvent.floci.core.resource.ExplorerResource;-import io.github.hectorvent.floci.core.resource.ResourceProvider;-import io.github.hectorvent.floci.core.resource.SupportedResourceType;@ApplicationScopedpublic class OpenSearchService implements ResourceProvider {diff --git a/src/main/java/io/github/hectorvent/floci/services/organizations/OrganizationsService.java b/src/main/java/io/github/hectorvent/floci/services/organizations/OrganizationsService.javaindex f6c370caad..d6619faeb4 100644--- a/src/main/java/io/github/hectorvent/floci/services/organizations/OrganizationsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/organizations/OrganizationsService.java@@ -4,11 +4,11 @@ import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ObjectNode;+import io.github.hectorvent.floci.config.EmulatorConfig;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.core.storage.StorageFactory;-import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.services.iam.ScpProvider;import io.github.hectorvent.floci.services.organizations.model.CreateAccountStatus;import io.github.hectorvent.floci.services.organizations.model.Handshake;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 76cc522af7..9baeb33fcd 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,15 +1,15 @@package io.github.hectorvent.floci.services.pipes;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ArrayNode;-import io.github.hectorvent.floci.core.common.AwsException;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsErrorResponse;+import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.services.pipes.model.DesiredState;import io.github.hectorvent.floci.services.pipes.model.Pipe;import io.github.hectorvent.floci.services.pipes.model.PipeState;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.inject.Inject;import jakarta.ws.rs.*;import jakarta.ws.rs.core.Context;diff --git a/src/main/java/io/github/hectorvent/floci/services/pipes/PipesService.java b/src/main/java/io/github/hectorvent/floci/services/pipes/PipesService.javaindex b2f2bb83da..3a92e93429 100644--- a/src/main/java/io/github/hectorvent/floci/services/pipes/PipesService.java+++ b/src/main/java/io/github/hectorvent/floci/services/pipes/PipesService.java@@ -1,5 +1,7 @@package io.github.hectorvent.floci.services.pipes;+import com.fasterxml.jackson.core.type.TypeReference;+import com.fasterxml.jackson.databind.JsonNode;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -13,8 +15,6 @@ import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.pipes.model.DesiredState;import io.github.hectorvent.floci.services.pipes.model.Pipe;import io.github.hectorvent.floci.services.pipes.model.PipeState;-import com.fasterxml.jackson.core.type.TypeReference;-import com.fasterxml.jackson.databind.JsonNode;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;diff --git a/src/main/java/io/github/hectorvent/floci/services/ram/RamService.java b/src/main/java/io/github/hectorvent/floci/services/ram/RamService.javaindex 43b1cb1c6e..f97639ee06 100644--- a/src/main/java/io/github/hectorvent/floci/services/ram/RamService.java+++ b/src/main/java/io/github/hectorvent/floci/services/ram/RamService.java@@ -7,13 +7,13 @@ import io.github.hectorvent.floci.core.common.AwsPartitions;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 io.github.hectorvent.floci.services.organizations.OrganizationsService;+import io.github.hectorvent.floci.services.organizations.model.Organization;import io.github.hectorvent.floci.services.ram.model.PrincipalAssociation;import io.github.hectorvent.floci.services.ram.model.ResourceShare;import io.github.hectorvent.floci.services.ram.model.ResourceShareInvitation;import io.github.hectorvent.floci.services.ram.model.SharePermission;import io.github.hectorvent.floci.services.ram.model.SharedResource;-import io.github.hectorvent.floci.services.organizations.OrganizationsService;-import io.github.hectorvent.floci.services.organizations.model.Organization;import jakarta.annotation.PostConstruct;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/rds/RdsQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/rds/RdsQueryHandler.javaindex 18398ace1e..833d7b0808 100644--- a/src/main/java/io/github/hectorvent/floci/services/rds/RdsQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/rds/RdsQueryHandler.java@@ -6,19 +6,17 @@ import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsNamespaces;import io.github.hectorvent.floci.core.common.AwsQueryResponse;import io.github.hectorvent.floci.core.common.XmlBuilder;+import io.github.hectorvent.floci.services.docdb.DocDbQueryHandler;+import io.github.hectorvent.floci.services.neptune.NeptuneQueryHandler;import io.github.hectorvent.floci.services.rds.model.DatabaseEngine;import io.github.hectorvent.floci.services.rds.model.DbCluster;import io.github.hectorvent.floci.services.rds.model.DbClusterEndpoint;-import io.github.hectorvent.floci.services.rds.model.DbClusterSnapshot;import io.github.hectorvent.floci.services.rds.model.DbClusterParameterGroup;+import io.github.hectorvent.floci.services.rds.model.DbClusterSnapshot;import io.github.hectorvent.floci.services.rds.model.DbEndpoint;-import io.github.hectorvent.floci.services.docdb.DocDbQueryHandler;-import io.github.hectorvent.floci.services.neptune.NeptuneQueryHandler;import io.github.hectorvent.floci.services.rds.model.DbInstance;-import io.github.hectorvent.floci.services.rds.model.EventSubscription;import io.github.hectorvent.floci.services.rds.model.DbInstanceScalingChanges;import io.github.hectorvent.floci.services.rds.model.DbInstanceSettings;-import io.github.hectorvent.floci.services.rds.model.LogExportChanges;import io.github.hectorvent.floci.services.rds.model.DbInstanceStatus;import io.github.hectorvent.floci.services.rds.model.DbParameterGroup;import io.github.hectorvent.floci.services.rds.model.DbProxy;@@ -27,8 +25,10 @@ import io.github.hectorvent.floci.services.rds.model.DbProxyTarget;import io.github.hectorvent.floci.services.rds.model.DbProxyTargetGroup;import io.github.hectorvent.floci.services.rds.model.DbSnapshot;import io.github.hectorvent.floci.services.rds.model.DbSubnetGroup;+import io.github.hectorvent.floci.services.rds.model.EventSubscription;import io.github.hectorvent.floci.services.rds.model.GlobalCluster;import io.github.hectorvent.floci.services.rds.model.GlobalClusterMember;+import io.github.hectorvent.floci.services.rds.model.LogExportChanges;import io.github.hectorvent.floci.services.rds.model.OptionGroup;import io.github.hectorvent.floci.services.rds.model.OptionGroupOption;import io.github.hectorvent.floci.services.rds.model.PointInTimeRestoreRequest;diff --git a/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java b/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.javaindex 612e873b61..51258901fe 100644--- a/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java@@ -1,7 +1,7 @@package io.github.hectorvent.floci.services.rds;-import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.DeserializationFeature;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;@@ -11,6 +11,7 @@ import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsRegions;import io.github.hectorvent.floci.core.common.BackupWindows;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.common.Resettable;import io.github.hectorvent.floci.core.common.docker.ContainerLiveness;import io.github.hectorvent.floci.core.common.docker.ContainerStorageHelper;import io.github.hectorvent.floci.core.common.docker.CurrentContainerNetworkResolver;@@ -27,6 +28,8 @@ import io.github.hectorvent.floci.services.cloudwatch.metrics.model.Dimension;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.MetricDatum;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.model.Subnet;+import io.github.hectorvent.floci.services.kms.KmsService;+import io.github.hectorvent.floci.services.kms.model.KmsKey;import io.github.hectorvent.floci.services.rds.container.AutoPauseListener;import io.github.hectorvent.floci.services.rds.container.RdsContainerHandle;import io.github.hectorvent.floci.services.rds.container.RdsContainerManager;@@ -37,9 +40,6 @@ import io.github.hectorvent.floci.services.rds.model.DbClusterParameterGroup;import io.github.hectorvent.floci.services.rds.model.DbClusterSnapshot;import io.github.hectorvent.floci.services.rds.model.DbEndpoint;import io.github.hectorvent.floci.services.rds.model.DbInstance;-import io.github.hectorvent.floci.services.rds.model.EventSubscription;-import io.github.hectorvent.floci.services.kms.KmsService;-import io.github.hectorvent.floci.services.kms.model.KmsKey;import io.github.hectorvent.floci.services.rds.model.DbInstanceScalingChanges;import io.github.hectorvent.floci.services.rds.model.DbInstanceSettings;import io.github.hectorvent.floci.services.rds.model.DbInstanceStatus;@@ -48,21 +48,21 @@ 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.DbProxyTarget;import io.github.hectorvent.floci.services.rds.model.DbProxyTargetGroup;-import io.github.hectorvent.floci.services.rds.model.PointInTimeRestoreRequest;-import io.github.hectorvent.floci.services.rds.model.RdsEvent;-import io.github.hectorvent.floci.services.rds.model.ReadReplicaRequest;import io.github.hectorvent.floci.services.rds.model.DbSnapshot;import io.github.hectorvent.floci.services.rds.model.DbSubnetGroup;+import io.github.hectorvent.floci.services.rds.model.EventSubscription;import io.github.hectorvent.floci.services.rds.model.GlobalCluster;import io.github.hectorvent.floci.services.rds.model.GlobalClusterMember;import io.github.hectorvent.floci.services.rds.model.OptionGroup;import io.github.hectorvent.floci.services.rds.model.OptionGroupOption;+import io.github.hectorvent.floci.services.rds.model.PointInTimeRestoreRequest;+import io.github.hectorvent.floci.services.rds.model.RdsEvent;+import io.github.hectorvent.floci.services.rds.model.ReadReplicaRequest;import io.github.hectorvent.floci.services.rds.proxy.RdsProxyBinding;import io.github.hectorvent.floci.services.rds.proxy.RdsProxyManager;import io.github.hectorvent.floci.services.resourcegroupstagging.ResourceGroupsTaggingService;import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.secretsmanager.model.Secret;-import io.github.hectorvent.floci.core.common.Resettable;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;diff --git a/src/main/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManager.java b/src/main/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManager.javaindex 7beb403f25..5fed84b696 100644--- a/src/main/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManager.java@@ -10,12 +10,12 @@ import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;import io.github.hectorvent.floci.core.common.docker.ContainerDetector;import io.github.hectorvent.floci.core.common.docker.ContainerExec;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager;-import io.github.hectorvent.floci.core.common.docker.ContainerLiveness;-import io.github.hectorvent.floci.core.common.docker.ContainerStorageHelper;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.ContainerInfo;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.EndpointInfo;+import io.github.hectorvent.floci.core.common.docker.ContainerLiveness;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.ContainerStorageHelper;import io.github.hectorvent.floci.services.rds.model.DatabaseEngine;import jakarta.annotation.PreDestroy;import jakarta.enterprise.context.ApplicationScoped;diff --git a/src/main/java/io/github/hectorvent/floci/services/rdsdata/RdsDataResourceResolver.java b/src/main/java/io/github/hectorvent/floci/services/rdsdata/RdsDataResourceResolver.javaindex 1b107072c1..a7dcba016a 100644--- a/src/main/java/io/github/hectorvent/floci/services/rdsdata/RdsDataResourceResolver.java+++ b/src/main/java/io/github/hectorvent/floci/services/rdsdata/RdsDataResourceResolver.java@@ -1,7 +1,7 @@package io.github.hectorvent.floci.services.rdsdata;-import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsArnUtils;+import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.rds.RdsService;import io.github.hectorvent.floci.services.rds.model.DatabaseEngine;import io.github.hectorvent.floci.services.rds.model.DbCluster;diff --git a/src/main/java/io/github/hectorvent/floci/services/redshift/model/Cluster.java b/src/main/java/io/github/hectorvent/floci/services/redshift/model/Cluster.javaindex 7182ee64c8..75b157d3d0 100644--- a/src/main/java/io/github/hectorvent/floci/services/redshift/model/Cluster.java+++ b/src/main/java/io/github/hectorvent/floci/services/redshift/model/Cluster.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.redshift.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.ArrayList;import java.util.LinkedHashMap;import java.util.List;diff --git a/src/main/java/io/github/hectorvent/floci/services/redshift/model/ClusterParameterGroup.java b/src/main/java/io/github/hectorvent/floci/services/redshift/model/ClusterParameterGroup.javaindex 4b5ada595d..01e7cb1712 100644--- a/src/main/java/io/github/hectorvent/floci/services/redshift/model/ClusterParameterGroup.java+++ b/src/main/java/io/github/hectorvent/floci/services/redshift/model/ClusterParameterGroup.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.redshift.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.ArrayList;import java.util.LinkedHashMap;import java.util.List;diff --git a/src/main/java/io/github/hectorvent/floci/services/redshift/model/Snapshot.java b/src/main/java/io/github/hectorvent/floci/services/redshift/model/Snapshot.javaindex 1e8a4bb1e4..62622d1ff8 100644--- a/src/main/java/io/github/hectorvent/floci/services/redshift/model/Snapshot.java+++ b/src/main/java/io/github/hectorvent/floci/services/redshift/model/Snapshot.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.redshift.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.time.Instant;import java.util.LinkedHashMap;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/redshift/proxy/ExtendedS3Exchange.java b/src/main/java/io/github/hectorvent/floci/services/redshift/proxy/ExtendedS3Exchange.javaindex 074d14f33c..f185bf89a6 100644--- a/src/main/java/io/github/hectorvent/floci/services/redshift/proxy/ExtendedS3Exchange.java+++ b/src/main/java/io/github/hectorvent/floci/services/redshift/proxy/ExtendedS3Exchange.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.redshift.proxy;import io.github.hectorvent.floci.services.iam.IamService;import io.github.hectorvent.floci.services.s3.S3Service;+import java.io.IOException;import java.io.OutputStream;import java.net.Socket;diff --git a/src/main/java/io/github/hectorvent/floci/services/rekognition/RekognitionJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/rekognition/RekognitionJsonHandler.javaindex ace18cffb6..7c20017fe8 100644--- a/src/main/java/io/github/hectorvent/floci/services/rekognition/RekognitionJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/rekognition/RekognitionJsonHandler.java@@ -6,6 +6,7 @@ import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;import org.jboss.logging.Logger;+import java.util.function.Predicate;/*** JSON 1.1 handler for Amazon Rekognition API operations.diff --git a/src/main/java/io/github/hectorvent/floci/services/rekognition/RekognitionService.java b/src/main/java/io/github/hectorvent/floci/services/rekognition/RekognitionService.javaindex 2a91d14ff7..107d7eb96f 100644--- a/src/main/java/io/github/hectorvent/floci/services/rekognition/RekognitionService.java+++ b/src/main/java/io/github/hectorvent/floci/services/rekognition/RekognitionService.java@@ -8,6 +8,7 @@ import io.github.hectorvent.floci.core.common.AwsGeometry;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;+import java.util.Optional;/*** Dummy response builder for Amazon Rekognition. Stateless — every action ignoresdiff --git a/src/main/java/io/github/hectorvent/floci/services/s3/S3ControlController.java b/src/main/java/io/github/hectorvent/floci/services/s3/S3ControlController.javaindex 0ba2e1d0e2..1abd4b83a6 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3/S3ControlController.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3/S3ControlController.java@@ -20,9 +20,9 @@ import jakarta.ws.rs.PathParam;import jakarta.ws.rs.Produces;import jakarta.ws.rs.QueryParam;import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import org.jboss.logging.Logger;import org.jboss.resteasy.reactive.server.ServerExceptionMapper;-import jakarta.ws.rs.core.Response;import java.net.URLDecoder;import java.nio.charset.StandardCharsets;diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/S3Controller.java b/src/main/java/io/github/hectorvent/floci/services/s3/S3Controller.javaindex 41360155a7..13fd04c37f 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3/S3Controller.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3/S3Controller.java@@ -1,7 +1,7 @@package io.github.hectorvent.floci.services.s3;-import static io.github.hectorvent.floci.services.s3.S3RequestParser.hasQueryParam;-+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.AccountResolver;import io.github.hectorvent.floci.core.common.AwsArnUtils;@@ -10,34 +10,34 @@ import io.github.hectorvent.floci.core.common.AwsNamespaces;import io.github.hectorvent.floci.core.common.AwsRegions;import io.github.hectorvent.floci.core.common.IamEnforcementFilter;import io.github.hectorvent.floci.core.common.MultipartFormParser;-import io.github.hectorvent.floci.core.common.XmlBuilder;-import io.github.hectorvent.floci.core.common.XmlParser;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.RequestContext;+import io.github.hectorvent.floci.core.common.XmlBuilder;+import io.github.hectorvent.floci.core.common.XmlParser;import io.github.hectorvent.floci.services.cloudtrail.CloudTrailService;import io.github.hectorvent.floci.services.iam.IamService;-import io.github.hectorvent.floci.services.sns.SnsQueryHandler;import io.github.hectorvent.floci.services.s3.model.Bucket;import io.github.hectorvent.floci.services.s3.model.ChecksumAlgorithm;import io.github.hectorvent.floci.services.s3.model.ChecksumType;+import io.github.hectorvent.floci.services.s3.model.CopyObjectOptions;+import io.github.hectorvent.floci.services.s3.model.CopySourceConditions;+import io.github.hectorvent.floci.services.s3.model.FilterRule;import io.github.hectorvent.floci.services.s3.model.GetObjectAttributesParts;import io.github.hectorvent.floci.services.s3.model.GetObjectAttributesResult;-import io.github.hectorvent.floci.services.s3.model.ObjectAnnotation;import io.github.hectorvent.floci.services.s3.model.LambdaNotification;import io.github.hectorvent.floci.services.s3.model.MultipartUpload;-import io.github.hectorvent.floci.services.s3.model.FilterRule;import io.github.hectorvent.floci.services.s3.model.NotificationConfiguration;+import io.github.hectorvent.floci.services.s3.model.ObjectAnnotation;import io.github.hectorvent.floci.services.s3.model.ObjectAttributeName;-import io.github.hectorvent.floci.services.s3.model.CopyObjectOptions;-import io.github.hectorvent.floci.services.s3.model.CopySourceConditions;-import io.github.hectorvent.floci.services.s3.model.QueueNotification;import io.github.hectorvent.floci.services.s3.model.ObjectLockRetention;import io.github.hectorvent.floci.services.s3.model.Part;import io.github.hectorvent.floci.services.s3.model.PutObjectOptions;+import io.github.hectorvent.floci.services.s3.model.QueueNotification;import io.github.hectorvent.floci.services.s3.model.S3Checksum;import io.github.hectorvent.floci.services.s3.model.S3Object;import io.github.hectorvent.floci.services.s3.model.TopicNotification;import io.github.hectorvent.floci.services.s3.model.WebsiteConfiguration;+import io.github.hectorvent.floci.services.sns.SnsQueryHandler;import jakarta.inject.Inject;import jakarta.ws.rs.*;import jakarta.ws.rs.core.Context;@@ -47,6 +47,12 @@ import jakarta.ws.rs.core.MultivaluedMap;import jakarta.ws.rs.core.Response;import jakarta.ws.rs.core.StreamingOutput;import jakarta.ws.rs.core.UriInfo;+import org.jboss.logging.Logger;+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;++import javax.xml.stream.XMLStreamConstants;+import javax.xml.stream.XMLStreamException;+import javax.xml.stream.XMLStreamReader;import java.io.ByteArrayInputStream;import java.io.ByteArrayOutputStream;import java.io.Closeable;@@ -78,14 +84,8 @@ import java.util.Set;import java.util.function.Function;import java.util.function.Predicate;import java.util.stream.Stream;-import javax.xml.stream.XMLStreamConstants;-import javax.xml.stream.XMLStreamException;-import javax.xml.stream.XMLStreamReader;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import org.jboss.logging.Logger;-import org.jboss.resteasy.reactive.server.ServerExceptionMapper;+import static io.github.hectorvent.floci.services.s3.S3RequestParser.hasQueryParam;/*** S3 controller handling REST-style S3 API requests.diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/S3CorsFilter.java b/src/main/java/io/github/hectorvent/floci/services/s3/S3CorsFilter.javaindex 8e80b76dab..08bf3358d7 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3/S3CorsFilter.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3/S3CorsFilter.java@@ -6,6 +6,7 @@ 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.Arrays;import java.util.List;import java.util.Optional;diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/model/S3Checksum.java b/src/main/java/io/github/hectorvent/floci/services/s3/model/S3Checksum.javaindex 355842f23d..beabd51ad3 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3/model/S3Checksum.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3/model/S3Checksum.java@@ -7,9 +7,9 @@ import java.security.NoSuchAlgorithmException;import java.util.Base64;import java.util.List;import java.util.regex.Pattern;-import java.util.zip.Checksum;import java.util.zip.CRC32;import java.util.zip.CRC32C;+import java.util.zip.Checksum;@RegisterForReflectionpublic class S3Checksum {diff --git a/src/main/java/io/github/hectorvent/floci/services/s3vectors/S3VectorsService.java b/src/main/java/io/github/hectorvent/floci/services/s3vectors/S3VectorsService.javaindex 75c712d544..7d715bd34b 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3vectors/S3VectorsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3vectors/S3VectorsService.java@@ -1,14 +1,14 @@package io.github.hectorvent.floci.services.s3vectors;+import com.fasterxml.jackson.core.type.TypeReference;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.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.s3vectors.model.VectorBucket;-import io.github.hectorvent.floci.services.s3vectors.model.VectorIndex;import io.github.hectorvent.floci.services.s3vectors.model.VectorData;-import com.fasterxml.jackson.core.type.TypeReference;+import io.github.hectorvent.floci.services.s3vectors.model.VectorIndex;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;diff --git a/src/main/java/io/github/hectorvent/floci/services/s3vectors/model/VectorBucket.java b/src/main/java/io/github/hectorvent/floci/services/s3vectors/model/VectorBucket.javaindex b0f47997d1..6fd3e3a9f6 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3vectors/model/VectorBucket.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3vectors/model/VectorBucket.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.s3vectors.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.Map;import java.util.concurrent.ConcurrentHashMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/s3vectors/model/VectorData.java b/src/main/java/io/github/hectorvent/floci/services/s3vectors/model/VectorData.javaindex 7f47c6cbce..6f0d29098d 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3vectors/model/VectorData.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3vectors/model/VectorData.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.s3vectors.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.List;import java.util.Map;diff --git a/src/main/java/io/github/hectorvent/floci/services/s3vectors/model/VectorIndex.java b/src/main/java/io/github/hectorvent/floci/services/s3vectors/model/VectorIndex.javaindex fbae01ab02..2742d0f0af 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3vectors/model/VectorIndex.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3vectors/model/VectorIndex.java@@ -1,6 +1,7 @@package io.github.hectorvent.floci.services.s3vectors.model;import io.quarkus.runtime.annotations.RegisterForReflection;+import java.util.Map;import java.util.concurrent.ConcurrentHashMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/sagemaker/SageMakerEndpointManager.java b/src/main/java/io/github/hectorvent/floci/services/sagemaker/SageMakerEndpointManager.javaindex bc53f72521..6b57d35db6 100644--- a/src/main/java/io/github/hectorvent/floci/services/sagemaker/SageMakerEndpointManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/sagemaker/SageMakerEndpointManager.java@@ -27,10 +27,10 @@ import java.io.ByteArrayInputStream;import java.io.ByteArrayOutputStream;import java.net.ConnectException;import java.net.URI;-import java.net.http.HttpTimeoutException;import java.net.http.HttpClient;import java.net.http.HttpRequest;import java.net.http.HttpResponse;+import java.net.http.HttpTimeoutException;import java.nio.file.Path;import java.time.Duration;import java.util.ArrayList;diff --git a/src/main/java/io/github/hectorvent/floci/services/sagemaker/SageMakerTrainingRunner.java b/src/main/java/io/github/hectorvent/floci/services/sagemaker/SageMakerTrainingRunner.javaindex 3eea09ffec..be79d78fed 100644--- a/src/main/java/io/github/hectorvent/floci/services/sagemaker/SageMakerTrainingRunner.java+++ b/src/main/java/io/github/hectorvent/floci/services/sagemaker/SageMakerTrainingRunner.java@@ -1,10 +1,10 @@package io.github.hectorvent.floci.services.sagemaker;+import com.fasterxml.jackson.databind.ObjectMapper;import com.github.dockerjava.api.command.InspectContainerResponse;import com.github.dockerjava.api.exception.NotFoundException;import com.github.dockerjava.api.model.Frame;import com.github.dockerjava.core.command.LogContainerResultCallback;-import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.ContainerTeardown;import io.github.hectorvent.floci.core.common.Resettable;diff --git a/src/main/java/io/github/hectorvent/floci/services/scheduler/ScheduleInvoker.java b/src/main/java/io/github/hectorvent/floci/services/scheduler/ScheduleInvoker.javaindex d83c27d9e2..6f22c78347 100644--- a/src/main/java/io/github/hectorvent/floci/services/scheduler/ScheduleInvoker.java+++ b/src/main/java/io/github/hectorvent/floci/services/scheduler/ScheduleInvoker.java@@ -12,8 +12,8 @@ import io.github.hectorvent.floci.services.eventbridge.EventBridgeService;import io.github.hectorvent.floci.services.lambda.LambdaService;import io.github.hectorvent.floci.services.lambda.model.InvocationType;import io.github.hectorvent.floci.services.scheduler.model.AwsVpcConfiguration;-import io.github.hectorvent.floci.services.scheduler.model.EventBridgeParameters;import io.github.hectorvent.floci.services.scheduler.model.EcsParameters;+import io.github.hectorvent.floci.services.scheduler.model.EventBridgeParameters;import io.github.hectorvent.floci.services.scheduler.model.Schedule;import io.github.hectorvent.floci.services.scheduler.model.Target;import io.github.hectorvent.floci.services.sns.SnsMessageAttributes;diff --git a/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerController.java b/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerController.javaindex d3624d0dac..67a705fc39 100644--- a/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerController.java+++ b/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerController.java@@ -1,5 +1,10 @@package io.github.hectorvent.floci.services.scheduler;+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.RegionResolver;import io.github.hectorvent.floci.services.scheduler.model.AwsVpcConfiguration;@@ -14,11 +19,6 @@ import io.github.hectorvent.floci.services.scheduler.model.ScheduleGroup;import io.github.hectorvent.floci.services.scheduler.model.ScheduleRequest;import io.github.hectorvent.floci.services.scheduler.model.SqsParameters;import io.github.hectorvent.floci.services.scheduler.model.Target;-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 jakarta.inject.Inject;import jakarta.ws.rs.Consumes;import jakarta.ws.rs.DELETE;@@ -33,6 +33,7 @@ import jakarta.ws.rs.core.Context;import jakarta.ws.rs.core.HttpHeaders;import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.Response;+import java.time.Instant;import java.util.HashMap;import java.util.List;diff --git a/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerService.java b/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerService.javaindex b6a6b9dc7f..055dfd2272 100644--- a/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerService.java+++ b/src/main/java/io/github/hectorvent/floci/services/scheduler/SchedulerService.java@@ -1,5 +1,11 @@package io.github.hectorvent.floci.services.scheduler;+import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.core.type.TypeReference;+import com.fasterxml.jackson.databind.DeserializationFeature;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.ObjectReader;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -9,12 +15,6 @@ import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.scheduler.model.Schedule;import io.github.hectorvent.floci.services.scheduler.model.ScheduleGroup;import io.github.hectorvent.floci.services.scheduler.model.ScheduleRequest;-import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.core.type.TypeReference;-import com.fasterxml.jackson.databind.DeserializationFeature;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.ObjectReader;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;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 3d3af53a37..62c1c27d11 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@@ -11,8 +11,8 @@ import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;import org.jboss.logging.Logger;-import java.util.UUID;import java.util.List;+import java.util.UUID;@ApplicationScopedpublic class ServiceCatalogJsonHandler {diff --git a/src/main/java/io/github/hectorvent/floci/services/servicecatalog/ServiceCatalogService.java b/src/main/java/io/github/hectorvent/floci/services/servicecatalog/ServiceCatalogService.javaindex 9d0b4b0fc1..63ebb5617a 100644--- a/src/main/java/io/github/hectorvent/floci/services/servicecatalog/ServiceCatalogService.java+++ b/src/main/java/io/github/hectorvent/floci/services/servicecatalog/ServiceCatalogService.java@@ -18,8 +18,8 @@ import jakarta.inject.Inject;import java.time.Instant;import java.util.List;import java.util.Map;-import java.util.UUID;import java.util.Optional;+import java.util.UUID;@ApplicationScopedpublic class ServiceCatalogService {diff --git a/src/main/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasService.java b/src/main/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasService.javaindex 1384205809..4eb4bfac57 100644--- a/src/main/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasService.java+++ b/src/main/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasService.java@@ -9,13 +9,13 @@ import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import java.nio.charset.StandardCharsets;+import java.time.Instant;import java.util.ArrayList;import java.util.Base64;import java.util.List;import java.util.Map;import java.util.regex.Pattern;import java.util.zip.CRC32;-import java.time.Instant;/*** Service Quotas emulation backed by a generated in-memory catalog.diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesConfigurationSetService.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesConfigurationSetService.javaindex 31c10e3b1f..4b347566ca 100644--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesConfigurationSetService.java+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesConfigurationSetService.java@@ -13,9 +13,9 @@ import io.github.hectorvent.floci.services.ses.model.DeliveryOptions;import io.github.hectorvent.floci.services.ses.model.EventBridgeDestination;import io.github.hectorvent.floci.services.ses.model.EventDestination;import io.github.hectorvent.floci.services.ses.model.MessageSecurityOptions;-import io.github.hectorvent.floci.services.ses.model.TrackingOptions;import io.github.hectorvent.floci.services.ses.model.SuppressionOptions;import io.github.hectorvent.floci.services.ses.model.Tag;+import io.github.hectorvent.floci.services.ses.model.TrackingOptions;import io.github.hectorvent.floci.services.ses.model.VdmOptions;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesContactService.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesContactService.javaindex 295a2ef145..442734714c 100644--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesContactService.java+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesContactService.java@@ -7,13 +7,13 @@ import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.ses.model.Contact;import io.github.hectorvent.floci.services.ses.model.ContactList;+import io.github.hectorvent.floci.services.ses.model.ListManagementOptions;import io.github.hectorvent.floci.services.ses.model.Tag;import io.github.hectorvent.floci.services.ses.model.Topic;import io.github.hectorvent.floci.services.ses.model.TopicPreference;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;-import io.github.hectorvent.floci.services.ses.model.ListManagementOptions;import java.time.Clock;import java.time.Instant;@@ -25,8 +25,8 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.Objects;-import java.util.function.UnaryOperator;import java.util.Set;+import java.util.function.UnaryOperator;import java.util.regex.Pattern;/**diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesCvetController.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesCvetController.javaindex 7802fdd37c..461b042d41 100644--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesCvetController.java+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesCvetController.java@@ -25,7 +25,6 @@ import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.Response;import org.jboss.logging.Logger;-import static io.github.hectorvent.floci.services.ses.SesV2Json.parseTagsArray;import static io.github.hectorvent.floci.services.ses.SesV2Json.remapV1Exception;import static io.github.hectorvent.floci.services.ses.SesV2Json.requireJsonObject;diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.javaindex 8ca5b44784..cdd59b17f3 100644--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java@@ -1,5 +1,7 @@package io.github.hectorvent.floci.services.ses;+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.core.common.AwsNamespaces;import io.github.hectorvent.floci.core.common.AwsQueryResponse;@@ -26,8 +28,6 @@ import io.github.hectorvent.floci.services.ses.model.ReceiptRuleSet;import io.github.hectorvent.floci.services.ses.model.SendBulkEmailRequest;import io.github.hectorvent.floci.services.ses.model.SendEmailRequest;import io.github.hectorvent.floci.services.ses.model.SnsDestination;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.MultivaluedMap;diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/imports/RecordReaderFactory.java b/src/main/java/io/github/hectorvent/floci/services/ses/imports/RecordReaderFactory.javaindex c5a6ba2f22..fdce538e27 100644--- a/src/main/java/io/github/hectorvent/floci/services/ses/imports/RecordReaderFactory.java+++ b/src/main/java/io/github/hectorvent/floci/services/ses/imports/RecordReaderFactory.java@@ -3,7 +3,6 @@ package io.github.hectorvent.floci.services.ses.imports;import com.fasterxml.jackson.databind.DeserializationFeature;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.ObjectReader;-import io.github.hectorvent.floci.services.ses.model.ImportJob;import java.io.BufferedReader;diff --git a/src/main/java/io/github/hectorvent/floci/services/sns/SnsInspectionController.java b/src/main/java/io/github/hectorvent/floci/services/sns/SnsInspectionController.javaindex 2c9c88ab88..50f5b4b56f 100644--- a/src/main/java/io/github/hectorvent/floci/services/sns/SnsInspectionController.java+++ b/src/main/java/io/github/hectorvent/floci/services/sns/SnsInspectionController.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.sns;-import io.github.hectorvent.floci.services.sns.model.SentSms;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.sns.model.SentSms;import jakarta.inject.Inject;import jakarta.ws.rs.DELETE;import jakarta.ws.rs.GET;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 5cf5f61baf..cdf06ff6a4 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@@ -1,5 +1,9 @@package io.github.hectorvent.floci.services.sns;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsErrorResponse;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.sns.model.PlatformApplication;@@ -7,10 +11,6 @@ import io.github.hectorvent.floci.services.sns.model.PlatformEndpoint;import io.github.hectorvent.floci.services.sns.model.Subscription;import io.github.hectorvent.floci.services.sns.model.Topic;import io.github.hectorvent.floci.services.sqs.model.MessageAttributeValue;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ArrayNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;diff --git a/src/main/java/io/github/hectorvent/floci/services/sqs/ReceiptHandle.java b/src/main/java/io/github/hectorvent/floci/services/sqs/ReceiptHandle.javaindex 577efb4561..28a09ea45f 100644--- a/src/main/java/io/github/hectorvent/floci/services/sqs/ReceiptHandle.java+++ b/src/main/java/io/github/hectorvent/floci/services/sqs/ReceiptHandle.java@@ -1,11 +1,11 @@package io.github.hectorvent.floci.services.sqs;+import javax.crypto.Mac;+import javax.crypto.spec.SecretKeySpec;import java.nio.charset.StandardCharsets;import java.security.GeneralSecurityException;import java.util.HexFormat;import java.util.UUID;-import javax.crypto.Mac;-import javax.crypto.spec.SecretKeySpec;/*** Floci's receipt handle. The fields are readable, and the signature rejects a handle that wasdiff --git a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsInspectionController.java b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsInspectionController.javaindex 3a4e269ac2..36badecc5b 100644--- a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsInspectionController.java+++ b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsInspectionController.java@@ -3,7 +3,6 @@ package io.github.hectorvent.floci.services.sqs;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.services.sqs.model.Message;import io.github.hectorvent.floci.services.sqs.model.MessageAttributeValue;diff --git a/src/main/java/io/github/hectorvent/floci/services/ssm/Ec2MessagesJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/ssm/Ec2MessagesJsonHandler.javaindex ccbef5cdd4..00b31f8272 100644--- a/src/main/java/io/github/hectorvent/floci/services/ssm/Ec2MessagesJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/ssm/Ec2MessagesJsonHandler.java@@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ArrayNode;import com.fasterxml.jackson.databind.node.ObjectNode;-import io.github.hectorvent.floci.core.common.AwsErrorResponse;import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.core.common.AwsErrorResponse;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;diff --git a/src/main/java/io/github/hectorvent/floci/services/ssm/SsmJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/ssm/SsmJsonHandler.javaindex 894ecff71f..7e72c6a9b6 100644--- a/src/main/java/io/github/hectorvent/floci/services/ssm/SsmJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/ssm/SsmJsonHandler.java@@ -1,5 +1,11 @@package io.github.hectorvent.floci.services.ssm;+import com.fasterxml.jackson.annotation.JsonProperty;+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.AwsErrorResponse;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.IamEnforcementFilter;@@ -15,12 +21,6 @@ import io.github.hectorvent.floci.services.ssm.model.PatchBaselineIdentity;import io.github.hectorvent.floci.services.ssm.model.ServiceSetting;import io.github.hectorvent.floci.services.ssm.model.SsmAssociation;import io.github.hectorvent.floci.services.ssm.model.SsmDocument;-import com.fasterxml.jackson.annotation.JsonProperty;-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.quarkus.runtime.annotations.RegisterForReflection;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;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 2c90d2c7e6..b8ae40c256 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@@ -7,12 +7,12 @@ 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.ApplicationAssignment;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;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 e39ef0b9fd..7864033df2 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@@ -12,30 +12,30 @@ import io.github.hectorvent.floci.core.common.Resettable;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 io.github.hectorvent.floci.services.ssoadmin.model.Assignment;-import io.github.hectorvent.floci.services.ssoadmin.model.AssignmentOperation;-import io.github.hectorvent.floci.services.ssoadmin.model.AssignmentDeletionOperation;+import io.github.hectorvent.floci.services.identitystore.IdentityStoreService;+import io.github.hectorvent.floci.services.organizations.OrganizationsService;+import io.github.hectorvent.floci.services.ssoadmin.model.AccessControlAttribute;import io.github.hectorvent.floci.services.ssoadmin.model.ApplicationAccessScope;import io.github.hectorvent.floci.services.ssoadmin.model.ApplicationAssignment;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.ApplicationPortalOptions;import io.github.hectorvent.floci.services.ssoadmin.model.ApplicationSignInOptions;-import io.github.hectorvent.floci.services.ssoadmin.model.AccessControlAttribute;+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.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.PermissionsBoundary;import io.github.hectorvent.floci.services.ssoadmin.model.PermissionSetProvisioning;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 io.github.hectorvent.floci.services.identitystore.IdentityStoreService;-import io.github.hectorvent.floci.services.organizations.OrganizationsService;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;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 08bf210e75..b8b9f6608d 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@@ -5,15 +5,15 @@ 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;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RequestContext;import io.github.hectorvent.floci.services.ssoadmin.SsoAdminService;import io.github.hectorvent.floci.services.ssoadmin.model.ApplicationAccessScope;import io.github.hectorvent.floci.services.ssoadmin.model.ApplicationGrant;+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;import io.github.hectorvent.floci.services.ssooidc.model.TokenSession;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;@@ -22,8 +22,8 @@ import jakarta.ws.rs.GET;import jakarta.ws.rs.HeaderParam;import jakarta.ws.rs.POST;import jakarta.ws.rs.Path;-import jakarta.ws.rs.QueryParam;import jakarta.ws.rs.Produces;+import jakarta.ws.rs.QueryParam;import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.Response;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 b01f83f93b..c700707bba 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@@ -5,14 +5,14 @@ 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;+import io.github.hectorvent.floci.services.ssoportal.model.PortalRoleInfo;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.GET;import jakarta.ws.rs.HeaderParam;-import jakarta.ws.rs.Path;import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;import jakarta.ws.rs.Produces;import jakarta.ws.rs.QueryParam;import jakarta.ws.rs.core.MediaType;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 2a08ed85bd..da85e3243f 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@@ -14,8 +14,8 @@ 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.PortalRoleInfo;import io.github.hectorvent.floci.services.ssoportal.model.PortalRoleCredentials;+import io.github.hectorvent.floci.services.ssoportal.model.PortalRoleInfo;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;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 c49c4c2e5b..f90c61a4db 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@@ -1,9 +1,23 @@package io.github.hectorvent.floci.services.stepfunctions;+import com.fasterxml.jackson.annotation.JsonProperty;+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.MissingNode;+import com.fasterxml.jackson.databind.node.NullNode;+import com.fasterxml.jackson.databind.node.ObjectNode;+import com.jayway.jsonpath.Configuration;+import com.jayway.jsonpath.InvalidPathException;+import com.jayway.jsonpath.JsonPath;+import com.jayway.jsonpath.PathNotFoundException;+import com.jayway.jsonpath.spi.json.JacksonJsonNodeJsonProvider;+import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;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.AwsErrorResponse;+import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsPartition;import io.github.hectorvent.floci.core.common.AwsPartitions;import io.github.hectorvent.floci.core.common.CsvParser;@@ -18,21 +32,16 @@ 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;+import io.github.hectorvent.floci.services.ecs.model.Container;import io.github.hectorvent.floci.services.ecs.model.ContainerDefinition;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.LaunchType;import io.github.hectorvent.floci.services.ecs.model.NetworkConfiguration;import io.github.hectorvent.floci.services.ecs.model.TaskDefinition;-import io.github.hectorvent.floci.services.ecs.model.LaunchType;-import io.github.hectorvent.floci.services.s3.S3Service;-import io.github.hectorvent.floci.services.scheduler.SchedulerController;-import io.github.hectorvent.floci.services.scheduler.SchedulerService;-import io.github.hectorvent.floci.services.scheduler.model.Schedule;-import io.github.hectorvent.floci.services.scheduler.model.ScheduleRequest;+import io.github.hectorvent.floci.services.eventbridge.EventBridgeHandler;import io.github.hectorvent.floci.services.lambda.LambdaArnUtils;import io.github.hectorvent.floci.services.lambda.LambdaExecutorService;import io.github.hectorvent.floci.services.lambda.LambdaFunctionStore;@@ -41,7 +50,12 @@ import io.github.hectorvent.floci.services.lambda.model.InvocationType;import io.github.hectorvent.floci.services.lambda.model.InvokeResult;import io.github.hectorvent.floci.services.lambda.model.LambdaFunction;import io.github.hectorvent.floci.services.rdsdata.RdsDataService;+import io.github.hectorvent.floci.services.s3.S3Service;import io.github.hectorvent.floci.services.s3.model.S3Object;+import io.github.hectorvent.floci.services.scheduler.SchedulerController;+import io.github.hectorvent.floci.services.scheduler.SchedulerService;+import io.github.hectorvent.floci.services.scheduler.model.Schedule;+import io.github.hectorvent.floci.services.scheduler.model.ScheduleRequest;import io.github.hectorvent.floci.services.sns.SnsJsonHandler;import io.github.hectorvent.floci.services.sqs.SqsJsonHandler;import io.github.hectorvent.floci.services.stepfunctions.model.Execution;@@ -50,26 +64,11 @@ import io.github.hectorvent.floci.services.stepfunctions.model.MapRun;import io.github.hectorvent.floci.services.stepfunctions.model.MockedResponseStep;import io.github.hectorvent.floci.services.stepfunctions.model.MockedTestCase;import io.github.hectorvent.floci.services.stepfunctions.model.StateMachine;-import com.fasterxml.jackson.annotation.JsonProperty;-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.MissingNode;-import com.fasterxml.jackson.databind.node.NullNode;-import com.fasterxml.jackson.databind.node.ObjectNode;-import com.jayway.jsonpath.Configuration;-import com.jayway.jsonpath.InvalidPathException;-import com.jayway.jsonpath.JsonPath;-import com.jayway.jsonpath.PathNotFoundException;-import com.jayway.jsonpath.spi.json.JacksonJsonNodeJsonProvider;-import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;-import io.vertx.core.http.HttpMethod;import io.vertx.core.impl.NoStackTraceTimeoutException;import io.vertx.mutiny.core.MultiMap;-import io.vertx.mutiny.core.buffer.Buffer;import io.vertx.mutiny.core.Vertx;+import io.vertx.mutiny.core.buffer.Buffer;import io.vertx.mutiny.ext.web.client.HttpRequest;import io.vertx.mutiny.ext.web.client.HttpResponse;import io.vertx.mutiny.ext.web.client.WebClient;diff --git a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/JsonataEvaluator.java b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/JsonataEvaluator.javaindex b4f59d9ae7..1a87d97f31 100644--- a/src/main/java/io/github/hectorvent/floci/services/stepfunctions/JsonataEvaluator.java+++ b/src/main/java/io/github/hectorvent/floci/services/stepfunctions/JsonataEvaluator.java@@ -35,9 +35,8 @@ import java.util.Set;import java.util.UUID;import java.util.concurrent.ThreadLocalRandom;-import static io.github.hectorvent.floci.services.stepfunctions.AslExecutor.FailStateException;-import static com.dashjoin.jsonata.Jsonata.jsonata;+import static io.github.hectorvent.floci.services.stepfunctions.AslExecutor.FailStateException;/*** Evaluates JSONata expressions for Step Functions.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 7a813e08d5..5c325082ae 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@@ -1,12 +1,12 @@package io.github.hectorvent.floci.services.stepfunctions;-import io.github.hectorvent.floci.core.common.AwsErrorResponse;-import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.PaginatedResult;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ArrayNode;import com.fasterxml.jackson.databind.node.ObjectNode;+import io.github.hectorvent.floci.core.common.AwsErrorResponse;+import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.common.PaginatedResult;import io.github.hectorvent.floci.services.stepfunctions.model.Activity;import io.github.hectorvent.floci.services.stepfunctions.model.ActivityTask;import io.github.hectorvent.floci.services.stepfunctions.model.Execution;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 b02f72565d..8afddf188f 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,8 @@package io.github.hectorvent.floci.services.stepfunctions;+import com.fasterxml.jackson.core.type.TypeReference;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.core.common.AwsArnUtils;import io.github.hectorvent.floci.core.common.AwsException;@@ -7,15 +10,13 @@ import io.github.hectorvent.floci.core.common.AwsRegions;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 io.github.hectorvent.floci.core.common.Resettable;import io.github.hectorvent.floci.core.resource.ExplorerResource;import io.github.hectorvent.floci.core.resource.ResourceProvider;import io.github.hectorvent.floci.core.resource.SupportedResourceType;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 com.fasterxml.jackson.core.type.TypeReference;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.services.stepfunctions.model.Activity;import io.github.hectorvent.floci.services.stepfunctions.model.ActivityTask;import io.github.hectorvent.floci.services.stepfunctions.model.Execution;@@ -26,7 +27,6 @@ import io.github.hectorvent.floci.services.stepfunctions.model.RoutingConfiguratimport 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 io.github.hectorvent.floci.core.common.Resettable;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import org.jboss.logging.Logger;@@ -42,9 +42,9 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.LinkedBlockingQueue;import java.util.concurrent.ThreadLocalRandom;import java.util.concurrent.TimeUnit;+import java.util.function.IntConsumer;import java.util.regex.Matcher;import java.util.regex.Pattern;-import java.util.function.IntConsumer;@ApplicationScopedpublic class StepFunctionsService implements Resettable, ResourceProvider {diff --git a/src/main/java/io/github/hectorvent/floci/services/swf/SwfJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/swf/SwfJsonHandler.javaindex 0e1d2c7db9..4036f94f77 100644--- a/src/main/java/io/github/hectorvent/floci/services/swf/SwfJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/swf/SwfJsonHandler.java@@ -22,9 +22,9 @@ import jakarta.ws.rs.core.Response;import java.util.ArrayList;import java.util.LinkedHashMap;import java.util.List;-import java.util.function.Function;import java.util.Map;import java.util.Optional;+import java.util.function.Function;/*** Translates the SWF JSON 1.0 wire protocol to and from {@link SwfService}.diff --git a/src/main/java/io/github/hectorvent/floci/services/textract/TextractService.java b/src/main/java/io/github/hectorvent/floci/services/textract/TextractService.javaindex 0826873f52..1144d392a6 100644--- a/src/main/java/io/github/hectorvent/floci/services/textract/TextractService.java+++ b/src/main/java/io/github/hectorvent/floci/services/textract/TextractService.java@@ -10,6 +10,7 @@ import io.github.hectorvent.floci.core.common.Resettable;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;+import java.time.Clock;import java.time.Duration;import java.time.Instant;diff --git a/src/main/java/io/github/hectorvent/floci/services/transcribe/TranscribeService.java b/src/main/java/io/github/hectorvent/floci/services/transcribe/TranscribeService.javaindex 44dda7484a..215f321729 100644--- a/src/main/java/io/github/hectorvent/floci/services/transcribe/TranscribeService.java+++ b/src/main/java/io/github/hectorvent/floci/services/transcribe/TranscribeService.java@@ -3,12 +3,12 @@ package io.github.hectorvent.floci.services.transcribe;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.common.Resettable;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.transcribe.model.TranscriptionJob;import io.github.hectorvent.floci.services.transcribe.model.TranscriptionJobSummary;import io.github.hectorvent.floci.services.transcribe.model.VocabularyInfo;-import io.github.hectorvent.floci.core.common.Resettable;import jakarta.annotation.PostConstruct;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;diff --git a/src/main/java/io/github/hectorvent/floci/services/translate/TranslateService.java b/src/main/java/io/github/hectorvent/floci/services/translate/TranslateService.javaindex 05b30a8430..bee55db2ec 100644--- a/src/main/java/io/github/hectorvent/floci/services/translate/TranslateService.java+++ b/src/main/java/io/github/hectorvent/floci/services/translate/TranslateService.java@@ -8,6 +8,7 @@ import io.github.hectorvent.floci.core.common.AwsException;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;+import java.nio.charset.StandardCharsets;import java.util.Base64;import java.util.Collections;diff --git a/src/test/java/io/github/hectorvent/floci/config/FlociCertificateAuthorityTest.java b/src/test/java/io/github/hectorvent/floci/config/FlociCertificateAuthorityTest.javaindex 2b95475e2f..68266910b9 100644--- a/src/test/java/io/github/hectorvent/floci/config/FlociCertificateAuthorityTest.java+++ b/src/test/java/io/github/hectorvent/floci/config/FlociCertificateAuthorityTest.java@@ -16,6 +16,7 @@ import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;+import javax.security.auth.x500.X500Principal;import java.io.StringWriter;import java.math.BigInteger;import java.nio.file.Files;@@ -30,7 +31,6 @@ import java.time.temporal.ChronoUnit;import java.util.Date;import java.util.List;import java.util.Set;-import javax.security.auth.x500.X500Principal;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;diff --git a/src/test/java/io/github/hectorvent/floci/config/TlsConfigSourceCertificatePathTest.java b/src/test/java/io/github/hectorvent/floci/config/TlsConfigSourceCertificatePathTest.javaindex 845677165d..e16f33eda3 100644--- a/src/test/java/io/github/hectorvent/floci/config/TlsConfigSourceCertificatePathTest.java+++ b/src/test/java/io/github/hectorvent/floci/config/TlsConfigSourceCertificatePathTest.java@@ -13,8 +13,8 @@ import java.util.List;import java.util.Map;import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertNotEquals;+import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertTrue;/**diff --git a/src/test/java/io/github/hectorvent/floci/config/TlsProxyServerReservedPortTest.java b/src/test/java/io/github/hectorvent/floci/config/TlsProxyServerReservedPortTest.javaindex 16fc29a1ff..4bbd208b47 100644--- a/src/test/java/io/github/hectorvent/floci/config/TlsProxyServerReservedPortTest.java+++ b/src/test/java/io/github/hectorvent/floci/config/TlsProxyServerReservedPortTest.java@@ -5,9 +5,10 @@ import io.vertx.core.Promise;import io.vertx.core.Vertx;import io.vertx.core.net.NetClient;import io.vertx.core.net.NetServer;+import org.junit.jupiter.api.Test;+import java.util.ArrayList;import java.util.List;-import org.junit.jupiter.api.Test;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertThrows;diff --git a/src/test/java/io/github/hectorvent/floci/core/common/AwsArnUtilsTest.java b/src/test/java/io/github/hectorvent/floci/core/common/AwsArnUtilsTest.javaindex 018f9b7269..deedf24a3b 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/AwsArnUtilsTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/AwsArnUtilsTest.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.core.common;-import org.junit.jupiter.api.Test;-import org.junit.jupiter.params.ParameterizedTest;import io.github.hectorvent.floci.testing.PartitionMatrix;import io.github.hectorvent.floci.testing.PartitionMatrix.PartitionCase;+import org.junit.jupiter.api.Test;+import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.CsvSource;import org.junit.jupiter.params.provider.MethodSource;import org.junit.jupiter.params.provider.ValueSource;diff --git a/src/test/java/io/github/hectorvent/floci/core/common/AwsJsonCborIncomingRequestIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/core/common/AwsJsonCborIncomingRequestIntegrationTest.javaindex 82e67dbde4..7952609d67 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/AwsJsonCborIncomingRequestIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/AwsJsonCborIncomingRequestIntegrationTest.java@@ -6,15 +6,14 @@ import com.fasterxml.jackson.databind.node.ArrayNode;import com.fasterxml.jackson.databind.node.ObjectNode;import io.quarkus.test.junit.QuarkusTest;import jakarta.inject.Inject;+import org.jboss.resteasy.reactive.server.jaxrs.HttpHeadersImpl;+import org.junit.jupiter.api.Assertions;+import org.junit.jupiter.api.Test;import java.io.ByteArrayOutputStream;import java.util.Map;import java.util.zip.GZIPOutputStream;-import org.jboss.resteasy.reactive.server.jaxrs.HttpHeadersImpl;-import org.junit.jupiter.api.Assertions;-import org.junit.jupiter.api.Test;-/*** Integration test for {@link AwsJsonCborController#bodyToJson(HttpHeaders, byte[])}.diff --git a/src/test/java/io/github/hectorvent/floci/core/common/AwsRequestIdFilterIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/core/common/AwsRequestIdFilterIntegrationTest.javaindex 73407d8800..a6adf398e0 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/AwsRequestIdFilterIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/AwsRequestIdFilterIntegrationTest.java@@ -1,14 +1,13 @@package io.github.hectorvent.floci.core.common;+import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;-import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.notNullValue;-import org.junit.jupiter.api.BeforeAll;-/*** Verifies that {@link AwsRequestIdFilter} injects {@code x-amz-request-id} and* {@code x-amzn-RequestId} headers on every response, across all three AWS wirediff --git a/src/test/java/io/github/hectorvent/floci/core/common/CidrCanonicalizerTest.java b/src/test/java/io/github/hectorvent/floci/core/common/CidrCanonicalizerTest.javaindex dd0c785456..5da5d5a54c 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/CidrCanonicalizerTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/CidrCanonicalizerTest.java@@ -1,16 +1,17 @@package io.github.hectorvent.floci.core.common;-import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertSame;-import static org.junit.jupiter.api.Assertions.assertTrue;--import java.util.Optional;import org.junit.jupiter.api.Test;import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.CsvSource;import org.junit.jupiter.params.provider.ValueSource;+import java.util.Optional;++import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertSame;+import static org.junit.jupiter.api.Assertions.assertTrue;+class CidrCanonicalizerTest {// -----------------------------------------------------------------diff --git a/src/test/java/io/github/hectorvent/floci/core/common/GlobalCorsFilterAliasIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/core/common/GlobalCorsFilterAliasIntegrationTest.javaindex abce9b323e..4a13e97b0e 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/GlobalCorsFilterAliasIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/GlobalCorsFilterAliasIntegrationTest.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.core.common;+import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.QuarkusTestProfile;import io.quarkus.test.junit.TestProfile;-import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/core/common/GlobalCorsFilterIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/core/common/GlobalCorsFilterIntegrationTest.javaindex c4c7c48d19..64404a6c9b 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/GlobalCorsFilterIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/GlobalCorsFilterIntegrationTest.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.core.common;+import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.QuarkusTestProfile;import io.quarkus.test.junit.TestProfile;-import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/core/common/PemTest.java b/src/test/java/io/github/hectorvent/floci/core/common/PemTest.javaindex 5d0db9418c..e54983c8f7 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/PemTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/PemTest.java@@ -5,7 +5,6 @@ import io.github.hectorvent.floci.services.acm.model.KeyAlgorithm;import org.junit.jupiter.api.Test;import java.security.PrivateKey;-import java.security.cert.X509Certificate;import java.util.List;diff --git a/src/test/java/io/github/hectorvent/floci/core/common/RegionResolverTest.java b/src/test/java/io/github/hectorvent/floci/core/common/RegionResolverTest.javaindex a8cfaf6467..6423efb761 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/RegionResolverTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/RegionResolverTest.java@@ -1,7 +1,7 @@package io.github.hectorvent.floci.core.common;-import jakarta.ws.rs.core.HttpHeaders;import jakarta.ws.rs.core.Cookie;+import jakarta.ws.rs.core.HttpHeaders;import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.MultivaluedHashMap;import jakarta.ws.rs.core.MultivaluedMap;diff --git a/src/test/java/io/github/hectorvent/floci/core/common/ServiceEnablementIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/core/common/ServiceEnablementIntegrationTest.javaindex 19e5df4aa8..88165ed956 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/ServiceEnablementIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/ServiceEnablementIntegrationTest.java@@ -5,16 +5,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.dataformat.cbor.CBORFactory;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;-import io.quarkus.test.junit.TestProfile;import io.quarkus.test.junit.QuarkusTestProfile;+import io.quarkus.test.junit.TestProfile;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;import java.util.Map;import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.equalTo;import static org.junit.jupiter.api.Assertions.assertEquals;@QuarkusTestdiff --git a/src/test/java/io/github/hectorvent/floci/core/common/WebIdentityTokenVerifierTest.java b/src/test/java/io/github/hectorvent/floci/core/common/WebIdentityTokenVerifierTest.javaindex d0a8eabe0d..5b2268fec0 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/WebIdentityTokenVerifierTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/WebIdentityTokenVerifierTest.java@@ -1,12 +1,12 @@package io.github.hectorvent.floci.core.common;+import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.ObjectMapper;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.eks.EksOidcService;-import com.fasterxml.jackson.core.type.TypeReference;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;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 1c9c1fc5d4..b4c626ecc3 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@@ -5,7 +5,6 @@ import org.junit.jupiter.api.Test;import javax.xml.stream.XMLStreamConstants;import javax.xml.stream.XMLStreamException;import javax.xml.stream.XMLStreamReader;-import java.util.List;import java.util.Map;diff --git a/src/test/java/io/github/hectorvent/floci/core/common/dns/ResolverRuleDnsPacketTest.java b/src/test/java/io/github/hectorvent/floci/core/common/dns/ResolverRuleDnsPacketTest.javaindex 6aecd64afb..7d1f1bffaa 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/dns/ResolverRuleDnsPacketTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/dns/ResolverRuleDnsPacketTest.java@@ -1,10 +1,11 @@package io.github.hectorvent.floci.core.common.dns;+// Vert.x's DatagramSocket is the one used most here; the JDK's is qualified inline where the+// test needs a plain blocking socket to stand in for the rule's target resolver.+import io.quarkus.test.junit.QuarkusTest;import io.vertx.core.Vertx;import io.vertx.core.buffer.Buffer;-// Vert.x's DatagramSocket is the one used most here; the JDK's is qualified inline where the-// test needs a plain blocking socket to stand in for the rule's target resolver.import io.vertx.core.datagram.DatagramSocket;import io.vertx.core.datagram.DatagramSocketOptions;import jakarta.inject.Inject;diff --git a/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerLifecycleManagerImageLabelsTest.java b/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerLifecycleManagerImageLabelsTest.javaindex db9d655ffc..1c6e2a65cd 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerLifecycleManagerImageLabelsTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerLifecycleManagerImageLabelsTest.java@@ -1,8 +1,5 @@package io.github.hectorvent.floci.core.common.docker;-import java.util.Map;-import java.util.Optional;-import com.github.dockerjava.api.DockerClient;import com.github.dockerjava.api.command.InspectImageCmd;import com.github.dockerjava.api.command.InspectImageResponse;@@ -17,6 +14,9 @@ import org.mockito.junit.jupiter.MockitoExtension;import org.mockito.junit.jupiter.MockitoSettings;import org.mockito.quality.Strictness;+import java.util.Map;+import java.util.Optional;+import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.Mockito.mock;diff --git a/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerPlatformDockerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerPlatformDockerIntegrationTest.javaindex ea0e9fa7be..fb8338191f 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerPlatformDockerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/docker/ContainerPlatformDockerIntegrationTest.java@@ -2,8 +2,8 @@ package io.github.hectorvent.floci.core.common.docker;import com.github.dockerjava.api.DockerClient;import com.github.dockerjava.api.async.ResultCallback;-import com.github.dockerjava.core.command.WaitContainerResultCallback;import com.github.dockerjava.api.model.Frame;+import com.github.dockerjava.core.command.WaitContainerResultCallback;import io.github.hectorvent.floci.testing.TestImages;import io.quarkus.test.junit.QuarkusTest;import jakarta.inject.Inject;diff --git a/src/test/java/io/github/hectorvent/floci/core/common/docker/DockerClientProducerTest.java b/src/test/java/io/github/hectorvent/floci/core/common/docker/DockerClientProducerTest.javaindex 1685daa396..90042b9551 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/docker/DockerClientProducerTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/docker/DockerClientProducerTest.java@@ -12,7 +12,6 @@ import org.junit.jupiter.params.provider.MethodSource;import org.junit.jupiter.params.provider.ValueSource;import java.io.IOException;-import java.time.Duration;import java.net.InetAddress;import java.net.ServerSocket;import java.net.Socket;@@ -22,6 +21,7 @@ import java.nio.file.Path;import java.nio.file.Paths;import java.security.MessageDigest;import java.security.NoSuchAlgorithmException;+import java.time.Duration;import java.util.Optional;import java.util.concurrent.BlockingQueue;import java.util.concurrent.LinkedBlockingQueue;diff --git a/src/test/java/io/github/hectorvent/floci/core/common/docker/FlociDockerHttpClientTest.java b/src/test/java/io/github/hectorvent/floci/core/common/docker/FlociDockerHttpClientTest.javaindex 2b5ffa5d00..63ccd47cf6 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/docker/FlociDockerHttpClientTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/docker/FlociDockerHttpClientTest.java@@ -8,11 +8,11 @@ import org.junit.jupiter.api.io.TempDir;import java.io.IOException;import java.net.ServerSocket;+import java.net.Socket;import java.net.SocketTimeoutException;import java.net.StandardProtocolFamily;-import java.net.UnixDomainSocketAddress;-import java.net.Socket;import java.net.URI;+import java.net.UnixDomainSocketAddress;import java.nio.ByteBuffer;import java.nio.channels.ServerSocketChannel;import java.nio.channels.SocketChannel;diff --git a/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java b/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.javaindex 1c61a00bed..2a94b0c135 100644--- a/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java+++ b/src/test/java/io/github/hectorvent/floci/lifecycle/EmulatorLifecycleTest.java@@ -11,9 +11,9 @@ import io.github.hectorvent.floci.services.appsync.graphql.SchemaCreationWorker;import io.github.hectorvent.floci.services.docdb.container.DocDbContainerManager;import io.github.hectorvent.floci.services.dynamodb.DynamoDbRuntime;import io.github.hectorvent.floci.services.ec2.Ec2MetadataServer;+import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;import io.github.hectorvent.floci.services.ecs.EcsService;import io.github.hectorvent.floci.services.ecs.container.EcsTaskRoleCredentialsServer;-import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;import io.github.hectorvent.floci.services.elasticache.ElastiCacheMemcachedService;import io.github.hectorvent.floci.services.elasticache.ElastiCacheService;import io.github.hectorvent.floci.services.elasticache.container.ElastiCacheContainerManager;@@ -58,8 +58,8 @@ import java.util.concurrent.CompletableFuture;import java.util.concurrent.CopyOnWriteArrayList;import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.Mockito.doThrow;import static org.mockito.Mockito.never;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 bb1fbba286..be9b144071 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@@ -3,8 +3,8 @@ package io.github.hectorvent.floci.services.amazonmq;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;-import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;+import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.amazonmq.container.RabbitMqManager;import io.github.hectorvent.floci.services.amazonmq.model.Broker;diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayAccountIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayAccountIntegrationTest.javaindex 92d332e0d6..088673e648 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayAccountIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayAccountIntegrationTest.java@@ -1,15 +1,15 @@package io.github.hectorvent.floci.services.apigateway;-import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.hasItem;-import static org.hamcrest.Matchers.notNullValue;-import static org.hamcrest.Matchers.nullValue;+import io.quarkus.test.junit.QuarkusTest;+import io.restassured.http.ContentType;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;-import io.quarkus.test.junit.QuarkusTest;import static io.restassured.RestAssured.given;-import io.restassured.http.ContentType;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.hasItem;+import static org.hamcrest.Matchers.notNullValue;+import static org.hamcrest.Matchers.nullValue;@QuarkusTestclass ApiGatewayAccountIntegrationTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayConfigReadBackTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayConfigReadBackTest.javaindex a6814ff379..c7e0bbb84b 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayConfigReadBackTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayConfigReadBackTest.java@@ -9,11 +9,11 @@ import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;-import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertFalse;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.notNullValue;import static org.hamcrest.Matchers.nullValue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;/*** Round-trips method request parameters, the REST API resource policy and the stage's access log,diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayDomainTlsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayDomainTlsServiceTest.javaindex 1a5e91f4be..c12c0f797f 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayDomainTlsServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayDomainTlsServiceTest.java@@ -19,8 +19,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertThrows;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyString;-import static org.mockito.Mockito.doAnswer;import static org.mockito.Mockito.RETURNS_DEEP_STUBS;+import static org.mockito.Mockito.doAnswer;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.verify;import static org.mockito.Mockito.verifyNoInteractions;diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayGetUsageIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayGetUsageIntegrationTest.javaindex 475278ac27..8629dd79b1 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayGetUsageIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayGetUsageIntegrationTest.java@@ -10,8 +10,8 @@ import static org.hamcrest.Matchers.anEmptyMap;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasSize;-import static org.hamcrest.Matchers.nullValue;import static org.hamcrest.Matchers.notNullValue;+import static org.hamcrest.Matchers.nullValue;/*** {@code GetUsage}.diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayHttpContextMappingIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayHttpContextMappingIntegrationTest.javaindex caa45ff8fd..41b3332b82 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayHttpContextMappingIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayHttpContextMappingIntegrationTest.java@@ -19,10 +19,10 @@ import org.junit.jupiter.api.AfterEach;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;-import org.mockito.ArgumentCaptor;import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.CsvSource;import org.junit.jupiter.params.provider.ValueSource;+import org.mockito.ArgumentCaptor;import java.io.IOException;import java.net.InetSocketAddress;diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayIntegrationFieldsRoundTripTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayIntegrationFieldsRoundTripTest.javaindex 797e6f9bb8..c8cd5cddd1 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayIntegrationFieldsRoundTripTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayIntegrationFieldsRoundTripTest.java@@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.contains;import static org.hamcrest.Matchers.containsInAnyOrder;-import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.empty;+import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.notNullValue;/**diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayIntegrationTransportOptionsTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayIntegrationTransportOptionsTest.javaindex b731eea62d..33b9f0dc73 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayIntegrationTransportOptionsTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayIntegrationTransportOptionsTest.java@@ -7,6 +7,9 @@ import com.sun.net.httpserver.HttpsServer;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.test.junit.QuarkusTest;+import io.restassured.http.ContentType;+import io.restassured.response.ValidatableResponse;import org.bouncycastle.asn1.x500.X500Name;import org.bouncycastle.asn1.x509.BasicConstraints;import org.bouncycastle.asn1.x509.Extension;@@ -18,9 +21,6 @@ import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;import org.bouncycastle.operator.ContentSigner;import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;-import io.quarkus.test.junit.QuarkusTest;-import io.restassured.http.ContentType;-import io.restassured.response.ValidatableResponse;import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.AfterEach;import org.junit.jupiter.api.BeforeAll;diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayListRestApisConcurrentDeleteTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayListRestApisConcurrentDeleteTest.javaindex 8520c2238d..f47c686b66 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayListRestApisConcurrentDeleteTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayListRestApisConcurrentDeleteTest.java@@ -1,13 +1,12 @@package io.github.hectorvent.floci.services.apigateway;-import java.util.Optional;--import jakarta.inject.Inject;-import io.github.hectorvent.floci.core.common.AwsException;import io.quarkus.test.junit.QuarkusTest;+import jakarta.inject.Inject;import org.junit.jupiter.api.Test;+import java.util.Optional;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.notNullValue;diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayOpenApiImportTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayOpenApiImportTest.javaindex 0619ebafbb..bab890e41d 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayOpenApiImportTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayOpenApiImportTest.java@@ -1,7 +1,5 @@package io.github.hectorvent.floci.services.apigateway;-import java.util.stream.Stream;-import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.quarkus.test.junit.QuarkusTest;@@ -11,6 +9,8 @@ import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.Arguments;import org.junit.jupiter.params.provider.MethodSource;+import java.util.stream.Stream;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.*;import static org.junit.jupiter.api.Assertions.*;diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayProxyMatchTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayProxyMatchTest.javaindex 416c350128..c37d0890a1 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayProxyMatchTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayProxyMatchTest.java@@ -1,12 +1,12 @@package io.github.hectorvent.floci.services.apigateway;+import com.fasterxml.jackson.databind.ObjectMapper;+import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.services.apigateway.model.ApiGatewayResource;import io.github.hectorvent.floci.services.apigatewayv2.ApiGatewayV2Service;import io.github.hectorvent.floci.services.apigatewayv2.websocket.WebSocketConnectionManager;import io.github.hectorvent.floci.services.elbv2.ElbV2Service;import io.github.hectorvent.floci.services.lambda.LambdaService;-import io.github.hectorvent.floci.core.common.RegionResolver;-import com.fasterxml.jackson.databind.ObjectMapper;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.extension.ExtendWith;diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayRootResourceLookupTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayRootResourceLookupTest.javaindex 589ef69c29..c3a1f4ea8f 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayRootResourceLookupTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayRootResourceLookupTest.java@@ -1,9 +1,5 @@package io.github.hectorvent.floci.services.apigateway;-import java.util.List;-import java.util.Map;-import java.util.Optional;-import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.config.EmulatorConfig;@@ -20,6 +16,10 @@ import jakarta.ws.rs.core.Response;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;+import java.util.List;+import java.util.Map;+import java.util.Optional;+import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.mockito.ArgumentMatchers.any;diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayTagResourceIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayTagResourceIntegrationTest.javaindex c19f654a21..54db3836f8 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayTagResourceIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayTagResourceIntegrationTest.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.apigateway;import io.quarkus.test.junit.QuarkusTest;import io.restassured.http.ContentType;import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.nullValue;diff --git a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayUntagResourceIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayUntagResourceIntegrationTest.javaindex a0b1149a5f..96ef22bc1b 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayUntagResourceIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigateway/ApiGatewayUntagResourceIntegrationTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.apigateway;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.nullValue;diff --git a/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/ApiGatewayV2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/ApiGatewayV2IntegrationTest.javaindex d0396e63a7..ee4ab524e2 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/ApiGatewayV2IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/ApiGatewayV2IntegrationTest.java@@ -3,9 +3,9 @@ package io.github.hectorvent.floci.services.apigatewayv2;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.apigatewayv2.model.Authorizer;import io.github.hectorvent.floci.services.apigatewayv2.model.Route;-import jakarta.inject.Inject;import io.quarkus.test.junit.QuarkusTest;import io.restassured.http.ContentType;+import jakarta.inject.Inject;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/HttpApiIamAuthorizationTest.java b/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/HttpApiIamAuthorizationTest.javaindex 90eaf02a9e..ccb7b19341 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/HttpApiIamAuthorizationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/HttpApiIamAuthorizationTest.java@@ -1,10 +1,10 @@package io.github.hectorvent.floci.services.apigatewayv2;import com.sun.net.httpserver.HttpServer;+import io.github.hectorvent.floci.testutil.ExecuteApiRequestSigner;import io.quarkus.test.junit.QuarkusTest;import io.restassured.RestAssured;import io.restassured.http.ContentType;-import io.github.hectorvent.floci.testutil.ExecuteApiRequestSigner;import org.junit.jupiter.api.AfterAll;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.MethodOrderer;diff --git a/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/IntegrationConnectionTypeAndAuthorizerSimpleResponsesTest.java b/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/IntegrationConnectionTypeAndAuthorizerSimpleResponsesTest.javaindex 7dfbd16223..6a687dbaf6 100644--- a/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/IntegrationConnectionTypeAndAuthorizerSimpleResponsesTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/apigatewayv2/IntegrationConnectionTypeAndAuthorizerSimpleResponsesTest.java@@ -9,8 +9,8 @@ import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasItem;-import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.hasKey;+import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.nullValue;/**diff --git a/src/test/java/io/github/hectorvent/floci/services/appconfig/AppConfigServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/appconfig/AppConfigServiceTest.javaindex d3b2cae2cd..c51e217d30 100644--- a/src/test/java/io/github/hectorvent/floci/services/appconfig/AppConfigServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appconfig/AppConfigServiceTest.java@@ -6,8 +6,8 @@ import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.appconfig.model.Application;import io.github.hectorvent.floci.services.appconfig.model.Deployment;-import io.github.hectorvent.floci.services.appconfig.model.Environment;import io.github.hectorvent.floci.services.appconfig.model.DeploymentSummary;+import io.github.hectorvent.floci.services.appconfig.model.Environment;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/appsync/AppSyncAuthIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/appsync/AppSyncAuthIntegrationTest.javaindex d6c0bc557f..908c636f3f 100644--- a/src/test/java/io/github/hectorvent/floci/services/appsync/AppSyncAuthIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appsync/AppSyncAuthIntegrationTest.java@@ -5,9 +5,9 @@ import io.github.hectorvent.floci.services.appsync.graphql.AppSyncExecutionContrimport io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.github.hectorvent.floci.testing.SidecarContainersProfile;import io.github.hectorvent.floci.testutil.AppSyncRequestSigner;-import io.restassured.RestAssured;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.TestProfile;+import io.restassured.RestAssured;import jakarta.inject.Inject;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/AppSyncExecutionControllerTest.java b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/AppSyncExecutionControllerTest.javaindex fa58e035c2..492f075001 100644--- a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/AppSyncExecutionControllerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/AppSyncExecutionControllerTest.java@@ -4,20 +4,20 @@ import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.RequestContext;+import io.github.hectorvent.floci.core.common.docker.ContainerReachableEndpoint;import io.github.hectorvent.floci.services.appsync.AppSyncService;import io.github.hectorvent.floci.services.appsync.GraphqlSidecarClient;import io.github.hectorvent.floci.services.appsync.graphql.auth.AppSyncAuth;import io.github.hectorvent.floci.services.appsync.graphql.auth.AppSyncAuthContext;import io.github.hectorvent.floci.services.appsync.graphql.auth.AuthMiddleware;import io.github.hectorvent.floci.services.appsync.graphql.auth.AuthRequestInfo;-import io.github.hectorvent.floci.core.common.docker.ContainerReachableEndpoint;import io.github.hectorvent.floci.services.appsync.graphql.auth.SidecarFieldAuthorizationPlanner;import io.github.hectorvent.floci.services.appsync.graphql.resolver.AppSyncResolverError;import io.github.hectorvent.floci.services.appsync.graphql.resolver.AppSyncResolverExecutor;import io.github.hectorvent.floci.services.appsync.graphql.resolver.ResolverCallbackSessions;-import io.github.hectorvent.floci.services.appsync.model.Resolver;import io.github.hectorvent.floci.services.appsync.model.AuthenticationType;import io.github.hectorvent.floci.services.appsync.model.GraphqlApi;+import io.github.hectorvent.floci.services.appsync.model.Resolver;import jakarta.ws.rs.core.HttpHeaders;import jakarta.ws.rs.core.MultivaluedHashMap;import jakarta.ws.rs.core.Response;diff --git a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/AppSyncVtlContextTest.java b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/AppSyncVtlContextTest.javaindex 7a8ca4d142..f4c7eac5fc 100644--- a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/AppSyncVtlContextTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/AppSyncVtlContextTest.java@@ -5,8 +5,8 @@ import org.junit.jupiter.api.Test;import java.util.Map;-import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertNull;class AppSyncVtlContextTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/auth/CognitoAuthValidatorTest.java b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/auth/CognitoAuthValidatorTest.javaindex 961558fa57..134bbd4991 100644--- a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/auth/CognitoAuthValidatorTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/auth/CognitoAuthValidatorTest.java@@ -12,13 +12,13 @@ import org.junit.jupiter.api.extension.ExtendWith;import org.mockito.Mock;import org.mockito.junit.jupiter.MockitoExtension;+import java.nio.charset.StandardCharsets;import java.security.GeneralSecurityException;import java.security.KeyPair;import java.security.KeyPairGenerator;import java.security.Signature;import java.security.interfaces.RSAPrivateKey;import java.security.interfaces.RSAPublicKey;-import java.nio.charset.StandardCharsets;import java.time.Clock;import java.time.Instant;import java.time.ZoneOffset;diff --git a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/datasource/RelationalDataSourceInvokerTest.java b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/datasource/RelationalDataSourceInvokerTest.javaindex c0016c2806..070268f6e7 100644--- a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/datasource/RelationalDataSourceInvokerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/datasource/RelationalDataSourceInvokerTest.java@@ -22,8 +22,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyString;-import static org.mockito.Mockito.mock;import static org.mockito.Mockito.inOrder;+import static org.mockito.Mockito.mock;import static org.mockito.Mockito.never;import static org.mockito.Mockito.times;import static org.mockito.Mockito.verify;diff --git a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/js/NodeAppSyncJsRuntimeTest.java b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/js/NodeAppSyncJsRuntimeTest.javaindex 64c37d8769..b5ddacc92b 100644--- a/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/js/NodeAppSyncJsRuntimeTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appsync/graphql/js/NodeAppSyncJsRuntimeTest.java@@ -7,9 +7,9 @@ import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;import io.github.hectorvent.floci.core.common.docker.ContainerDetector;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.ContainerLifecycleManager.ContainerInfo;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.EndpointInfo;+import io.github.hectorvent.floci.core.common.docker.ContainerLogStreamer;import io.github.hectorvent.floci.core.common.docker.ContainerSpec;import org.junit.jupiter.api.AfterEach;import org.junit.jupiter.api.BeforeEach;@@ -36,9 +36,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.Mockito.mock;-import static org.mockito.Mockito.withSettings;import static org.mockito.Mockito.verifyNoInteractions;import static org.mockito.Mockito.when;+import static org.mockito.Mockito.withSettings;/*** The pre-configured URL path: a server someone else is already running, with no containerdiff --git a/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingMultiAccountIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingMultiAccountIntegrationTest.javaindex 297099ccd7..a4058dd12f 100644--- a/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingMultiAccountIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingMultiAccountIntegrationTest.java@@ -1,14 +1,13 @@package io.github.hectorvent.floci.services.autoscaling;-import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;+import io.quarkus.test.junit.QuarkusTest;+import jakarta.inject.Inject;+import org.junit.jupiter.api.Test;import java.util.UUID;-import org.junit.jupiter.api.Test;--import io.quarkus.test.junit.QuarkusTest;-import jakarta.inject.Inject;+import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.equalTo;@QuarkusTestclass AutoScalingMultiAccountIntegrationTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/batch/BatchDockerRunnerTest.java b/src/test/java/io/github/hectorvent/floci/services/batch/BatchDockerRunnerTest.javaindex b4ea194609..92940e911b 100644--- a/src/test/java/io/github/hectorvent/floci/services/batch/BatchDockerRunnerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/batch/BatchDockerRunnerTest.java@@ -30,9 +30,9 @@ import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.ArgumentMatchers.eq;import static org.mockito.ArgumentMatchers.isNull;-import static org.mockito.Mockito.doAnswer;import static org.mockito.Mockito.RETURNS_DEEP_STUBS;import static org.mockito.Mockito.RETURNS_SELF;+import static org.mockito.Mockito.doAnswer;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.verify;import static org.mockito.Mockito.when;diff --git a/src/test/java/io/github/hectorvent/floci/services/bedrockagentcore/BedrockAgentCoreHarnessIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/bedrockagentcore/BedrockAgentCoreHarnessIntegrationTest.javaindex e59522f768..3c32b8b40e 100644--- a/src/test/java/io/github/hectorvent/floci/services/bedrockagentcore/BedrockAgentCoreHarnessIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/bedrockagentcore/BedrockAgentCoreHarnessIntegrationTest.java@@ -5,7 +5,6 @@ import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.Test;import java.util.regex.Matcher;-import java.util.regex.Pattern;import static io.restassured.RestAssured.given;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudcontrol/CloudControlIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudcontrol/CloudControlIntegrationTest.javaindex bd4ce95bda..8840670a75 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudcontrol/CloudControlIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudcontrol/CloudControlIntegrationTest.java@@ -13,9 +13,9 @@ import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;-import static io.restassured.http.ContentType.TEXT;import static io.restassured.config.EncoderConfig.encoderConfig;import static io.restassured.config.RestAssuredConfig.config;+import static io.restassured.http.ContentType.TEXT;import static org.hamcrest.MatcherAssert.assertThat;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudcontrol/CloudControlServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudcontrol/CloudControlServiceTest.javaindex 15a5dc6485..325c5fb158 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudcontrol/CloudControlServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudcontrol/CloudControlServiceTest.java@@ -4,8 +4,8 @@ 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.core.storage.AccountAwareStorageBackend;-import io.github.hectorvent.floci.services.cloudformation.provisioners.CfnResourceDispatcher;import io.github.hectorvent.floci.services.cloudformation.model.StackResource;+import io.github.hectorvent.floci.services.cloudformation.provisioners.CfnResourceDispatcher;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.model.Tag;import io.github.hectorvent.floci.services.ec2.model.Vpc;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CfnProvisionerFixture.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CfnProvisionerFixture.javaindex 071e670c03..eb3b53ea31 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CfnProvisionerFixture.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CfnProvisionerFixture.java@@ -6,48 +6,32 @@ import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.docker.ContainerReachableEndpoint;import io.github.hectorvent.floci.services.acm.AcmService;import io.github.hectorvent.floci.services.apigateway.ApiGatewayService;-import io.github.hectorvent.floci.services.backup.BackupService;import io.github.hectorvent.floci.services.apigatewayv2.ApiGatewayV2Service;import io.github.hectorvent.floci.services.appsync.AppSyncService;import io.github.hectorvent.floci.services.autoscaling.AutoScalingService;+import io.github.hectorvent.floci.services.backup.BackupService;import io.github.hectorvent.floci.services.batch.BatchService;-import io.github.hectorvent.floci.services.cloudformation.provisioners.CfnDynamicReferences;-import io.github.hectorvent.floci.services.cloudformation.provisioners.CfnResourceDispatcher;-import io.github.hectorvent.floci.services.cloudformation.provisioners.CloudFrontCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.CloudMapCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.ConfigCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.DynamoDbCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2FlowLogCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2InstanceCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.LambdaMicrovmsCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.OrganizationsCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.StepFunctionsCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.SqsCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.WafV2CfnProvisioner;-import io.github.hectorvent.floci.services.configservice.AwsConfigService;-import io.github.hectorvent.floci.services.ec2.FlowLogService;-import io.github.hectorvent.floci.services.lambdamicrovms.LambdaMicrovmsService;-import io.github.hectorvent.floci.services.organizations.OrganizationsService;-import io.github.hectorvent.floci.services.sqs.SqsService;-import io.github.hectorvent.floci.services.transfer.TransferService;-import io.github.hectorvent.floci.services.wafv2.WafV2Service;import io.github.hectorvent.floci.services.cloudformation.provisioners.AcmCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.ApiGatewayAccountCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.ApiGatewayApiKeyCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.ApiGatewayUsagePlanCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.ApiGatewayDomainCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.ApiGatewayGatewayResponseCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.ApiGatewayRestApiCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.ApiGatewayUsagePlanCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.ApiGatewayV2CfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.AppSyncCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.AutoScalingGroupCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.AutoScalingLifecycleHookCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.AutoScalingScalingPolicyCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.BackupVaultCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.BatchCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.EventsArchiveCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.EventsCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.AppSyncCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.CdkMetadataCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.CfnDynamicReferences;+import io.github.hectorvent.floci.services.cloudformation.provisioners.CfnResourceDispatcher;+import io.github.hectorvent.floci.services.cloudformation.provisioners.CfnResourceProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.CloudFormationResourceRegistry;+import io.github.hectorvent.floci.services.cloudformation.provisioners.CloudFrontCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.CloudMapCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.CloudTrailCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.CloudWatchCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.CloudWatchDashboardCfnProvisioner;@@ -55,25 +39,30 @@ import io.github.hectorvent.floci.services.cloudformation.provisioners.CognitoCfimport io.github.hectorvent.floci.services.cloudformation.provisioners.CognitoUserPoolGroupCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.CognitoUserPoolUserCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.CognitoUserPoolUserToGroupAttachmentCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.ConfigCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.CustomResourceCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.DynamoDbCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2FlowLogCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2InstanceCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2LaunchTemplateCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2NetworkCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2NetworkAclCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2NetworkCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2SecurityGroupCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2SecurityGroupRuleCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2VpcCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2VpcEndpointCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.Ec2VpcGatewayAttachmentCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.EcrCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.EksCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.EcsCapacityCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.EcsCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.EksCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.ElbV2CfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.EventsArchiveCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.EventsCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.FirehoseCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.IamAccessKeyCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.IamInstanceProfileCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.IamManagedPolicyCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.CustomResourceCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.LambdaCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.IamPolicyCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.IamRoleCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.IamUserCfnProvisioner;@@ -83,12 +72,15 @@ import io.github.hectorvent.floci.services.cloudformation.provisioners.IotDomainimport io.github.hectorvent.floci.services.cloudformation.provisioners.KinesisCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.KmsCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.LambdaAddressingCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.LambdaCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.LambdaEventInvokeConfigCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.LambdaEventSourceMappingCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.LambdaMicrovmsCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.LambdaVersionAliasCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.LogsCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.LogsLogStreamCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.LogsMetricFilterCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.OrganizationsCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.PipesCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.RdsCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.RedshiftClusterCfnProvisioner;@@ -96,13 +88,14 @@ import io.github.hectorvent.floci.services.cloudformation.provisioners.RedshiftSimport io.github.hectorvent.floci.services.cloudformation.provisioners.Route53CfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.S3CfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.SchedulerScheduleGroupCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.TransferCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.SecretTargetAttachmentCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.SecretsManagerCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.SnsCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.SqsCfnProvisioner;import io.github.hectorvent.floci.services.cloudformation.provisioners.SsmCfnProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.CfnResourceProvisioner;-import io.github.hectorvent.floci.services.cloudformation.provisioners.CloudFormationResourceRegistry;+import io.github.hectorvent.floci.services.cloudformation.provisioners.StepFunctionsCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.TransferCfnProvisioner;+import io.github.hectorvent.floci.services.cloudformation.provisioners.WafV2CfnProvisioner;import io.github.hectorvent.floci.services.cloudfront.CloudFrontService;import io.github.hectorvent.floci.services.cloudmap.CloudMapService;import io.github.hectorvent.floci.services.cloudtrail.CloudTrailService;@@ -111,11 +104,13 @@ import io.github.hectorvent.floci.services.cloudwatch.logs.CloudWatchLogsMetricFimport io.github.hectorvent.floci.services.cloudwatch.logs.CloudWatchLogsService;import io.github.hectorvent.floci.services.cloudwatch.metrics.CloudWatchMetricsService;import io.github.hectorvent.floci.services.cognito.CognitoService;+import io.github.hectorvent.floci.services.configservice.AwsConfigService;import io.github.hectorvent.floci.services.docdb.DocDbService;import io.github.hectorvent.floci.services.dynamodb.DynamoDbFacade;import io.github.hectorvent.floci.services.dynamodb.DynamoDbService;import io.github.hectorvent.floci.services.dynamodb.backend.NativeDynamoDbBackend;import io.github.hectorvent.floci.services.ec2.Ec2Service;+import io.github.hectorvent.floci.services.ec2.FlowLogService;import io.github.hectorvent.floci.services.ecr.EcrService;import io.github.hectorvent.floci.services.ecs.EcsService;import io.github.hectorvent.floci.services.eks.EksService;@@ -130,6 +125,8 @@ import io.github.hectorvent.floci.services.kinesis.KinesisService;import io.github.hectorvent.floci.services.kms.KmsService;import io.github.hectorvent.floci.services.lambda.LambdaLayerService;import io.github.hectorvent.floci.services.lambda.LambdaService;+import io.github.hectorvent.floci.services.lambdamicrovms.LambdaMicrovmsService;+import io.github.hectorvent.floci.services.organizations.OrganizationsService;import io.github.hectorvent.floci.services.pipes.PipesService;import io.github.hectorvent.floci.services.rds.RdsService;import io.github.hectorvent.floci.services.redshift.RedshiftService;@@ -139,8 +136,11 @@ import io.github.hectorvent.floci.services.s3.S3Service;import io.github.hectorvent.floci.services.scheduler.SchedulerService;import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.sns.SnsService;+import io.github.hectorvent.floci.services.sqs.SqsService;import io.github.hectorvent.floci.services.ssm.SsmService;import io.github.hectorvent.floci.services.stepfunctions.StepFunctionsService;+import io.github.hectorvent.floci.services.transfer.TransferService;+import io.github.hectorvent.floci.services.wafv2.WafV2Service;import java.util.ArrayList;import java.util.Arrays;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationCloudFrontDistributionIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationCloudFrontDistributionIntegrationTest.javaindex d1358d5f7f..54c1b12296 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationCloudFrontDistributionIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationCloudFrontDistributionIntegrationTest.java@@ -17,8 +17,8 @@ import java.util.List;import java.util.Map;import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.not;import static org.junit.jupiter.api.Assertions.assertEquals;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationCloudFrontPoliciesIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationCloudFrontPoliciesIntegrationTest.javaindex df60347e6d..5f60828815 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationCloudFrontPoliciesIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationCloudFrontPoliciesIntegrationTest.java@@ -1,7 +1,7 @@package io.github.hectorvent.floci.services.cloudformation;-import io.github.hectorvent.floci.core.common.XmlParser;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.common.XmlParser;import io.github.hectorvent.floci.services.cloudfront.CloudFrontService;import io.github.hectorvent.floci.services.cloudfront.model.CachePolicy;import io.github.hectorvent.floci.services.cloudfront.model.Distribution;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationDeleteIdempotencyTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationDeleteIdempotencyTest.javaindex 2741b329bd..cb9858ae40 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationDeleteIdempotencyTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationDeleteIdempotencyTest.java@@ -7,7 +7,6 @@ import io.github.hectorvent.floci.services.lambda.LambdaService;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;import static org.junit.jupiter.api.Assertions.assertSame;import static org.junit.jupiter.api.Assertions.assertThrows;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationDeletionPolicyIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationDeletionPolicyIntegrationTest.javaindex e9d4cc68b4..b6b32a5089 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationDeletionPolicyIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationDeletionPolicyIntegrationTest.java@@ -19,8 +19,8 @@ import static org.hamcrest.MatcherAssert.assertThat;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.not;-import static org.junit.jupiter.api.Assertions.fail;import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;+import static org.junit.jupiter.api.Assertions.fail;/*** Verifies the resource-level {@code DeletionPolicy} attribute (issue #1555): {@code Retain} keeps adiff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationFirehoseIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationFirehoseIntegrationTest.javaindex 5eb7fab6e4..d2676808b0 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationFirehoseIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationFirehoseIntegrationTest.java@@ -1,13 +1,13 @@package io.github.hectorvent.floci.services.cloudformation;-import static org.hamcrest.Matchers.containsString;-import org.junit.jupiter.api.Test;-import io.quarkus.test.junit.QuarkusTest;import io.restassured.RestAssured;-import static io.restassured.RestAssured.given;import io.restassured.config.EncoderConfig;import io.restassured.http.ContentType;+import org.junit.jupiter.api.Test;++import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.containsString;/*** End-to-end check that CloudFormation provisions an AWS::KinesisFirehose::DeliveryStream for realdiff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationIntegrationTest.javaindex 389ea68c23..c229be4fb7 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationIntegrationTest.java@@ -1,5 +1,7 @@package io.github.hectorvent.floci.services.cloudformation;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.testing.MutableClock;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;@@ -11,12 +13,6 @@ import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;-import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertNotEquals;--import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import java.io.ByteArrayOutputStream;import java.nio.charset.StandardCharsets;import java.time.Duration;@@ -29,6 +25,7 @@ import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;import java.util.zip.ZipEntry;import java.util.zip.ZipOutputStream;+import static io.restassured.RestAssured.given;import static org.hamcrest.MatcherAssert.assertThat;import static org.hamcrest.Matchers.contains;@@ -41,6 +38,8 @@ import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.notNullValue;import static org.hamcrest.Matchers.nullValue;import static org.hamcrest.Matchers.startsWith;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertNotEquals;import static org.junit.jupiter.api.Assertions.assertTrue;@QuarkusTestdiff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationLogsMetricFilterIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationLogsMetricFilterIntegrationTest.javaindex 23558e7a0e..c9fe534209 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationLogsMetricFilterIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationLogsMetricFilterIntegrationTest.java@@ -13,14 +13,14 @@ import io.github.hectorvent.floci.services.cloudwatch.logs.model.MetricFilter;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.mockito.InjectSpy;-import jakarta.inject.Inject;import io.restassured.response.Response;import io.restassured.specification.RequestSpecification;+import jakarta.inject.Inject;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;import org.junit.jupiter.params.ParameterizedTest;-import org.junit.jupiter.params.provider.ValueSource;import org.junit.jupiter.params.provider.CsvSource;+import org.junit.jupiter.params.provider.ValueSource;import java.time.Duration;import java.util.ArrayList;@@ -40,12 +40,12 @@ import static io.restassured.RestAssured.given;import static org.awaitility.Awaitility.await;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasSize;-import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;+import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertNull;-import static org.junit.jupiter.api.Assertions.assertTrue;import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;import static org.junit.jupiter.api.Assertions.fail;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyString;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationServiceRestoreIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationServiceRestoreIntegrationTest.javaindex d5bcce023a..ab88f919fe 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationServiceRestoreIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationServiceRestoreIntegrationTest.java@@ -8,6 +8,7 @@ import io.github.hectorvent.floci.services.cloudformation.provisioners.CfnResourimport io.quarkus.arc.ClientProxy;import io.quarkus.test.junit.QuarkusMock;import io.quarkus.test.junit.QuarkusTest;+import jakarta.inject.Inject;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.mockito.AdditionalAnswers;@@ -15,7 +16,6 @@ import org.mockito.Mockito;import org.mockito.invocation.InvocationOnMock;import org.mockito.stubbing.Answer;-import jakarta.inject.Inject;import java.util.ArrayList;import java.util.Arrays;import java.util.List;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationUsePreviousTemplateIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationUsePreviousTemplateIntegrationTest.javaindex 3a0b7570b5..4e1cc0418b 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationUsePreviousTemplateIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationUsePreviousTemplateIntegrationTest.java@@ -5,9 +5,9 @@ import io.restassured.response.Response;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;-import static org.junit.jupiter.api.Assertions.assertEquals;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.not;+import static org.junit.jupiter.api.Assertions.assertEquals;/*** UpdateStack and CreateChangeSet with {@code UsePreviousTemplate=true} reuse the template thediff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/RdsCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/RdsCfnProvisionerTest.javaindex c6f9bb8c67..aac0861cfb 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/RdsCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/RdsCfnProvisionerTest.java@@ -2,10 +2,10 @@ package io.github.hectorvent.floci.services.cloudformation;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.cloudformation.model.StackResource;import io.github.hectorvent.floci.services.cloudformation.provisioners.CfnResourceDispatcher;import io.github.hectorvent.floci.services.cloudformation.provisioners.UpdateCleanupResult;-import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.rds.RdsService;import io.github.hectorvent.floci.services.rds.model.DbCluster;import io.github.hectorvent.floci.services.rds.model.DbClusterParameterGroup;@@ -23,11 +23,11 @@ import io.github.hectorvent.floci.services.ssm.model.Parameter;import io.github.hectorvent.floci.services.ssm.model.ParameterHistory;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;-import org.mockito.ArgumentCaptor;-import org.mockito.InOrder;import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.CsvSource;import org.junit.jupiter.params.provider.ValueSource;+import org.mockito.ArgumentCaptor;+import org.mockito.InOrder;import java.util.List;import java.util.Map;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 43b95af360..2a2e027836 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@@ -19,8 +19,8 @@ import static org.hamcrest.Matchers.hasItem;import static org.hamcrest.Matchers.hasItems;import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.notNullValue;-import static org.hamcrest.Matchers.startsWith;import static org.hamcrest.Matchers.nullValue;+import static org.hamcrest.Matchers.startsWith;@QuarkusTestclass SamTransformIntegrationTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/StackSetServiceDeleteFailureTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/StackSetServiceDeleteFailureTest.javaindex 3ff8e96d1d..4dc718d467 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/StackSetServiceDeleteFailureTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/StackSetServiceDeleteFailureTest.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.cloudformation;import com.fasterxml.jackson.core.type.TypeReference;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.cloudformation.model.Stack;import io.github.hectorvent.floci.services.cloudformation.model.StackInstance;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/BatchCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/BatchCfnProvisionerTest.javaindex ab6705cd40..3a3697cf5d 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/BatchCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/BatchCfnProvisionerTest.java@@ -12,8 +12,8 @@ import org.mockito.ArgumentCaptor;import org.mockito.InOrder;import java.util.HashMap;-import java.util.Map;import java.util.List;+import java.util.Map;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;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 b7becd13a4..4023c4e669 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@@ -6,19 +6,19 @@ 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.cloudformation.model.StackResource;import io.github.hectorvent.floci.services.ecr.EcrService;import io.github.hectorvent.floci.services.ecr.model.Repository;+import io.github.hectorvent.floci.services.firehose.FirehoseService;+import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription;import io.github.hectorvent.floci.services.lambdamicrovms.LambdaMicrovmsService;+import io.github.hectorvent.floci.services.pipes.PipesService;+import io.github.hectorvent.floci.services.pipes.model.Pipe;import io.github.hectorvent.floci.services.s3.S3Service;import io.github.hectorvent.floci.services.scheduler.SchedulerService;import io.github.hectorvent.floci.services.scheduler.model.ScheduleGroup;import io.github.hectorvent.floci.services.sqs.SqsService;import io.github.hectorvent.floci.services.sqs.model.Queue;-import io.github.hectorvent.floci.services.cloudformation.model.StackResource;-import io.github.hectorvent.floci.services.firehose.FirehoseService;-import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription;-import io.github.hectorvent.floci.services.pipes.PipesService;-import io.github.hectorvent.floci.services.pipes.model.Pipe;import org.junit.jupiter.api.Test;import java.time.Instant;@@ -28,12 +28,12 @@ import java.util.Map;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertThrows;-import static org.mockito.ArgumentMatchers.argThat;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyList;import static org.mockito.ArgumentMatchers.anyString;-import static org.mockito.ArgumentMatchers.isNull;+import static org.mockito.ArgumentMatchers.argThat;import static org.mockito.ArgumentMatchers.eq;+import static org.mockito.ArgumentMatchers.isNull;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.never;import static org.mockito.Mockito.times;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CloudWatchCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CloudWatchCfnProvisionerTest.javaindex 0e19677f80..9391b37f42 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CloudWatchCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/CloudWatchCfnProvisionerTest.java@@ -15,8 +15,8 @@ import java.util.List;import java.util.Map;import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.eq;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkAclCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkAclCfnProvisionerTest.javaindex e0483a4c8f..88ca2eb633 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkAclCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2NetworkAclCfnProvisionerTest.java@@ -11,11 +11,10 @@ import io.github.hectorvent.floci.services.ec2.model.NetworkAcl;import io.github.hectorvent.floci.services.ec2.model.NetworkAclAssociation;import org.junit.jupiter.api.Test;-import java.util.Set;-import java.util.HashMap;import java.util.List;import java.util.Map;+import java.util.Set;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertThrows;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 63346f29a4..8259d7c228 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@@ -4,6 +4,7 @@ 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.cloudformation.model.StackResource;import io.github.hectorvent.floci.services.ec2.Ec2Service;@@ -15,11 +16,12 @@ import io.github.hectorvent.floci.services.ec2.model.RouteTable;import io.github.hectorvent.floci.services.ec2.model.RouteTableAssociation;import io.github.hectorvent.floci.services.ec2.model.Subnet;import io.github.hectorvent.floci.services.ec2.model.Tag;-import org.mockito.ArgumentCaptor;import org.junit.jupiter.api.Test;+import org.mockito.ArgumentCaptor;import java.util.HashMap;import java.util.List;+import java.util.Map;import java.util.Set;import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;@@ -30,8 +32,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.eq;import static org.mockito.ArgumentMatchers.isNull;-import io.github.hectorvent.floci.core.common.AwsException;-import java.util.Map;import static org.mockito.Mockito.doThrow;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.never;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupCfnProvisionerTest.javaindex c0c94246d9..9941d1648b 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupCfnProvisionerTest.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 io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.cloudformation.CloudFormationTemplateEngine;import io.github.hectorvent.floci.services.cloudformation.model.StackResource;import io.github.hectorvent.floci.services.ec2.Ec2Service;@@ -18,20 +19,19 @@ import java.util.List;import java.util.Map;import java.util.Set;+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyList;import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.ArgumentMatchers.eq;+import static org.mockito.Mockito.doThrow;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.never;import static org.mockito.Mockito.verify;import static org.mockito.Mockito.when;-import io.github.hectorvent.floci.core.common.AwsException;-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;-import static org.junit.jupiter.api.Assertions.assertThrows;-import static org.mockito.Mockito.doThrow;/*** {@code AWS::EC2::SecurityGroup} in isolation: the attributes Ref and Fn::GetAtt read, thediff --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 2dfbeba725..586dad1632 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@@ -6,11 +6,11 @@ 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.cloudformation.model.StackResource;-import io.github.hectorvent.floci.services.ec2.model.UserIdGroupPair;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.model.IpPermission;import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;import io.github.hectorvent.floci.services.ec2.model.SecurityGroupRule;+import io.github.hectorvent.floci.services.ec2.model.UserIdGroupPair;import org.junit.jupiter.api.Test;import org.mockito.ArgumentCaptor;import org.mockito.InOrder;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 922b0233a8..e4def3e78d 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@@ -28,8 +28,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.ArgumentMatchers.eq;-import static org.mockito.Mockito.mock;import static org.mockito.Mockito.doThrow;+import static org.mockito.Mockito.mock;import static org.mockito.Mockito.never;import static org.mockito.Mockito.times;import static org.mockito.Mockito.verify;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LambdaAddressingCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LambdaAddressingCfnProvisionerTest.javaindex 7ef5bd2eb0..f1d20a75d1 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LambdaAddressingCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LambdaAddressingCfnProvisionerTest.java@@ -18,8 +18,8 @@ import java.util.Map;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertNull;-import static org.junit.jupiter.api.Assertions.assertTrue;import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyMap;import static org.mockito.ArgumentMatchers.anyString;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsMetricFilterCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsMetricFilterCfnProvisionerTest.javaindex 61507f2e49..a068e883fa 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsMetricFilterCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/LogsMetricFilterCfnProvisionerTest.java@@ -6,8 +6,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;-import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;+import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.cloudformation.CloudFormationTemplateEngine;import io.github.hectorvent.floci.services.cloudformation.model.StackResource;@@ -19,10 +19,10 @@ import io.github.hectorvent.floci.services.cloudwatch.metrics.CloudWatchMetricsSimport org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.junit.jupiter.params.ParameterizedTest;-import org.junit.jupiter.params.provider.ValueSource;import org.junit.jupiter.params.provider.Arguments;import org.junit.jupiter.params.provider.MethodSource;import org.junit.jupiter.params.provider.NullSource;+import org.junit.jupiter.params.provider.ValueSource;import java.util.ArrayList;import java.util.Arrays;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Route53CfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Route53CfnProvisionerTest.javaindex 9cf7b53d1e..194a8b9d5b 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Route53CfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Route53CfnProvisionerTest.java@@ -19,10 +19,10 @@ import java.util.Map;import java.util.Set;import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertSame;+import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.argThat;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontOriginSecurityTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontOriginSecurityTest.javaindex a92ee028de..46669c1af6 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontOriginSecurityTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontOriginSecurityTest.java@@ -4,8 +4,8 @@ import io.github.hectorvent.floci.core.common.SsrfProtection;import io.github.hectorvent.floci.services.cloudfront.model.Origin;import org.junit.jupiter.api.Test;-import java.net.InetAddress;import java.net.Inet6Address;+import java.net.InetAddress;import java.net.URI;import java.util.LinkedHashMap;import java.util.Map;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontS3AuthServingTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontS3AuthServingTest.javaindex 9df12bf22d..7ac7503cac 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontS3AuthServingTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontS3AuthServingTest.java@@ -1,7 +1,7 @@package io.github.hectorvent.floci.services.cloudfront;-import io.github.hectorvent.floci.services.cloudfront.model.DefaultCacheBehavior;import io.github.hectorvent.floci.services.cloudfront.model.CloudFrontOriginAccessIdentity;+import io.github.hectorvent.floci.services.cloudfront.model.DefaultCacheBehavior;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;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 37ba1b2e43..c3b2e3d2da 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@@ -8,7 +8,6 @@ import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.cloudfront.model.CacheBehavior;import io.github.hectorvent.floci.services.cloudfront.model.CachePolicy;-import io.github.hectorvent.floci.services.cloudfront.model.OriginRequestPolicy;import io.github.hectorvent.floci.services.cloudfront.model.CloudFrontFunction;import io.github.hectorvent.floci.services.cloudfront.model.CloudFrontOriginAccessIdentity;import io.github.hectorvent.floci.services.cloudfront.model.DefaultCacheBehavior;@@ -17,6 +16,7 @@ import io.github.hectorvent.floci.services.cloudfront.model.DistributionConfig;import io.github.hectorvent.floci.services.cloudfront.model.KeyGroup;import io.github.hectorvent.floci.services.cloudfront.model.Origin;import io.github.hectorvent.floci.services.cloudfront.model.OriginAccessControl;+import io.github.hectorvent.floci.services.cloudfront.model.OriginRequestPolicy;import io.github.hectorvent.floci.services.cloudfront.model.PublicKey;import io.github.hectorvent.floci.services.cloudfront.model.ResponseHeadersPolicy;import io.github.hectorvent.floci.services.cloudfront.model.StreamingDistribution;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudmap/CloudMapDnsResolutionTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudmap/CloudMapDnsResolutionTest.javaindex b7a3bfdbc2..d2eeb6eb09 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudmap/CloudMapDnsResolutionTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudmap/CloudMapDnsResolutionTest.java@@ -18,8 +18,8 @@ import java.util.UUID;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertTrue;import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;/*** Cloud Map's control plane always accepted namespaces, services and instances, but nothingdiff --git a/src/test/java/io/github/hectorvent/floci/services/cloudtrail/CloudTrailNameValidationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudtrail/CloudTrailNameValidationTest.javaindex 3e62b7f774..bede3b75e4 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudtrail/CloudTrailNameValidationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudtrail/CloudTrailNameValidationTest.java@@ -1,13 +1,13 @@package io.github.hectorvent.floci.services.cloudtrail;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.containsString;-import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;@QuarkusTestclass CloudTrailNameValidationTest {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 fb9bd0a6ec..8b8d9785e4 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@@ -20,12 +20,12 @@ import static org.hamcrest.MatcherAssert.assertThat;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.is;import static org.hamcrest.Matchers.not;-import static org.mockito.Mockito.mock;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;+import static org.mockito.Mockito.mock;/*** Handler-level tests for ARN-based log group/stream resolution (issue #1164).diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsInputConstraintTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsInputConstraintTest.javaindex 5cf686dbd2..bfe595c8e4 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsInputConstraintTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsInputConstraintTest.java@@ -10,9 +10,9 @@ import io.github.hectorvent.floci.services.cloudwatch.metrics.CloudWatchMetricsSimport org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;-import static org.mockito.Mockito.mock;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.mockito.Mockito.mock;/*** Enforcement of the input constraints the 2014-03-28 model pins on thediff --git a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsMetricFilterRetryIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsMetricFilterRetryIntegrationTest.javaindex 12a09aa8d4..44126e06c2 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsMetricFilterRetryIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsMetricFilterRetryIntegrationTest.java@@ -2,10 +2,10 @@ package io.github.hectorvent.floci.services.cloudwatch.logs;import io.github.hectorvent.floci.services.cloudwatch.metrics.CloudWatchMetricsService;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;-import io.quarkus.test.junit.mockito.InjectSpy;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.QuarkusTestProfile;import io.quarkus.test.junit.TestProfile;+import io.quarkus.test.junit.mockito.InjectSpy;import io.restassured.response.Response;import jakarta.inject.Inject;import org.junit.jupiter.api.AfterEach;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandlerTest.javaindex 89628e66df..9057f2119b 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandlerTest.java@@ -1,9 +1,5 @@package io.github.hectorvent.floci.services.cloudwatch.metrics;-import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertTrue;-import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ArrayNode;@@ -13,11 +9,16 @@ import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.services.cloudwatch.dashboards.CloudWatchDashboardsService;import io.github.hectorvent.floci.services.cloudwatch.metricstreams.CloudWatchMetricStreamsService;import jakarta.ws.rs.core.Response;-import java.math.BigDecimal;-import java.time.Instant;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;+import java.math.BigDecimal;+import java.time.Instant;++import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertTrue;+/*** Handler-level tests for CloudWatchMetricsJsonHandler.*diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandlerTest.javaindex 6f465c26a4..a3eaa5e1f7 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandlerTest.java@@ -1,8 +1,8 @@package io.github.hectorvent.floci.services.cloudwatch.metrics;import io.github.hectorvent.floci.services.cloudwatch.dashboards.CloudWatchDashboardsService;-import io.github.hectorvent.floci.services.cloudwatch.metricstreams.CloudWatchMetricStreamsService;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.MetricAlarm;+import io.github.hectorvent.floci.services.cloudwatch.metricstreams.CloudWatchMetricStreamsService;import jakarta.ws.rs.core.MultivaluedHashMap;import jakarta.ws.rs.core.MultivaluedMap;import org.junit.jupiter.api.Test;@@ -11,9 +11,9 @@ import org.mockito.ArgumentCaptor;import java.util.List;import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertTrue;-import static org.junit.jupiter.api.Assertions.assertFalse;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyInt;import static org.mockito.ArgumentMatchers.anyString;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsTagsTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsTagsTest.javaindex db5770aa2a..1f91803e6f 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsTagsTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsTagsTest.java@@ -6,8 +6,8 @@ import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.services.cloudwatch.dashboards.CloudWatchDashboardsService;-import io.github.hectorvent.floci.services.cloudwatch.metricstreams.CloudWatchMetricStreamsService;import io.github.hectorvent.floci.services.cloudwatch.metrics.model.MetricAlarm;+import io.github.hectorvent.floci.services.cloudwatch.metricstreams.CloudWatchMetricStreamsService;import jakarta.ws.rs.core.MultivaluedHashMap;import jakarta.ws.rs.core.MultivaluedMap;import jakarta.ws.rs.core.Response;diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsIntegrationTest.javaindex c37c672d4b..5c25ea9866 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsIntegrationTest.java@@ -14,8 +14,8 @@ import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasItem;import static org.hamcrest.Matchers.hasSize;-import static org.hamcrest.Matchers.notNullValue;import static org.hamcrest.Matchers.not;+import static org.hamcrest.Matchers.notNullValue;/*** Metric streams reach the emulator over the Query protocol from the Terraform AWS providerdiff --git a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsServiceTest.javaindex 66b8bebf88..27114dbb2d 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metricstreams/CloudWatchMetricStreamsServiceTest.java@@ -1,10 +1,10 @@package io.github.hectorvent.floci.services.cloudwatch.metricstreams;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.InMemoryStorage;import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStream;-import io.github.hectorvent.floci.core.common.PaginatedResult;import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStreamFilter;import io.github.hectorvent.floci.services.cloudwatch.metricstreams.model.MetricStreamStatisticsConfiguration;import org.junit.jupiter.api.BeforeEach;diff --git a/src/test/java/io/github/hectorvent/floci/services/codeartifact/CodeArtifactServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/codeartifact/CodeArtifactServiceTest.javaindex 61c6bea3ca..892ff5f4be 100644--- a/src/test/java/io/github/hectorvent/floci/services/codeartifact/CodeArtifactServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/codeartifact/CodeArtifactServiceTest.java@@ -9,9 +9,9 @@ import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.services.codeartifact.CodeArtifactService.AuthorizationToken;import io.github.hectorvent.floci.services.codeartifact.CodeArtifactService.AuthorizationTokenScope;import io.github.hectorvent.floci.services.codeartifact.CodeArtifactService.DomainView;-import io.github.hectorvent.floci.services.codeartifact.CodeArtifactService.ResourcePolicy;import io.github.hectorvent.floci.services.codeartifact.CodeArtifactService.PackageVersionAssetResult;import io.github.hectorvent.floci.services.codeartifact.CodeArtifactService.PublishPackageVersionResult;+import io.github.hectorvent.floci.services.codeartifact.CodeArtifactService.ResourcePolicy;import io.github.hectorvent.floci.services.codeartifact.model.CodeArtifactDomain;import io.github.hectorvent.floci.services.codeartifact.model.CodeArtifactPackageVersion;import io.github.hectorvent.floci.services.codeartifact.model.CodeArtifactRepository;diff --git a/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildServicePersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildServicePersistenceTest.javaindex 5768cb62ec..8f0137599b 100644--- a/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildServicePersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildServicePersistenceTest.java@@ -2,9 +2,9 @@ package io.github.hectorvent.floci.services.codebuild;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.codebuild.model.Build;import io.github.hectorvent.floci.services.codebuild.model.Project;diff --git a/src/test/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployServicePersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployServicePersistenceTest.javaindex b103f4117f..08a4c7a017 100644--- a/src/test/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployServicePersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployServicePersistenceTest.java@@ -3,9 +3,9 @@ package io.github.hectorvent.floci.services.codedeploy;import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.codedeploy.model.DeploymentGroup;import io.github.hectorvent.floci.services.ec2.Ec2Service;diff --git a/src/test/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineIntegrationTest.javaindex f07f797f3f..3e3890030e 100644--- a/src/test/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineIntegrationTest.java@@ -22,14 +22,14 @@ import java.util.concurrent.atomic.AtomicReference;import static io.restassured.RestAssured.given;import static org.awaitility.Awaitility.await;-import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;-import static org.junit.jupiter.api.Assertions.assertTrue;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasItem;import static org.hamcrest.Matchers.hasSize;import static org.hamcrest.Matchers.notNullValue;import static org.hamcrest.Matchers.nullValue;+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;+import static org.junit.jupiter.api.Assertions.assertTrue;@QuarkusTestclass CodePipelineIntegrationTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineV2ConditionsTest.java b/src/test/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineV2ConditionsTest.javaindex 0ca8a30c48..819d6c4e11 100644--- a/src/test/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineV2ConditionsTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineV2ConditionsTest.java@@ -9,8 +9,8 @@ import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.codebuild.CodeBuildService;-import io.github.hectorvent.floci.services.codepipeline.model.CodePipelineExecution;import io.github.hectorvent.floci.services.codedeploy.CodeDeployService;+import io.github.hectorvent.floci.services.codepipeline.model.CodePipelineExecution;import io.github.hectorvent.floci.services.eventbridge.EventBridgeService;import io.github.hectorvent.floci.services.lambda.LambdaService;import io.github.hectorvent.floci.services.lambda.model.InvocationType;@@ -21,8 +21,8 @@ import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.mockito.ArgumentCaptor;-import java.time.Duration;import java.io.IOException;+import java.time.Duration;import java.time.Instant;import java.util.ArrayList;import java.util.List;diff --git a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoAttributeVerificationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoAttributeVerificationIntegrationTest.javaindex c98e36e041..7011e4e5a1 100644--- a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoAttributeVerificationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoAttributeVerificationIntegrationTest.java@@ -17,10 +17,10 @@ import java.util.regex.Pattern;import static io.github.hectorvent.floci.services.cognito.CognitoRestAssuredUtils.cognitoAction;import static io.github.hectorvent.floci.services.cognito.CognitoRestAssuredUtils.cognitoJson;import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.equalTo;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertTrue;-import static org.hamcrest.Matchers.equalTo;@QuarkusTest@TestMethodOrder(MethodOrderer.OrderAnnotation.class)diff --git a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoIdentityProviderIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoIdentityProviderIntegrationTest.javaindex 27b88799e3..551910c50e 100644--- a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoIdentityProviderIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoIdentityProviderIntegrationTest.java@@ -3,17 +3,18 @@ package io.github.hectorvent.floci.services.cognito;import com.fasterxml.jackson.databind.JsonNode;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;-import java.util.concurrent.CyclicBarrier;-import java.util.concurrent.ExecutorService;-import java.util.concurrent.Executors;-import java.util.concurrent.Future;-import java.util.concurrent.TimeUnit;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;+import java.util.concurrent.CyclicBarrier;+import java.util.concurrent.ExecutorService;+import java.util.concurrent.Executors;+import java.util.concurrent.Future;+import java.util.concurrent.TimeUnit;+import static io.github.hectorvent.floci.services.cognito.CognitoRestAssuredUtils.cognitoAction;import static io.github.hectorvent.floci.services.cognito.CognitoRestAssuredUtils.cognitoJson;import static org.hamcrest.Matchers.equalTo;diff --git a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoIntegrationTest.javaindex 568c6f4453..769556275f 100644--- a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoIntegrationTest.java@@ -20,29 +20,29 @@ import java.security.KeyFactory;import java.security.PublicKey;import java.security.Signature;import java.security.spec.RSAPublicKeySpec;-import java.util.regex.Matcher;-import java.util.regex.Pattern;import java.util.ArrayList;import java.util.Base64;import java.util.List;import java.util.Spliterators;import java.util.UUID;+import java.util.regex.Matcher;+import java.util.regex.Pattern;import java.util.stream.Stream;import java.util.stream.StreamSupport;import static io.github.hectorvent.floci.services.cognito.CognitoRestAssuredUtils.cognitoAction;import static io.github.hectorvent.floci.services.cognito.CognitoRestAssuredUtils.cognitoJson;import static io.restassured.RestAssured.given;-import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertNotEquals;-import static org.junit.jupiter.api.Assertions.assertNotNull;-import static org.junit.jupiter.api.Assertions.assertTrue;import static org.hamcrest.MatcherAssert.assertThat;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasSize;import static org.hamcrest.Matchers.notNullValue;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertNotEquals;+import static org.junit.jupiter.api.Assertions.assertNotNull;+import static org.junit.jupiter.api.Assertions.assertTrue;@QuarkusTest@TestMethodOrder(MethodOrderer.OrderAnnotation.class)diff --git a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoLambdaTriggersTest.java b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoLambdaTriggersTest.javaindex 2edc9d757c..ed5e7ed66a 100644--- a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoLambdaTriggersTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoLambdaTriggersTest.java@@ -31,6 +31,8 @@ import org.junit.jupiter.params.provider.ValueSource;import org.mockito.ArgumentCaptor;import org.mockito.invocation.InvocationOnMock;+import javax.crypto.Mac;+import javax.crypto.spec.SecretKeySpec;import java.io.IOException;import java.nio.charset.StandardCharsets;import java.time.Duration;@@ -48,8 +50,6 @@ import java.util.concurrent.Executors;import java.util.concurrent.Future;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicReference;-import javax.crypto.Mac;-import javax.crypto.spec.SecretKeySpec;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;diff --git a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoOptionalTotpMfaTest.java b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoOptionalTotpMfaTest.javaindex 5e9dae1c53..4edc28d805 100644--- a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoOptionalTotpMfaTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoOptionalTotpMfaTest.java@@ -13,6 +13,8 @@ import io.github.hectorvent.floci.testing.MutableClock;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;+import javax.crypto.Mac;+import javax.crypto.spec.SecretKeySpec;import java.math.BigInteger;import java.nio.charset.StandardCharsets;import java.security.MessageDigest;@@ -20,8 +22,6 @@ import java.util.Arrays;import java.util.Base64;import java.util.List;import java.util.Map;-import javax.crypto.Mac;-import javax.crypto.spec.SecretKeySpec;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;diff --git a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoServiceTest.javaindex 7639c4a751..f9f64d3e2d 100644--- a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoServiceTest.java@@ -26,12 +26,12 @@ import io.github.hectorvent.floci.services.cognito.verification.VerificationCodeimport io.github.hectorvent.floci.services.cognito.verification.VerificationCodeException;import io.github.hectorvent.floci.services.cognito.verification.VerificationCodeService;import io.github.hectorvent.floci.testing.MutableClock;-import org.mockito.ArgumentCaptor;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Nested;import org.junit.jupiter.api.Test;import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.CsvSource;+import org.mockito.ArgumentCaptor;import java.nio.charset.StandardCharsets;import java.time.Clock;diff --git a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoTotpMfaTest.java b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoTotpMfaTest.javaindex 2c79ea5ce5..85c641d5dd 100644--- a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoTotpMfaTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoTotpMfaTest.java@@ -12,6 +12,8 @@ import io.github.hectorvent.floci.testing.MutableClock;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;+import javax.crypto.Mac;+import javax.crypto.spec.SecretKeySpec;import java.math.BigInteger;import java.nio.charset.StandardCharsets;import java.security.MessageDigest;@@ -20,8 +22,6 @@ import java.util.Arrays;import java.util.Base64;import java.util.List;import java.util.Map;-import javax.crypto.Mac;-import javax.crypto.spec.SecretKeySpec;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;diff --git a/src/test/java/io/github/hectorvent/floci/services/comprehend/ComprehendIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/comprehend/ComprehendIntegrationTest.javaindex 60e96a0ba9..8695ea3527 100644--- a/src/test/java/io/github/hectorvent/floci/services/comprehend/ComprehendIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/comprehend/ComprehendIntegrationTest.java@@ -3,6 +3,7 @@ import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.*;/**diff --git a/src/test/java/io/github/hectorvent/floci/services/configservice/AwsConfigServicePersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/configservice/AwsConfigServicePersistenceTest.javaindex 68f9c69c25..e2872516bc 100644--- a/src/test/java/io/github/hectorvent/floci/services/configservice/AwsConfigServicePersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/configservice/AwsConfigServicePersistenceTest.java@@ -2,9 +2,9 @@ package io.github.hectorvent.floci.services.configservice;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.configservice.model.ConfigEvaluation;import io.github.hectorvent.floci.services.configservice.model.ConfigRule;diff --git a/src/test/java/io/github/hectorvent/floci/services/controltower/ControlTowerControllerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/controltower/ControlTowerControllerIntegrationTest.javaindex 3d6a7514b9..7cd889f95f 100644--- a/src/test/java/io/github/hectorvent/floci/services/controltower/ControlTowerControllerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/controltower/ControlTowerControllerIntegrationTest.java@@ -4,9 +4,9 @@ import io.github.hectorvent.floci.services.organizations.OrganizationsService;import io.github.hectorvent.floci.services.organizations.model.Organization;import io.github.hectorvent.floci.services.organizations.model.OrganizationalUnit;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;-import jakarta.inject.Inject;import io.quarkus.test.junit.QuarkusTest;import io.restassured.response.Response;+import jakarta.inject.Inject;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;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 56b6c1aecc..58fb114cf0 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@@ -9,10 +9,10 @@ import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.docdb.container.DocDbContainerManager;import io.github.hectorvent.floci.services.docdb.model.DocDbCluster;import io.github.hectorvent.floci.services.docdb.model.DocDbInstance;-import org.junit.jupiter.api.Test;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.kms.KmsService;import io.github.hectorvent.floci.services.rds.RdsService;+import org.junit.jupiter.api.Test;import org.mockito.Mockito;import java.util.concurrent.CountDownLatch;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 ed1ce82f4e..ac4b996765 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@@ -2,39 +2,40 @@ package io.github.hectorvent.floci.services.docdb;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.BackupWindows;+import io.github.hectorvent.floci.core.common.RegionResolver;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 io.github.hectorvent.floci.services.docdb.container.DocDbContainerManager;import io.github.hectorvent.floci.services.docdb.model.DocDbCluster;-import io.github.hectorvent.floci.services.docdb.model.DocDbInstance;-import org.junit.jupiter.api.BeforeEach;-import org.junit.jupiter.api.Test;import io.github.hectorvent.floci.services.docdb.model.DocDbClusterSettings;+import io.github.hectorvent.floci.services.docdb.model.DocDbInstance;import io.github.hectorvent.floci.services.docdb.model.DocDbInstanceSettings;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;import io.github.hectorvent.floci.services.kms.KmsService;import io.github.hectorvent.floci.services.kms.model.KmsKey;import io.github.hectorvent.floci.services.rds.RdsService;-import io.github.hectorvent.floci.services.rds.model.DbSubnetGroup;import io.github.hectorvent.floci.services.rds.model.DbClusterParameterGroup;+import io.github.hectorvent.floci.services.rds.model.DbSubnetGroup;+import org.junit.jupiter.api.BeforeEach;+import org.junit.jupiter.api.Test;import org.mockito.Mockito;-import static org.junit.jupiter.api.Assertions.assertNull;-import static org.mockito.ArgumentMatchers.anyList;import java.util.List;import java.util.Map;+import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertNotNull;+import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;-import static org.mockito.ArgumentMatchers.eq;+import static org.mockito.ArgumentMatchers.anyList;import static org.mockito.ArgumentMatchers.anyString;+import static org.mockito.ArgumentMatchers.eq;import static org.mockito.Mockito.never;import static org.mockito.Mockito.verify;import static org.mockito.Mockito.when;diff --git a/src/test/java/io/github/hectorvent/floci/services/docdb/container/DocDbContainerManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/docdb/container/DocDbContainerManagerTest.javaindex ba16646cfd..1f87e67460 100644--- a/src/test/java/io/github/hectorvent/floci/services/docdb/container/DocDbContainerManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/docdb/container/DocDbContainerManagerTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.docdb.container;+import com.github.dockerjava.api.DockerClient;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;@@ -7,7 +8,6 @@ import io.github.hectorvent.floci.core.common.docker.ContainerDetector;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 com.github.dockerjava.api.DockerClient;import org.jboss.logging.Logger;import org.junit.jupiter.api.Test;import org.mockito.Mockito;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 6309356359..732fc61cbe 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@@ -1,5 +1,8 @@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.RegionResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;@@ -15,9 +18,6 @@ import io.github.hectorvent.floci.services.dynamodb.model.TableDefinition;import io.github.hectorvent.floci.services.kinesis.KinesisService;import io.github.hectorvent.floci.services.kinesis.model.KinesisRecord;import io.github.hectorvent.floci.services.kinesis.model.KinesisStream;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ObjectNode;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.RepeatedTest;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbExportIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbExportIntegrationTest.javaindex 4935dba805..e8d45128ba 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbExportIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbExportIntegrationTest.java@@ -6,9 +6,9 @@ import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;+import java.io.BufferedReader;import java.io.ByteArrayInputStream;import java.io.InputStreamReader;-import java.io.BufferedReader;import java.nio.charset.StandardCharsets;import java.util.zip.GZIPInputStream;diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbKinesisStreamingIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbKinesisStreamingIntegrationTest.javaindex e9ea90a45a..fc6c02fb37 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbKinesisStreamingIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbKinesisStreamingIntegrationTest.java@@ -1,5 +1,7 @@package io.github.hectorvent.floci.services.dynamodb;+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;import io.restassured.response.Response;@@ -10,9 +12,6 @@ import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import java.time.Duration;import java.util.Base64;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 0be82cf04f..5e7c481e8b 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@@ -13,11 +13,10 @@ import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.CsvSource;import org.junit.jupiter.params.provider.ValueSource;-import java.util.stream.Collectors;-import java.util.stream.IntStream;-import java.util.Arrays;import java.util.List;+import java.util.stream.Collectors;+import java.util.stream.IntStream;import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;import static org.junit.jupiter.api.Assertions.assertEquals;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 d6a787bbac..844e8f7714 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,6 +1,9 @@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.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.storage.AccountAwareStorageBackend;@@ -16,9 +19,6 @@ import io.github.hectorvent.floci.services.dynamodb.model.LocalSecondaryIndex;import io.github.hectorvent.floci.services.dynamodb.model.TableDefinition;import io.github.hectorvent.floci.services.s3.S3Service;import io.github.hectorvent.floci.services.s3.model.S3Object;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.node.ObjectNode;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.function.Executable;diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbStreamServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbStreamServiceTest.javaindex a5412fc9a1..73ce06ab5a 100644--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbStreamServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbStreamServiceTest.java@@ -1,5 +1,7 @@package io.github.hectorvent.floci.services.dynamodb;+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.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;@@ -9,8 +11,6 @@ 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.StreamDescription;import io.github.hectorvent.floci.services.dynamodb.model.TableDefinition;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;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 31d75e766f..7ff70e868c 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@@ -3,13 +3,12 @@ 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;import org.junit.jupiter.api.Nested;import org.junit.jupiter.api.Test;import java.util.List;-import io.github.hectorvent.floci.core.common.AwsException;-import static org.junit.jupiter.api.Assertions.*;class ExpressionEvaluatorTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManagerTest.javaindex 6b95456cb6..f9c584e50c 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManagerTest.java@@ -11,6 +11,7 @@ import com.github.dockerjava.api.command.InspectContainerResponse;import com.github.dockerjava.api.command.InspectExecCmd;import com.github.dockerjava.api.command.InspectExecResponse;import com.github.dockerjava.api.command.ListContainersCmd;+import com.github.dockerjava.api.command.PingCmd;import com.github.dockerjava.api.command.StartContainerCmd;import com.github.dockerjava.api.exception.DockerException;import com.github.dockerjava.api.model.Container;@@ -18,30 +19,30 @@ import com.github.dockerjava.api.model.ContainerConfig;import com.github.dockerjava.api.model.ContainerNetwork;import com.github.dockerjava.api.model.Frame;import com.github.dockerjava.api.model.HostConfig;-import com.github.dockerjava.api.model.StreamType;-import java.nio.charset.StandardCharsets;import com.github.dockerjava.api.model.NetworkSettings;+import com.github.dockerjava.api.model.StreamType;import io.github.hectorvent.floci.config.EmulatorConfig;-import io.github.hectorvent.floci.services.ec2.net.VpcNetworkManager;-import io.github.hectorvent.floci.services.ec2.portforward.Ec2PortForwardManager;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;import io.github.hectorvent.floci.core.common.docker.ContainerDetector;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager;-import io.github.hectorvent.floci.core.common.docker.UserDataPipeline;import io.github.hectorvent.floci.core.common.docker.ContainerLogStreamer;import io.github.hectorvent.floci.core.common.docker.ContainerReachableEndpoint;import io.github.hectorvent.floci.core.common.docker.ContainerSpec;import io.github.hectorvent.floci.core.common.docker.DockerHostResolver;import io.github.hectorvent.floci.core.common.docker.PortAllocator;+import io.github.hectorvent.floci.core.common.docker.UserDataPipeline;import io.github.hectorvent.floci.services.ec2.model.Instance;import io.github.hectorvent.floci.services.ec2.model.InstanceNetworkInterface;+import io.github.hectorvent.floci.services.ec2.net.VpcNetworkManager;+import io.github.hectorvent.floci.services.ec2.portforward.Ec2PortForwardManager;import org.junit.jupiter.api.Test;import org.mockito.ArgumentCaptor;-import java.io.InputStream;import java.io.Closeable;+import java.io.InputStream;+import java.nio.charset.StandardCharsets;import java.time.Duration;import java.util.ArrayList;import java.util.Arrays;@@ -49,8 +50,8 @@ import java.util.HashMap;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import java.util.Set;import java.util.Optional;+import java.util.Set;import java.util.concurrent.ArrayBlockingQueue;import java.util.concurrent.CopyOnWriteArrayList;import java.util.concurrent.CountDownLatch;@@ -68,29 +69,28 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertNull;+import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertTrue;+import static org.mockito.Answers.RETURNS_DEEP_STUBS;+import static org.mockito.Answers.RETURNS_SELF;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyInt;-import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.ArgumentMatchers.anySet;+import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.ArgumentMatchers.eq;-import static org.mockito.Answers.RETURNS_SELF;-import static org.mockito.Answers.RETURNS_DEEP_STUBS;import static org.mockito.Mockito.after;+import static org.mockito.Mockito.atLeastOnce;import static org.mockito.Mockito.doAnswer;+import static org.mockito.Mockito.doNothing;+import static org.mockito.Mockito.doThrow;import static org.mockito.Mockito.doThrow;import static org.mockito.Mockito.mock;-import static org.mockito.Mockito.atLeastOnce;import static org.mockito.Mockito.never;import static org.mockito.Mockito.timeout;import static org.mockito.Mockito.times;import static org.mockito.Mockito.verify;import static org.mockito.Mockito.when;import static org.mockito.Mockito.withSettings;-import com.github.dockerjava.api.command.PingCmd;-import static org.junit.jupiter.api.Assertions.assertNull;-import static org.mockito.Mockito.doNothing;-import static org.mockito.Mockito.doThrow;class Ec2ContainerManagerTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2DuplicateRouteTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2DuplicateRouteTest.javaindex bad3f30968..d29dacf2f0 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2DuplicateRouteTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2DuplicateRouteTest.java@@ -1,17 +1,16 @@package io.github.hectorvent.floci.services.ec2;-import static org.hamcrest.MatcherAssert.assertThat;-import static org.hamcrest.Matchers.containsString;-import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.xml.HasXPath.hasXPath;-+import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import io.quarkus.test.junit.QuarkusTest;import static io.restassured.RestAssured.given;+import static org.hamcrest.MatcherAssert.assertThat;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.xml.HasXPath.hasXPath;/*** A destination identifies a route, so CreateRoute takes each one at most once per table anddiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2EbsEncryptionIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2EbsEncryptionIntegrationTest.javaindex daab146a6a..9232a06806 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2EbsEncryptionIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2EbsEncryptionIntegrationTest.java@@ -1,14 +1,14 @@package io.github.hectorvent.floci.services.ec2;-import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;-import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;+import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.equalTo;+/*** Integration tests for the EBS account-level encryption defaults via the EC2* Query Protocol (form-encoded POST, XML response).diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2FlowLogIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2FlowLogIntegrationTest.javaindex 4593f023fa..5c4d0d4d16 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2FlowLogIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2FlowLogIntegrationTest.java@@ -1,15 +1,15 @@package io.github.hectorvent.floci.services.ec2;-import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.startsWith;-import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;+import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.startsWith;+/*** Integration tests for VPC Flow Logs via the EC2 Query Protocol* (form-encoded POST, XML response).diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ImageCatalogTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ImageCatalogTest.javaindex 84f896d8c0..a65f727c26 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ImageCatalogTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ImageCatalogTest.java@@ -1,19 +1,18 @@package io.github.hectorvent.floci.services.ec2;-import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertThrows;-import static org.junit.jupiter.api.Assertions.assertTrue;+import io.github.hectorvent.floci.core.common.AwsException;+import io.quarkus.test.junit.QuarkusTest;+import jakarta.inject.Inject;+import org.junit.jupiter.api.Test;import java.util.List;import java.util.Set;import java.util.stream.Collectors;-import org.junit.jupiter.api.Test;--import io.quarkus.test.junit.QuarkusTest;-import io.github.hectorvent.floci.core.common.AwsException;-import jakarta.inject.Inject;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;@QuarkusTestclass Ec2ImageCatalogTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceCredentialsTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceCredentialsTest.javaindex 107c0f9ff0..1fa50b7bb8 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceCredentialsTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceCredentialsTest.java@@ -11,8 +11,8 @@ import java.time.Instant;import java.util.List;import java.util.Optional;import java.util.concurrent.Callable;-import java.util.concurrent.Executors;import java.util.concurrent.ExecutorService;+import java.util.concurrent.Executors;import java.util.concurrent.Future;import java.util.stream.IntStream;diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceCreditSpecificationsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceCreditSpecificationsIntegrationTest.javaindex d3337c1cea..189df56964 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceCreditSpecificationsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceCreditSpecificationsIntegrationTest.java@@ -1,16 +1,16 @@package io.github.hectorvent.floci.services.ec2;-import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;-import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertTrue;-import io.quarkus.test.junit.QuarkusTest;import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.Test;import java.util.List;+import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.equalTo;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertTrue;+/*** DescribeInstanceCreditSpecifications on the Query wire. Terraform's aws_instance resource* reads credit_specification from this action and from nowhere else, since CreditSpecificationdiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceMetadataOptionsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceMetadataOptionsIntegrationTest.javaindex 9e6f84faac..ad72f3213a 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceMetadataOptionsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceMetadataOptionsIntegrationTest.java@@ -1,8 +1,5 @@package io.github.hectorvent.floci.services.ec2;-import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;-import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;@@ -11,6 +8,9 @@ import org.junit.jupiter.api.TestMethodOrder;import java.util.UUID;+import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.equalTo;+/*** Instance metadata options on the Query wire. A launch that names MetadataOptions.* is* honoured per instance, DescribeInstances reads the stored values back, anddiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceTypeCatalogTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceTypeCatalogTest.javaindex 005f97b098..5cedcf5a83 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceTypeCatalogTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2InstanceTypeCatalogTest.java@@ -1,19 +1,19 @@package io.github.hectorvent.floci.services.ec2;-import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertNotNull;-import static org.junit.jupiter.api.Assertions.assertThrows;-import static org.junit.jupiter.api.Assertions.assertTrue;+import io.quarkus.test.junit.QuarkusTest;+import jakarta.inject.Inject;+import org.junit.jupiter.api.Test;import java.util.List;import java.util.Optional;import java.util.Set;import java.util.stream.Collectors;-import io.quarkus.test.junit.QuarkusTest;-import jakarta.inject.Inject;-import org.junit.jupiter.api.Test;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertNotNull;+import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;@QuarkusTestclass Ec2InstanceTypeCatalogTest {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 f157db1856..a93cc01723 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@@ -1,23 +1,14 @@package io.github.hectorvent.floci.services.ec2;-import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.containsString;-import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.hamcrest.Matchers.not;-import static org.hamcrest.Matchers.endsWith;-import static org.hamcrest.Matchers.emptyOrNullString;-import static org.hamcrest.Matchers.containsInAnyOrder;-import static org.hamcrest.Matchers.hasItems;-import static org.hamcrest.Matchers.hasItem;-import static org.hamcrest.Matchers.everyItem;-import static org.hamcrest.Matchers.greaterThan;-import static org.hamcrest.Matchers.greaterThanOrEqualTo;-import static org.hamcrest.Matchers.notNullValue;-import static org.hamcrest.Matchers.nullValue;-import static org.hamcrest.MatcherAssert.assertThat;-import static org.hamcrest.Matchers.startsWith;-+import io.quarkus.test.junit.QuarkusTest;import io.restassured.path.xml.XmlPath;+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;+import org.junit.jupiter.api.TestMethodOrder;+import java.io.ByteArrayOutputStream;import java.io.IOException;import java.nio.charset.StandardCharsets;@@ -25,17 +16,25 @@ 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;-import org.junit.jupiter.api.TestMethodOrder;-import io.quarkus.test.junit.QuarkusTest;import static io.restassured.RestAssured.given;-+import static org.hamcrest.MatcherAssert.assertThat;+import static org.hamcrest.Matchers.containsInAnyOrder;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.emptyOrNullString;+import static org.hamcrest.Matchers.endsWith;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.everyItem;+import static org.hamcrest.Matchers.greaterThan;+import static org.hamcrest.Matchers.greaterThanOrEqualTo;+import static org.hamcrest.Matchers.hasItem;+import static org.hamcrest.Matchers.hasItems;import static org.hamcrest.Matchers.matchesRegex;+import static org.hamcrest.Matchers.not;+import static org.hamcrest.Matchers.notNullValue;+import static org.hamcrest.Matchers.nullValue;+import static org.hamcrest.Matchers.startsWith;+import static org.junit.jupiter.api.Assertions.assertEquals;/*** Integration tests for EC2 via the EC2 Query Protocol (form-encoded POST, XML response).diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2Ipv6RouteTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2Ipv6RouteTest.javaindex 00d55d840d..c65c073659 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2Ipv6RouteTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2Ipv6RouteTest.java@@ -1,18 +1,17 @@package io.github.hectorvent.floci.services.ec2;-import static org.hamcrest.MatcherAssert.assertThat;-import static org.hamcrest.Matchers.containsString;-import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.not;-import static org.hamcrest.xml.HasXPath.hasXPath;-+import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import io.quarkus.test.junit.QuarkusTest;import static io.restassured.RestAssured.given;+import static org.hamcrest.MatcherAssert.assertThat;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.not;+import static org.hamcrest.xml.HasXPath.hasXPath;/*** A route is addressed by one destination, and perdiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2LaunchTemplateFieldsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2LaunchTemplateFieldsIntegrationTest.javaindex b60e476634..3ed101fbf0 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2LaunchTemplateFieldsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2LaunchTemplateFieldsIntegrationTest.java@@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test;import java.util.UUID;import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.contains;+import static org.hamcrest.Matchers.equalTo;import static org.junit.jupiter.api.Assertions.assertFalse;/**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 8b18c24bb2..c94fecda73 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@@ -2,8 +2,8 @@ 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;+import org.junit.jupiter.api.Test;import java.util.ArrayList;import java.util.List;@@ -16,8 +16,8 @@ import java.util.concurrent.TimeUnit;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.equalTo;-import static org.junit.jupiter.api.Assertions.assertEquals;import static org.hamcrest.xml.HasXPath.hasXPath;+import static org.junit.jupiter.api.Assertions.assertEquals;/*** ModifyVpcEndpoint. A gateway endpoint is normally declared with its route tables anddiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2NatGatewayAddressIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2NatGatewayAddressIntegrationTest.javaindex 1fac485383..035057041b 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2NatGatewayAddressIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2NatGatewayAddressIntegrationTest.java@@ -1,5 +1,8 @@package io.github.hectorvent.floci.services.ec2;+import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;@@ -7,10 +10,6 @@ import static org.hamcrest.Matchers.matchesRegex;import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.startsWith;-import org.junit.jupiter.api.Test;--import io.quarkus.test.junit.QuarkusTest;-/*** A NAT gateway's natGatewayAddressSet carried only an allocation id. aws_nat_gateway exposes* public_ip, private_ip and network_interface_id as resource outputs, and Gruntwork's VPC modulesdiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2PublicIpOnLaunchTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2PublicIpOnLaunchTest.javaindex 82ab79afa8..3098bac8b2 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2PublicIpOnLaunchTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2PublicIpOnLaunchTest.java@@ -6,13 +6,13 @@ import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.ec2.model.Address;import io.github.hectorvent.floci.services.ec2.model.Image;+import io.github.hectorvent.floci.services.ec2.model.Instance;import io.github.hectorvent.floci.services.ec2.model.InternetGateway;import io.github.hectorvent.floci.services.ec2.model.KeyPair;import io.github.hectorvent.floci.services.ec2.model.LaunchTemplate;import io.github.hectorvent.floci.services.ec2.model.ManagedPrefixList;import io.github.hectorvent.floci.services.ec2.model.NatGateway;import io.github.hectorvent.floci.services.ec2.model.NetworkAcl;-import io.github.hectorvent.floci.services.ec2.model.Instance;import io.github.hectorvent.floci.services.ec2.model.Reservation;import io.github.hectorvent.floci.services.ec2.model.Subnet;import io.github.hectorvent.floci.services.ec2.model.Vpc;diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandlerTest.javaindex 42958a78a9..cb5a989638 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandlerTest.java@@ -1,18 +1,5 @@package io.github.hectorvent.floci.services.ec2;-import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertNull;-import static org.junit.jupiter.api.Assertions.assertSame;-import static org.junit.jupiter.api.Assertions.assertThrows;-import static org.junit.jupiter.api.Assertions.assertTrue;-import static org.mockito.ArgumentMatchers.eq;-import static org.mockito.ArgumentMatchers.anyList;-import static org.mockito.Mockito.mock;-import static org.mockito.Mockito.doThrow;-import static org.mockito.Mockito.verify;-import static org.mockito.Mockito.verifyNoInteractions;-import static org.mockito.Mockito.when;-import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.services.ec2.model.Subnet;import io.github.hectorvent.floci.services.ec2.model.Tag;@@ -27,6 +14,19 @@ import org.mockito.ArgumentCaptor;import java.util.List;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertNull;+import static org.junit.jupiter.api.Assertions.assertSame;+import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;+import static org.mockito.ArgumentMatchers.anyList;+import static org.mockito.ArgumentMatchers.eq;+import static org.mockito.Mockito.doThrow;+import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.verify;+import static org.mockito.Mockito.verifyNoInteractions;+import static org.mockito.Mockito.when;+class Ec2QueryHandlerTest {@ParameterizedTestdiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ReplaceRouteIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ReplaceRouteIntegrationTest.javaindex 378fbc4a19..9e800d5942 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ReplaceRouteIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ReplaceRouteIntegrationTest.java@@ -1,17 +1,16 @@package io.github.hectorvent.floci.services.ec2;-import static org.hamcrest.MatcherAssert.assertThat;-import static org.hamcrest.Matchers.containsString;-import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.not;-+import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import io.quarkus.test.junit.QuarkusTest;import static io.restassured.RestAssured.given;+import static org.hamcrest.MatcherAssert.assertThat;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.not;/*** ReplaceRoute swaps the target of an existing route. AWS takes exactly one target per call, sodiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2RouteCidrCanonicalizationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2RouteCidrCanonicalizationTest.javaindex 19ef5a3973..68cb1aa004 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2RouteCidrCanonicalizationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2RouteCidrCanonicalizationTest.java@@ -1,17 +1,16 @@package io.github.hectorvent.floci.services.ec2;-import static org.hamcrest.MatcherAssert.assertThat;-import static org.hamcrest.Matchers.containsString;-import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.xml.HasXPath.hasXPath;-+import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import io.quarkus.test.junit.QuarkusTest;import static io.restassured.RestAssured.given;+import static org.hamcrest.MatcherAssert.assertThat;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.xml.HasXPath.hasXPath;/*** AWS canonicalizes an IPv4 destination CIDR on input:diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2RunInstancesDryRunIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2RunInstancesDryRunIntegrationTest.javaindex c4bdc3e243..ac64898854 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2RunInstancesDryRunIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2RunInstancesDryRunIntegrationTest.java@@ -8,8 +8,8 @@ import org.junit.jupiter.params.provider.CsvSource;import java.util.UUID;import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.emptyOrNullString;+import static org.hamcrest.Matchers.equalTo;@QuarkusTestclass Ec2RunInstancesDryRunIntegrationTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SecurityGroupPrefixListIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SecurityGroupPrefixListIntegrationTest.javaindex 6ad9199707..470245bda7 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SecurityGroupPrefixListIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SecurityGroupPrefixListIntegrationTest.java@@ -7,8 +7,8 @@ import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.emptyOrNullString;+import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.not;/**diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SecurityGroupRuleSourcesIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SecurityGroupRuleSourcesIntegrationTest.javaindex e1f0cd35a7..cacd1fde2a 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SecurityGroupRuleSourcesIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SecurityGroupRuleSourcesIntegrationTest.java@@ -1,5 +1,8 @@package io.github.hectorvent.floci.services.ec2;+import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;@@ -7,10 +10,6 @@ import static org.hamcrest.Matchers.hasItems;import static org.hamcrest.Matchers.not;import static org.junit.jupiter.api.Assertions.assertTrue;-import org.junit.jupiter.api.Test;--import io.quarkus.test.junit.QuarkusTest;-/*** Issue #2190: a security group rule whose source is another security group must keep that source.*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 c393532b0a..a753daca75 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@@ -3,17 +3,17 @@ package io.github.hectorvent.floci.services.ec2;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;-import io.github.hectorvent.floci.services.ec2.portforward.Ec2PortForwardManager;import io.github.hectorvent.floci.services.ec2.model.IpPermission;import io.github.hectorvent.floci.services.ec2.model.IpRange;import io.github.hectorvent.floci.services.ec2.model.NetworkAcl;import io.github.hectorvent.floci.services.ec2.model.RouteTable;import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;import io.github.hectorvent.floci.services.ec2.model.Tag;+import io.github.hectorvent.floci.services.ec2.portforward.Ec2PortForwardManager;import org.junit.jupiter.api.Test;import java.util.List;diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServicePersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServicePersistenceTest.javaindex 05345da977..c298bbf168 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServicePersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServicePersistenceTest.java@@ -8,28 +8,28 @@ import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.services.ec2.model.Address;import io.github.hectorvent.floci.services.ec2.model.BlockDeviceMapping;import io.github.hectorvent.floci.services.ec2.model.EbsBlockDevice;-import io.github.hectorvent.floci.services.ec2.model.ManagedPrefixList;-import io.github.hectorvent.floci.services.ec2.model.PrefixListEntry;+import io.github.hectorvent.floci.services.ec2.model.Image;import io.github.hectorvent.floci.services.ec2.model.Instance;import io.github.hectorvent.floci.services.ec2.model.InternetGateway;import io.github.hectorvent.floci.services.ec2.model.IpPermission;-import io.github.hectorvent.floci.services.ec2.model.UserIdGroupPair;-import io.github.hectorvent.floci.services.ec2.model.Image;-import io.github.hectorvent.floci.services.ec2.model.NetworkAcl;import io.github.hectorvent.floci.services.ec2.model.KeyPair;import io.github.hectorvent.floci.services.ec2.model.LaunchTemplate;import io.github.hectorvent.floci.services.ec2.model.LaunchTemplateData;+import io.github.hectorvent.floci.services.ec2.model.ManagedPrefixList;import io.github.hectorvent.floci.services.ec2.model.NatGateway;+import io.github.hectorvent.floci.services.ec2.model.NetworkAcl;+import io.github.hectorvent.floci.services.ec2.model.PrefixListEntry;import io.github.hectorvent.floci.services.ec2.model.RouteTable;import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;import io.github.hectorvent.floci.services.ec2.model.SecurityGroupRule;import io.github.hectorvent.floci.services.ec2.model.Snapshot;+import io.github.hectorvent.floci.services.ec2.model.SpotInstanceRequest;import io.github.hectorvent.floci.services.ec2.model.Subnet;import io.github.hectorvent.floci.services.ec2.model.Tag;+import io.github.hectorvent.floci.services.ec2.model.UserIdGroupPair;import io.github.hectorvent.floci.services.ec2.model.Volume;import io.github.hectorvent.floci.services.ec2.model.Vpc;import io.github.hectorvent.floci.services.ec2.model.VpcEndpoint;-import io.github.hectorvent.floci.services.ec2.model.SpotInstanceRequest;import io.github.hectorvent.floci.services.ec2.portforward.Ec2PortForwardManager;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;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 fbaab59eb9..d5158c0c6e 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@@ -8,36 +8,31 @@ 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;import io.github.hectorvent.floci.services.ec2.model.EbsBlockDevice;import io.github.hectorvent.floci.services.ec2.model.GroupIdentifier;import io.github.hectorvent.floci.services.ec2.model.Image;import io.github.hectorvent.floci.services.ec2.model.Instance;-import io.github.hectorvent.floci.services.ec2.model.NetworkInterfaceListResult;+import io.github.hectorvent.floci.services.ec2.model.InstanceState;import io.github.hectorvent.floci.services.ec2.model.IpPermission;+import io.github.hectorvent.floci.services.ec2.model.IpPermission;+import io.github.hectorvent.floci.services.ec2.model.IpRange;import io.github.hectorvent.floci.services.ec2.model.Ipv6Range;import io.github.hectorvent.floci.services.ec2.model.KeyPair;-import io.github.hectorvent.floci.services.ec2.model.SecurityGroupRule;-import io.github.hectorvent.floci.services.ec2.model.UserIdGroupPair;-import io.github.hectorvent.floci.services.ec2.model.InstanceState;-import io.github.hectorvent.floci.services.ec2.net.VpcNetworkManager;import io.github.hectorvent.floci.services.ec2.model.LaunchTemplate;import io.github.hectorvent.floci.services.ec2.model.LaunchTemplateData;import io.github.hectorvent.floci.services.ec2.model.ManagedPrefixList;-import io.github.hectorvent.floci.services.ec2.model.SecurityGroupRule;-import io.github.hectorvent.floci.services.ec2.model.PrefixListId;-import io.github.hectorvent.floci.services.ec2.model.IpPermission;-import io.github.hectorvent.floci.services.ec2.model.IpRange;-import io.github.hectorvent.floci.services.ec2.model.PrefixListEntry;import io.github.hectorvent.floci.services.ec2.model.NetworkInterface;+import io.github.hectorvent.floci.services.ec2.model.NetworkInterfaceListResult;import io.github.hectorvent.floci.services.ec2.model.Placement;+import io.github.hectorvent.floci.services.ec2.model.PrefixList;+import io.github.hectorvent.floci.services.ec2.model.PrefixListEntry;+import io.github.hectorvent.floci.services.ec2.model.PrefixListId;import io.github.hectorvent.floci.services.ec2.model.Reservation;import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;+import io.github.hectorvent.floci.services.ec2.model.SecurityGroupRule;+import io.github.hectorvent.floci.services.ec2.model.SecurityGroupRule;import io.github.hectorvent.floci.services.ec2.model.Snapshot;import io.github.hectorvent.floci.services.ec2.model.Subnet;import io.github.hectorvent.floci.services.ec2.model.Tag;@@ -48,19 +43,24 @@ import io.github.hectorvent.floci.services.ec2.model.TransitGatewayRouteTable;import io.github.hectorvent.floci.services.ec2.model.TransitGatewayRouteTablePropagation;import io.github.hectorvent.floci.services.ec2.model.TransitGatewayVpcAttachment;import io.github.hectorvent.floci.services.ec2.model.TransitGatewayVpcAttachmentOptions;+import io.github.hectorvent.floci.services.ec2.model.UserIdGroupPair;+import io.github.hectorvent.floci.services.ec2.model.Volume;+import io.github.hectorvent.floci.services.ec2.model.VolumeAttachment;import io.github.hectorvent.floci.services.ec2.model.Vpc;import io.github.hectorvent.floci.services.ec2.model.VpcEndpoint;import io.github.hectorvent.floci.services.ec2.model.VpcEndpointSubnetConfiguration;-import io.github.hectorvent.floci.services.ec2.model.Volume;-import io.github.hectorvent.floci.services.ec2.model.VolumeAttachment;+import io.github.hectorvent.floci.services.ec2.net.VpcNetworkManager;+import io.github.hectorvent.floci.services.ec2.portforward.Ec2PortForwardManager;import org.bouncycastle.openssl.PEMKeyPair;import org.bouncycastle.openssl.PEMParser;import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;import org.junit.jupiter.api.Test;import java.io.StringReader;+import java.lang.reflect.Field;import java.security.interfaces.RSAPrivateCrtKey;import java.time.Duration;+import java.util.ArrayList;import java.util.HashMap;import java.util.HashSet;import java.util.List;diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SnapshotBlockPublicAccessIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SnapshotBlockPublicAccessIntegrationTest.javaindex 8d5c7d3d85..2fa322a036 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SnapshotBlockPublicAccessIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SnapshotBlockPublicAccessIntegrationTest.java@@ -1,17 +1,17 @@package io.github.hectorvent.floci.services.ec2;-import static io.restassured.RestAssured.given;-import static org.hamcrest.MatcherAssert.assertThat;-import static org.hamcrest.Matchers.containsString;-import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.not;-import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;+import static io.restassured.RestAssured.given;+import static org.hamcrest.MatcherAssert.assertThat;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.not;+/*** Integration tests for block public access for snapshots over the EC2 Query Protocol* (form-encoded POST, XML response).diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2StartupServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2StartupServiceTest.javaindex a8dfbb154b..a9a7edd833 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2StartupServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2StartupServiceTest.java@@ -8,7 +8,6 @@ import org.junit.jupiter.api.Test;import java.lang.reflect.Method;import static org.junit.jupiter.api.Assertions.assertTrue;-import static org.mockito.Mockito.mock;import static org.mockito.Mockito.verify;diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SubnetAvailabilityZoneIdIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SubnetAvailabilityZoneIdIntegrationTest.javaindex 9d053df81d..2a0a80d1ec 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SubnetAvailabilityZoneIdIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SubnetAvailabilityZoneIdIntegrationTest.java@@ -1,15 +1,14 @@package io.github.hectorvent.floci.services.ec2;+import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.BeforeEach;+import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasItem;-import org.junit.jupiter.api.BeforeEach;-import org.junit.jupiter.api.Test;--import io.quarkus.test.junit.QuarkusTest;-/*** CreateSubnet never read AvailabilityZoneId and hardcoded every new subnet's zone id to the* region's first zone, so a subnet asked for us-east-1-az2 came back in us-east-1-az1, and evendiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SubnetIpv6CidrBlockIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SubnetIpv6CidrBlockIntegrationTest.javaindex 8bdc2cdb97..84badc3284 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SubnetIpv6CidrBlockIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2SubnetIpv6CidrBlockIntegrationTest.java@@ -1,14 +1,13 @@package io.github.hectorvent.floci.services.ec2;+import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.not;-import org.junit.jupiter.api.Test;--import io.quarkus.test.junit.QuarkusTest;-/*** CreateSubnet accepted an Ipv6CidrBlock parameter and silently dropped it: the response always* carried an empty ipv6CidrBlockAssociationSet, so a Terraform aws_subnet with an ipv6_cidr_blockdiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcCidrBlockAssociationFilterIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcCidrBlockAssociationFilterIntegrationTest.javaindex 1aa465a376..783825ca36 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcCidrBlockAssociationFilterIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcCidrBlockAssociationFilterIntegrationTest.java@@ -1,11 +1,10 @@package io.github.hectorvent.floci.services.ec2;-import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;-+import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.Test;-import io.quarkus.test.junit.QuarkusTest;+import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.equalTo;/*** DescribeVpcs ignored the {@code cidr-block-association.*} and {@code ipv6-cidr-block-association.*}diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcCidrBlockAssociationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcCidrBlockAssociationIntegrationTest.javaindex fbd8e860b1..0641996013 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcCidrBlockAssociationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcCidrBlockAssociationIntegrationTest.java@@ -1,11 +1,10 @@package io.github.hectorvent.floci.services.ec2;-import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;-+import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.Test;-import io.quarkus.test.junit.QuarkusTest;+import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.equalTo;/*** AssociateVpcCidrBlock returned cidrBlockState as a bare stringdiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcIpv6CidrBlockIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcIpv6CidrBlockIntegrationTest.javaindex 7bf94ecbb2..6f28a85954 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcIpv6CidrBlockIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcIpv6CidrBlockIntegrationTest.java@@ -1,5 +1,8 @@package io.github.hectorvent.floci.services.ec2;+import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.emptyOrNullString;@@ -7,10 +10,6 @@ import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.matchesRegex;import static org.hamcrest.Matchers.not;-import org.junit.jupiter.api.Test;--import io.quarkus.test.junit.QuarkusTest;-/*** CreateVpc ignored AmazonProvidedIpv6CidrBlock and no response carried an* ipv6CidrBlockAssociationSet at all, so aws_vpc's assign_generated_ipv6_cidr_block neverdiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcPeeringConnectionCrossAccountIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcPeeringConnectionCrossAccountIntegrationTest.javaindex 30ac7a58b5..5d5a9a8341 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcPeeringConnectionCrossAccountIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcPeeringConnectionCrossAccountIntegrationTest.java@@ -1,15 +1,14 @@package io.github.hectorvent.floci.services.ec2;-import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.emptyOrNullString;-import static org.hamcrest.Matchers.equalTo;-+import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import io.quarkus.test.junit.QuarkusTest;+import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.emptyOrNullString;+import static org.hamcrest.Matchers.equalTo;/*** Covers the cross-account and multi-target scenarios the same-account lifecycle testdiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcPeeringConnectionIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcPeeringConnectionIntegrationTest.javaindex a338103b2a..b1ec0fd6ac 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcPeeringConnectionIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcPeeringConnectionIntegrationTest.java@@ -1,18 +1,17 @@package io.github.hectorvent.floci.services.ec2;-import static org.hamcrest.MatcherAssert.assertThat;-import static org.hamcrest.Matchers.containsString;-import static org.hamcrest.Matchers.emptyOrNullString;-import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.not;-+import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import io.quarkus.test.junit.QuarkusTest;import static io.restassured.RestAssured.given;+import static org.hamcrest.MatcherAssert.assertThat;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.emptyOrNullString;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.not;/*** CreateVpcPeeringConnection was entirely unimplemented (floci-k41), blocking all three VPC-peeringdiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/net/VpcNetworkManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/net/VpcNetworkManagerTest.javaindex da8e2d9a96..b14d9d0395 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/net/VpcNetworkManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/net/VpcNetworkManagerTest.java@@ -1,7 +1,5 @@package io.github.hectorvent.floci.services.ec2.net;-import io.github.hectorvent.floci.config.EmulatorConfig;-import io.github.hectorvent.floci.core.common.docker.CurrentContainerNetworkResolver;import com.github.dockerjava.api.DockerClient;import com.github.dockerjava.api.command.ConnectToNetworkCmd;import com.github.dockerjava.api.command.CreateNetworkCmd;@@ -12,6 +10,8 @@ import com.github.dockerjava.api.command.ListNetworksCmd;import com.github.dockerjava.api.command.RemoveNetworkCmd;import com.github.dockerjava.api.exception.NotFoundException;import com.github.dockerjava.api.model.Network;+import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.core.common.docker.CurrentContainerNetworkResolver;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.mockito.ArgumentCaptor;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecr/EcrServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ecr/EcrServiceTest.javaindex eef815a1ff..50c4e96850 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecr/EcrServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecr/EcrServiceTest.java@@ -1,14 +1,16 @@package io.github.hectorvent.floci.services.ecr;+import com.sun.net.httpserver.HttpExchange;+import com.sun.net.httpserver.HttpServer;import io.github.hectorvent.floci.config.EmulatorConfig;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.InMemoryStorage;+import io.github.hectorvent.floci.services.ecr.model.AuthorizationData;import io.github.hectorvent.floci.services.ecr.model.ImageDetail;import io.github.hectorvent.floci.services.ecr.model.ImageIdentifier;-import io.github.hectorvent.floci.services.ecr.model.AuthorizationData;import io.github.hectorvent.floci.services.ecr.model.ImageMetadata;import io.github.hectorvent.floci.services.ecr.model.PullThroughCacheRule;import io.github.hectorvent.floci.services.ecr.model.Repository;@@ -18,9 +20,6 @@ import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.mockito.Mockito;-import com.sun.net.httpserver.HttpExchange;-import com.sun.net.httpserver.HttpServer;-import java.io.IOException;import java.io.OutputStream;import java.net.InetSocketAddress;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryManagerTest.javaindex 35ba7879cf..0ae905d60a 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryManagerTest.java@@ -1,16 +1,5 @@package io.github.hectorvent.floci.services.ecr.registry;-import io.github.hectorvent.floci.config.EmulatorConfig;-import io.github.hectorvent.floci.core.common.RegionResolver;-import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;-import io.github.hectorvent.floci.core.common.docker.ContainerDetector;-import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager;-import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.ContainerPresence;-import io.github.hectorvent.floci.core.common.docker.ContainerLogStreamer;-import io.github.hectorvent.floci.core.common.docker.CurrentContainerNetworkResolver;-import io.github.hectorvent.floci.core.common.docker.ContainerSpec;-import io.github.hectorvent.floci.core.common.docker.HostBlindPortAllocator;-import io.github.hectorvent.floci.core.common.docker.PortAllocator;import com.github.dockerjava.api.DockerClient;import com.github.dockerjava.api.async.ResultCallback;import com.github.dockerjava.api.command.ExecCreateCmd;@@ -25,6 +14,17 @@ import com.github.dockerjava.api.exception.NotFoundException;import com.github.dockerjava.api.model.Container;import com.github.dockerjava.api.model.ContainerPort;import com.github.dockerjava.api.model.Frame;+import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;+import io.github.hectorvent.floci.core.common.docker.ContainerDetector;+import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager;+import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.ContainerPresence;+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.CurrentContainerNetworkResolver;+import io.github.hectorvent.floci.core.common.docker.HostBlindPortAllocator;+import io.github.hectorvent.floci.core.common.docker.PortAllocator;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.junit.jupiter.params.ParameterizedTest;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsDescribeServicesIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsDescribeServicesIntegrationTest.javaindex 9db0b6c0a8..52734959a1 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsDescribeServicesIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsDescribeServicesIntegrationTest.java@@ -8,8 +8,8 @@ import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.endsWith;import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.endsWith;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasSize;import static org.hamcrest.Matchers.startsWith;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsEventPublisherTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsEventPublisherTest.javaindex 95ecdcd99b..e73e7a9d60 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsEventPublisherTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsEventPublisherTest.java@@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.services.ecs.model.Container;-import io.github.hectorvent.floci.services.ecs.model.EcsTask;import io.github.hectorvent.floci.services.ecs.model.EcsServiceModel;+import io.github.hectorvent.floci.services.ecs.model.EcsTask;import io.github.hectorvent.floci.services.ecs.model.TaskStatus;import io.github.hectorvent.floci.services.eventbridge.EventBridgeService;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsFirelensS3ConfigTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsFirelensS3ConfigTest.javaindex 84136f1e7d..2e9a46a823 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsFirelensS3ConfigTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsFirelensS3ConfigTest.java@@ -18,8 +18,8 @@ import java.util.List;import java.util.Map;import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertTrue;import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.eq;import static org.mockito.Mockito.RETURNS_DEEP_STUBS;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServicePersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServicePersistenceTest.javaindex ee379e67c0..a5c05bc25b 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServicePersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServicePersistenceTest.java@@ -3,9 +3,9 @@ package io.github.hectorvent.floci.services.ecs;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ecs.container.EcsContainerManager;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServiceTeardownTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServiceTeardownTest.javaindex 9b33398fcb..3f41617aaf 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServiceTeardownTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsServiceTeardownTest.java@@ -3,9 +3,9 @@ package io.github.hectorvent.floci.services.ecs;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;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.EcsTaskHandle;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsTaskMetadataControllerTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsTaskMetadataControllerTest.javaindex 30e64d72c8..39f19f70ad 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/EcsTaskMetadataControllerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/EcsTaskMetadataControllerTest.java@@ -1,5 +1,11 @@package io.github.hectorvent.floci.services.ecs;+import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.DeserializationFeature;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.json.JsonMapper;+import com.github.dockerjava.api.model.Statistics;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.model.Subnet;@@ -15,12 +21,6 @@ import io.github.hectorvent.floci.services.ecs.model.LogConfiguration;import io.github.hectorvent.floci.services.ecs.model.NetworkConfiguration;import io.github.hectorvent.floci.services.ecs.model.NetworkMode;import io.github.hectorvent.floci.services.ecs.model.TaskDefinition;-import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.DeserializationFeature;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.json.JsonMapper;-import com.github.dockerjava.api.model.Statistics;import jakarta.ws.rs.core.Response;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerAwsBaselineTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerAwsBaselineTest.javaindex 045a85439a..e1901ced28 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerAwsBaselineTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerAwsBaselineTest.java@@ -15,8 +15,8 @@ import io.github.hectorvent.floci.services.ecs.model.EcsTask;import io.github.hectorvent.floci.services.ecs.model.KeyValuePair;import io.github.hectorvent.floci.services.ecs.model.TaskDefinition;import io.github.hectorvent.floci.services.lambda.launcher.ImageCacheService.LaunchImage;-import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.s3.S3Service;+import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.ssm.SsmService;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerEcrRewriteTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerEcrRewriteTest.javaindex 0ea1654c0b..b076528ee6 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerEcrRewriteTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerEcrRewriteTest.java@@ -14,8 +14,8 @@ import io.github.hectorvent.floci.services.ecs.model.ContainerDefinition;import io.github.hectorvent.floci.services.ecs.model.EcsTask;import io.github.hectorvent.floci.services.ecs.model.TaskDefinition;import io.github.hectorvent.floci.services.lambda.launcher.ImageCacheService.LaunchImage;-import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.s3.S3Service;+import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.ssm.SsmService;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerLifecycleTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerLifecycleTest.javaindex 8890790825..9b3cf84c66 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerLifecycleTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerLifecycleTest.java@@ -13,8 +13,8 @@ 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.LaunchedContainerAwsEnv;import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;-import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.s3.S3Service;+import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.ssm.SsmService;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerOverridesTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerOverridesTest.javaindex 37be1c99cb..b9d7afa0e9 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerOverridesTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerOverridesTest.java@@ -15,8 +15,8 @@ import io.github.hectorvent.floci.services.ecs.model.EcsTask;import io.github.hectorvent.floci.services.ecs.model.KeyValuePair;import io.github.hectorvent.floci.services.ecs.model.TaskDefinition;import io.github.hectorvent.floci.services.lambda.launcher.ImageCacheService.LaunchImage;-import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.s3.S3Service;+import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.ssm.SsmService;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerPortMappingsTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerPortMappingsTest.javaindex 2bd73dd3c5..87f5747abf 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerPortMappingsTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerPortMappingsTest.java@@ -19,8 +19,8 @@ import io.github.hectorvent.floci.services.ecs.model.NetworkMode;import io.github.hectorvent.floci.services.ecs.model.PortMapping;import io.github.hectorvent.floci.services.ecs.model.TaskDefinition;import io.github.hectorvent.floci.services.lambda.launcher.ImageCacheService.LaunchImage;-import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.s3.S3Service;+import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.ssm.SsmService;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerSecretsTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerSecretsTest.javaindex 61410d85cc..115a6b5f1e 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerSecretsTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerSecretsTest.java@@ -17,8 +17,8 @@ import io.github.hectorvent.floci.services.ecs.model.KeyValuePair;import io.github.hectorvent.floci.services.ecs.model.Secret;import io.github.hectorvent.floci.services.ecs.model.TaskDefinition;import io.github.hectorvent.floci.services.lambda.launcher.ImageCacheService.LaunchImage;-import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.s3.S3Service;+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 io.github.hectorvent.floci.services.ssm.model.Parameter;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 f5930b6311..a47503e4f8 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@@ -40,9 +40,9 @@ import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyInt;import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.ArgumentMatchers.eq;-import static org.mockito.Mockito.atLeastOnce;import static org.mockito.Mockito.RETURNS_DEEP_STUBS;import static org.mockito.Mockito.RETURNS_SELF;+import static org.mockito.Mockito.atLeastOnce;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.never;import static org.mockito.Mockito.times;diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerVolumesTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerVolumesTest.javaindex 8f7df22897..ea13049f97 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerVolumesTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerVolumesTest.java@@ -17,8 +17,8 @@ import io.github.hectorvent.floci.services.ecs.model.MountPoint;import io.github.hectorvent.floci.services.ecs.model.TaskDefinition;import io.github.hectorvent.floci.services.ecs.model.Volume;import io.github.hectorvent.floci.services.lambda.launcher.ImageCacheService.LaunchImage;-import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.s3.S3Service;+import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.ssm.SsmService;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/eks/EksClusterManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/eks/EksClusterManagerTest.javaindex db45d4b2af..7bb4bed0b4 100644--- a/src/test/java/io/github/hectorvent/floci/services/eks/EksClusterManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/eks/EksClusterManagerTest.java@@ -1,7 +1,25 @@package io.github.hectorvent.floci.services.eks;+import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.github.dockerjava.api.DockerClient;+import com.github.dockerjava.api.async.ResultCallback;+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;+import com.github.dockerjava.api.command.ExecCreateCmd;+import com.github.dockerjava.api.command.ExecCreateCmdResponse;+import com.github.dockerjava.api.command.ExecStartCmd;+import com.github.dockerjava.api.command.InspectContainerCmd;+import com.github.dockerjava.api.command.InspectContainerResponse;+import com.github.dockerjava.api.command.InspectExecCmd;+import com.github.dockerjava.api.command.InspectExecResponse;+import com.github.dockerjava.api.command.InspectVolumeCmd;+import com.github.dockerjava.api.model.Container;+import com.github.dockerjava.api.model.Frame;+import com.github.dockerjava.api.model.Info;+import com.github.dockerjava.api.model.NetworkSettings;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.config.FlociCertificateAuthority;+import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsRegions;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.dns.DnsAnswer;@@ -9,16 +27,21 @@ import io.github.hectorvent.floci.core.common.dns.DnsClientVpcSource.ClientVpc;import io.github.hectorvent.floci.core.common.dns.DnsForwardingRule;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;import io.github.hectorvent.floci.core.common.docker.ContainerDetector;+import io.github.hectorvent.floci.core.common.docker.ContainerExec;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.ContainerInfo;+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 io.github.hectorvent.floci.core.common.docker.PortAllocator;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;+import io.github.hectorvent.floci.services.ec2.Ec2InstanceTypeCatalog;+import io.github.hectorvent.floci.services.ec2.Ec2MetadataServer;+import io.github.hectorvent.floci.services.ec2.model.Instance;+import io.github.hectorvent.floci.services.ec2.model.Placement;import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;import io.github.hectorvent.floci.services.eks.model.CertificateAuthority;-import io.github.hectorvent.floci.core.common.docker.ContainerLogStreamer;import io.github.hectorvent.floci.services.eks.model.Cluster;import io.github.hectorvent.floci.services.eks.model.ClusterIdentity;import io.github.hectorvent.floci.services.eks.model.ClusterOidcKey;@@ -28,38 +51,14 @@ import io.github.hectorvent.floci.services.eks.model.Nodegroup;import io.github.hectorvent.floci.services.eks.model.OidcIdentity;import io.github.hectorvent.floci.services.eks.model.ResourcesVpcConfig;import io.github.hectorvent.floci.testutil.LogCapture;--import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.github.dockerjava.api.DockerClient;-import com.github.dockerjava.api.async.ResultCallback;-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;-import com.github.dockerjava.api.command.ExecCreateCmd;-import com.github.dockerjava.api.command.ExecCreateCmdResponse;-import com.github.dockerjava.api.command.ExecStartCmd;-import com.github.dockerjava.api.command.InspectContainerCmd;-import com.github.dockerjava.api.command.InspectContainerResponse;-import com.github.dockerjava.api.command.InspectExecCmd;-import com.github.dockerjava.api.command.InspectExecResponse;-import com.github.dockerjava.api.command.InspectVolumeCmd;-import com.github.dockerjava.api.model.Container;-import com.github.dockerjava.api.model.Frame;-import com.github.dockerjava.api.model.Info;-import com.github.dockerjava.api.model.NetworkSettings;-import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.docker.ContainerExec;-import io.github.hectorvent.floci.services.ec2.Ec2InstanceTypeCatalog;-import io.github.hectorvent.floci.services.ec2.Ec2MetadataServer;-import io.github.hectorvent.floci.services.ec2.model.Instance;-import io.github.hectorvent.floci.services.ec2.model.Placement;import org.apache.commons.compress.archivers.tar.TarArchiveEntry;import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Nested;import org.junit.jupiter.api.Test;+import org.junit.jupiter.api.io.TempDir;import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.ValueSource;-import org.junit.jupiter.api.io.TempDir;import org.mockito.ArgumentCaptor;import org.mockito.Mockito;diff --git a/src/test/java/io/github/hectorvent/floci/services/eks/EksServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/eks/EksServiceTest.javaindex 7c472c50f9..b275134092 100644--- a/src/test/java/io/github/hectorvent/floci/services/eks/EksServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/eks/EksServiceTest.java@@ -1,13 +1,16 @@package io.github.hectorvent.floci.services.eks;+import com.fasterxml.jackson.core.type.TypeReference;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;import io.github.hectorvent.floci.config.EmulatorConfig;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.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.PersistentStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.ec2.AmiImageResolver;import io.github.hectorvent.floci.services.ec2.Ec2ContainerManager;@@ -19,10 +22,10 @@ import io.github.hectorvent.floci.services.ec2.model.LaunchTemplateData;import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;import io.github.hectorvent.floci.services.ec2.model.Tag;import io.github.hectorvent.floci.services.ec2.portforward.Ec2PortForwardManager;+import io.github.hectorvent.floci.services.eks.model.Cluster;import io.github.hectorvent.floci.services.eks.model.ClusterIdentity;import io.github.hectorvent.floci.services.eks.model.ClusterOidcKey;import io.github.hectorvent.floci.services.eks.model.ClusterStatus;-import io.github.hectorvent.floci.services.eks.model.OidcIdentity;import io.github.hectorvent.floci.services.eks.model.CreateClusterRequest;import io.github.hectorvent.floci.services.eks.model.CreateFargateProfileRequest;import io.github.hectorvent.floci.services.eks.model.CreateNodeGroupRequest;@@ -30,17 +33,14 @@ import io.github.hectorvent.floci.services.eks.model.EncryptionConfig;import io.github.hectorvent.floci.services.eks.model.FargateProfile;import io.github.hectorvent.floci.services.eks.model.FargateProfileStatus;import io.github.hectorvent.floci.services.eks.model.KubernetesNetworkConfig;-import io.github.hectorvent.floci.services.eks.model.Cluster;import io.github.hectorvent.floci.services.eks.model.LogSetup;import io.github.hectorvent.floci.services.eks.model.Logging;import io.github.hectorvent.floci.services.eks.model.Nodegroup;import io.github.hectorvent.floci.services.eks.model.NodegroupScalingConfig;import io.github.hectorvent.floci.services.eks.model.NodegroupStatus;+import io.github.hectorvent.floci.services.eks.model.OidcIdentity;import io.github.hectorvent.floci.services.eks.model.Provider;import io.github.hectorvent.floci.services.eks.model.ResourcesVpcConfig;-import com.fasterxml.jackson.core.type.TypeReference;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;diff --git a/src/test/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkServicePersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkServicePersistenceTest.javaindex ceab78eb44..007555ebda 100644--- a/src/test/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkServicePersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkServicePersistenceTest.java@@ -2,9 +2,9 @@ package io.github.hectorvent.floci.services.elasticbeanstalk;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.elasticbeanstalk.model.BeanstalkApplication;import io.github.hectorvent.floci.services.elasticbeanstalk.model.BeanstalkApplicationVersion;diff --git a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2DefaultAttributesIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2DefaultAttributesIntegrationTest.javaindex e6824b6dd8..19f97a42fa 100644--- a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2DefaultAttributesIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2DefaultAttributesIntegrationTest.java@@ -1,14 +1,13 @@package io.github.hectorvent.floci.services.elbv2;+import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;-import static org.junit.jupiter.api.Assertions.assertEquals;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasItem;import static org.hamcrest.Matchers.not;--import org.junit.jupiter.api.Test;--import io.quarkus.test.junit.QuarkusTest;+import static org.junit.jupiter.api.Assertions.assertEquals;/*** A load balancer or target group that has never been modified used to answer with an emptydiff --git a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2LambdaTargetDataPlaneIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2LambdaTargetDataPlaneIntegrationTest.javaindex d4a05b3fca..bccf2fdef2 100644--- a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2LambdaTargetDataPlaneIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2LambdaTargetDataPlaneIntegrationTest.java@@ -16,10 +16,10 @@ import java.util.zip.ZipEntry;import java.util.zip.ZipOutputStream;import static io.restassured.RestAssured.given;-import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertNotEquals;import static org.hamcrest.Matchers.anyOf;import static org.hamcrest.Matchers.equalTo;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertNotEquals;/*** End-to-end test for the ALB (ELBv2) → Lambda target data plane.diff --git a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2PreserveHostHeaderIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2PreserveHostHeaderIntegrationTest.javaindex 2282f07eb1..ddc2fb0735 100644--- a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2PreserveHostHeaderIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2PreserveHostHeaderIntegrationTest.java@@ -3,8 +3,8 @@ package io.github.hectorvent.floci.services.elbv2;import io.github.hectorvent.floci.testing.RealElbV2DataPlaneProfile;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.TestProfile;-import io.vertx.core.buffer.Buffer;import io.vertx.core.Vertx;+import io.vertx.core.buffer.Buffer;import io.vertx.core.http.HttpClientRequest;import io.vertx.core.http.HttpClientResponse;import io.vertx.core.http.HttpServer;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 966f80a232..2f6c3ae105 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@@ -5,9 +5,9 @@ import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsRegionFacts;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.model.Subnet;diff --git a/src/test/java/io/github/hectorvent/floci/services/emr/EmrIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/emr/EmrIntegrationTest.javaindex 91357b16b6..a3723d5e3c 100644--- a/src/test/java/io/github/hectorvent/floci/services/emr/EmrIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/emr/EmrIntegrationTest.java@@ -1,8 +1,8 @@package io.github.hectorvent.floci.services.emr;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;-import io.restassured.response.Response;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.Response;import jakarta.inject.Inject;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.MethodOrderer;diff --git a/src/test/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeBusToBusIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeBusToBusIntegrationTest.javaindex 56da6ef43a..d8b5f73fae 100644--- a/src/test/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeBusToBusIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeBusToBusIntegrationTest.java@@ -11,8 +11,8 @@ import org.junit.jupiter.api.TestMethodOrder;import java.net.URI;import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.anyOf;+import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.hasSize;import static org.hamcrest.Matchers.nullValue;diff --git a/src/test/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeServiceTest.javaindex 1859eae2d4..bf74011116 100644--- a/src/test/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeServiceTest.java@@ -38,8 +38,8 @@ import static org.junit.jupiter.api.Assertions.*;import static org.mockito.ArgumentMatchers.*;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.never;-import static org.mockito.Mockito.when;import static org.mockito.Mockito.verify;+import static org.mockito.Mockito.when;class EventBridgeServiceTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/eventbridge/ReplayDispatcherTest.java b/src/test/java/io/github/hectorvent/floci/services/eventbridge/ReplayDispatcherTest.javaindex bced379ca9..dcd1cd8556 100644--- a/src/test/java/io/github/hectorvent/floci/services/eventbridge/ReplayDispatcherTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/eventbridge/ReplayDispatcherTest.java@@ -10,9 +10,9 @@ import org.junit.jupiter.api.Test;import java.time.Instant;import java.util.List;import java.util.Map;+import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.CountDownLatch;import java.util.concurrent.TimeUnit;-import java.util.concurrent.ConcurrentHashMap;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertTrue;diff --git a/src/test/java/io/github/hectorvent/floci/services/firehose/FirehoseProcessingConfigurationTest.java b/src/test/java/io/github/hectorvent/floci/services/firehose/FirehoseProcessingConfigurationTest.javaindex 4c51294a87..2f73890861 100644--- a/src/test/java/io/github/hectorvent/floci/services/firehose/FirehoseProcessingConfigurationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/firehose/FirehoseProcessingConfigurationTest.java@@ -5,10 +5,10 @@ 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.core.storage.StorageFactory;+import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.BufferingHints;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.ProcessingConfiguration;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.Processor;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.ProcessorParameter;-import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.BufferingHints;import io.github.hectorvent.floci.services.firehose.model.DeliveryStreamDescription.S3Destination;import io.github.hectorvent.floci.services.kinesis.KinesisService;import io.github.hectorvent.floci.services.s3.S3Service;diff --git a/src/test/java/io/github/hectorvent/floci/services/firehose/FirehoseServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/firehose/FirehoseServiceTest.javaindex 5545a5ca9b..ee278a82e1 100644--- a/src/test/java/io/github/hectorvent/floci/services/firehose/FirehoseServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/firehose/FirehoseServiceTest.java@@ -41,8 +41,8 @@ import java.util.function.UnaryOperator;import static org.junit.jupiter.api.Assertions.assertArrayEquals;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertNull;+import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyMap;diff --git a/src/test/java/io/github/hectorvent/floci/services/floci/duck/FlociDuckClientServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/floci/duck/FlociDuckClientServiceTest.javaindex 83240f1f75..e222e4e21c 100644--- a/src/test/java/io/github/hectorvent/floci/services/floci/duck/FlociDuckClientServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/floci/duck/FlociDuckClientServiceTest.java@@ -1,15 +1,5 @@package io.github.hectorvent.floci.services.floci.duck;-import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.mockito.Mockito.mock;-import static org.mockito.Mockito.when;--import java.net.InetSocketAddress;-import java.nio.charset.StandardCharsets;-import java.util.Optional;-import java.util.concurrent.atomic.AtomicReference;-import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.sun.net.httpserver.HttpServer;@@ -19,6 +9,16 @@ import io.github.hectorvent.floci.core.common.docker.DockerHostResolver;import org.junit.jupiter.api.AfterEach;import org.junit.jupiter.api.Test;+import java.net.InetSocketAddress;+import java.nio.charset.StandardCharsets;+import java.util.Optional;+import java.util.concurrent.atomic.AtomicReference;++import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.when;+class FlociDuckClientServiceTest {private HttpServer server;diff --git a/src/test/java/io/github/hectorvent/floci/services/floci/ui/ConsoleProfileResolverTest.java b/src/test/java/io/github/hectorvent/floci/services/floci/ui/ConsoleProfileResolverTest.javaindex fe3bbc97e0..de735aa54e 100644--- a/src/test/java/io/github/hectorvent/floci/services/floci/ui/ConsoleProfileResolverTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/floci/ui/ConsoleProfileResolverTest.java@@ -1,13 +1,13 @@package io.github.hectorvent.floci.services.floci.ui;+import io.github.hectorvent.floci.config.EmulatorConfig;+import org.junit.jupiter.api.Test;+import java.util.HashMap;import java.util.Map;import java.util.Optional;import java.util.OptionalInt;-import io.github.hectorvent.floci.config.EmulatorConfig;-import org.junit.jupiter.api.Test;-import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertTrue;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 482740e4b6..2c138c00b6 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@@ -1,25 +1,25 @@package io.github.hectorvent.floci.services.floci.ui;import com.fasterxml.jackson.databind.ObjectMapper;+import com.github.dockerjava.api.exception.DockerClientException;+import com.github.dockerjava.api.exception.NotFoundException;+import com.github.dockerjava.api.model.Container;import com.sun.net.httpserver.HttpServer;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RegionResolver;-import io.github.hectorvent.floci.services.iam.model.SessionCreds;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;import io.github.hectorvent.floci.core.common.docker.ContainerDetector;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager;-import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.ContainerPresence;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.ContainerInfo;+import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.ContainerPresence;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.EndpointInfo;import io.github.hectorvent.floci.core.common.docker.ContainerLogStreamer;-import io.github.hectorvent.floci.core.common.docker.CurrentContainerNetworkResolver;import io.github.hectorvent.floci.core.common.docker.ContainerReachableEndpoint;import io.github.hectorvent.floci.core.common.docker.ContainerSpec;+import io.github.hectorvent.floci.core.common.docker.CurrentContainerNetworkResolver;import io.github.hectorvent.floci.core.common.docker.DockerHostResolver;import io.github.hectorvent.floci.core.common.docker.LaunchedContainerAwsEnv;-import com.github.dockerjava.api.exception.DockerClientException;-import com.github.dockerjava.api.exception.NotFoundException;-import com.github.dockerjava.api.model.Container;+import io.github.hectorvent.floci.services.iam.model.SessionCreds;import org.junit.jupiter.api.Test;import java.io.IOException;@@ -37,8 +37,8 @@ import java.util.concurrent.TimeUnit;import static org.awaitility.Awaitility.await;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertNull;+import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyString;diff --git a/src/test/java/io/github/hectorvent/floci/services/glue/GlueCatalogSchemaBindingIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/glue/GlueCatalogSchemaBindingIntegrationTest.javaindex a9dccd7ad4..48c60ab109 100644--- a/src/test/java/io/github/hectorvent/floci/services/glue/GlueCatalogSchemaBindingIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/glue/GlueCatalogSchemaBindingIntegrationTest.java@@ -10,8 +10,8 @@ import org.junit.jupiter.api.TestMethodOrder;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.hasSize;import static org.hamcrest.Matchers.hasItem;+import static org.hamcrest.Matchers.hasSize;import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.notNullValue;import static org.hamcrest.Matchers.nullValue;diff --git a/src/test/java/io/github/hectorvent/floci/services/glue/GlueJsonHandlerEmptyListTest.java b/src/test/java/io/github/hectorvent/floci/services/glue/GlueJsonHandlerEmptyListTest.javaindex 800ea218ae..93adf66c31 100644--- a/src/test/java/io/github/hectorvent/floci/services/glue/GlueJsonHandlerEmptyListTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/glue/GlueJsonHandlerEmptyListTest.java@@ -1,11 +1,12 @@package io.github.hectorvent.floci.services.glue;+import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.glue.schemaregistry.GlueSchemaRegistryService;import io.github.hectorvent.floci.services.kms.KmsService;@@ -14,7 +15,6 @@ import jakarta.ws.rs.core.Response;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;-import com.fasterxml.jackson.core.type.TypeReference;import java.time.Clock;import java.util.Map;diff --git a/src/test/java/io/github/hectorvent/floci/services/glue/GlueJsonHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/glue/GlueJsonHandlerTest.javaindex c27ede91d3..d41450e62b 100644--- a/src/test/java/io/github/hectorvent/floci/services/glue/GlueJsonHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/glue/GlueJsonHandlerTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.glue;+import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ArrayNode;@@ -16,7 +17,6 @@ import jakarta.ws.rs.core.Response;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;-import com.fasterxml.jackson.core.type.TypeReference;import java.time.Clock;import java.util.List;import java.util.Map;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 7166a0cc61..dd18099ac2 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@@ -5,54 +5,54 @@ 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.core.common.RegionResolver;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;+import io.github.hectorvent.floci.services.glue.model.AuthenticationConfiguration;import io.github.hectorvent.floci.services.glue.model.Classifier;import io.github.hectorvent.floci.services.glue.model.Column;-import io.github.hectorvent.floci.services.glue.model.Database;import io.github.hectorvent.floci.services.glue.model.Connection;import io.github.hectorvent.floci.services.glue.model.ConnectionInput;import io.github.hectorvent.floci.services.glue.model.ConnectionPasswordEncryption;+import io.github.hectorvent.floci.services.glue.model.Crawler;+import io.github.hectorvent.floci.services.glue.model.CrawlerTargets;import io.github.hectorvent.floci.services.glue.model.DataCatalogEncryptionSettings;+import io.github.hectorvent.floci.services.glue.model.Database;import io.github.hectorvent.floci.services.glue.model.EncryptionAtRest;import io.github.hectorvent.floci.services.glue.model.GluePolicy;-import io.github.hectorvent.floci.services.glue.model.Crawler;-import io.github.hectorvent.floci.services.glue.model.AuthenticationConfiguration;-import io.github.hectorvent.floci.services.glue.model.PhysicalConnectionRequirements;-import io.github.hectorvent.floci.services.glue.model.CrawlerTargets;import io.github.hectorvent.floci.services.glue.model.Job;import io.github.hectorvent.floci.services.glue.model.JobCommand;import io.github.hectorvent.floci.services.glue.model.JobUpdate;import io.github.hectorvent.floci.services.glue.model.Partition;import io.github.hectorvent.floci.services.glue.model.PartitionIndex;import io.github.hectorvent.floci.services.glue.model.PartitionIndexDescriptor;+import io.github.hectorvent.floci.services.glue.model.PhysicalConnectionRequirements;import io.github.hectorvent.floci.services.glue.model.S3Target;import io.github.hectorvent.floci.services.glue.model.SchemaReference;import io.github.hectorvent.floci.services.glue.model.SecurityConfiguration;-import io.github.hectorvent.floci.services.glue.model.Trigger;-import io.github.hectorvent.floci.services.glue.model.Workflow;import io.github.hectorvent.floci.services.glue.model.StorageDescriptor;import io.github.hectorvent.floci.services.glue.model.Table;+import io.github.hectorvent.floci.services.glue.model.Trigger;import io.github.hectorvent.floci.services.glue.model.UserDefinedFunction;+import io.github.hectorvent.floci.services.glue.model.Workflow;import io.github.hectorvent.floci.services.glue.schemaregistry.GlueSchemaRegistryService;-import io.github.hectorvent.floci.services.kms.KmsService;import io.github.hectorvent.floci.services.glue.schemaregistry.model.RegistryId;import io.github.hectorvent.floci.services.glue.schemaregistry.model.SchemaId;+import io.github.hectorvent.floci.services.kms.KmsService;import io.github.hectorvent.floci.services.resourcegroupstagging.ResourceGroupsTaggingService;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;-import java.time.Instant;import java.nio.charset.StandardCharsets;+import java.time.Instant;import java.util.Base64;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import java.util.concurrent.CountDownLatch;import java.util.concurrent.TimeUnit;import java.util.stream.IntStream;-import java.util.concurrent.CountDownLatch;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;diff --git a/src/test/java/io/github/hectorvent/floci/services/glue/GlueTableResolverTest.java b/src/test/java/io/github/hectorvent/floci/services/glue/GlueTableResolverTest.javaindex d05833ed54..4a18e8c616 100644--- a/src/test/java/io/github/hectorvent/floci/services/glue/GlueTableResolverTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/glue/GlueTableResolverTest.java@@ -9,10 +9,10 @@ import java.util.List;import java.util.Map;import static org.hamcrest.MatcherAssert.assertThat;-import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.is;import static org.hamcrest.Matchers.contains;import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.is;import static org.junit.jupiter.api.Assertions.assertThrows;class GlueTableResolverTest {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 6b3520e0c8..abc798674e 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@@ -26,7 +26,6 @@ import javax.xml.crypto.dsig.spec.TransformParameterSpec;import javax.xml.crypto.dsig.spec.XPathFilter2ParameterSpec;import javax.xml.crypto.dsig.spec.XPathFilterParameterSpec;import javax.xml.crypto.dsig.spec.XPathType;-import javax.xml.transform.OutputKeys;import javax.xml.transform.Transformer;import javax.xml.transform.TransformerFactory;diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/IamConcurrencyTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamConcurrencyTest.javaindex de2290d683..e39161df87 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/IamConcurrencyTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamConcurrencyTest.java@@ -4,8 +4,8 @@ import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.services.iam.model.IamPolicy;import org.junit.jupiter.api.DynamicTest;-import org.junit.jupiter.api.TestFactory;import org.junit.jupiter.api.Test;+import org.junit.jupiter.api.TestFactory;import java.util.HashSet;import java.util.List;diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/IamEnforcementIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamEnforcementIntegrationTest.javaindex f830aee9d5..a938b8ceeb 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/IamEnforcementIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamEnforcementIntegrationTest.java@@ -1,18 +1,18 @@package io.github.hectorvent.floci.services.iam;-import io.quarkus.test.junit.QuarkusTest;import io.github.hectorvent.floci.core.common.IamConditionContextResolver;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.model.Tag;import io.github.hectorvent.floci.services.ec2.model.Vpc;import io.github.hectorvent.floci.services.iam.IamPolicyEvaluator.Decision;import io.github.hectorvent.floci.services.s3.S3Service;+import io.quarkus.test.junit.QuarkusTest;+import jakarta.inject.Inject;import jakarta.ws.rs.container.ContainerRequestContext;import jakarta.ws.rs.core.MediaType;import jakarta.ws.rs.core.UriInfo;import org.junit.jupiter.api.Test;-import jakarta.inject.Inject;import java.io.ByteArrayInputStream;import java.nio.charset.StandardCharsets;import java.util.List;diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyCatalogTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyCatalogTest.javaindex 7efc309027..662af8f73a 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyCatalogTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyCatalogTest.java@@ -17,8 +17,8 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertNotNull;-import static org.junit.jupiter.api.Assertions.assertTrue;import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;/*** The managed-policy catalog carries the full published AWS list rather than a curateddiff --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 08094b8580..db806f2c75 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@@ -1,10 +1,6 @@package io.github.hectorvent.floci.services.iam;-import static org.hamcrest.Matchers.containsString;-import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.matchesRegex;-import static org.hamcrest.Matchers.startsWith;-+import io.quarkus.test.junit.QuarkusTest;import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;@@ -13,8 +9,11 @@ import org.junit.jupiter.api.TestMethodOrder;import java.util.List;-import io.quarkus.test.junit.QuarkusTest;import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.matchesRegex;+import static org.hamcrest.Matchers.startsWith;/*** Service-linked roles exist so Terraform's aws_iam_service_linked_role can apply and destroydiff --git a/src/test/java/io/github/hectorvent/floci/services/iam/S3ObjectTagConditionEnforcementIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/S3ObjectTagConditionEnforcementIntegrationTest.javaindex f3b095a6bd..16256bde10 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/S3ObjectTagConditionEnforcementIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/S3ObjectTagConditionEnforcementIntegrationTest.java@@ -2,8 +2,8 @@ package io.github.hectorvent.floci.services.iam;import io.github.hectorvent.floci.testing.IamEnforcementProfile;import io.quarkus.test.junit.QuarkusTest;-import io.restassured.specification.RequestSpecification;import io.quarkus.test.junit.TestProfile;+import io.restassured.specification.RequestSpecification;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/SecurityAuditManagedPolicyIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/SecurityAuditManagedPolicyIntegrationTest.javaindex a507b730c6..e058c278a9 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/SecurityAuditManagedPolicyIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/SecurityAuditManagedPolicyIntegrationTest.java@@ -1,14 +1,14 @@package io.github.hectorvent.floci.services.iam;-import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;-import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;+import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.equalTo;+/*** Verifies the AWS-managed {@code SecurityAudit} policy is resolvable and* attachable. {@code SecurityAudit} is a standard AWS managed policy commonlydiff --git a/src/test/java/io/github/hectorvent/floci/services/iot/IotDomainConfigurationServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/iot/IotDomainConfigurationServiceTest.javaindex fddbff3bea..a63646cac0 100644--- a/src/test/java/io/github/hectorvent/floci/services/iot/IotDomainConfigurationServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iot/IotDomainConfigurationServiceTest.java@@ -1,8 +1,8 @@package io.github.hectorvent.floci.services.iot;import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;import com.fasterxml.jackson.databind.node.ObjectNode;+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.config.TlsCertificateManager;import io.github.hectorvent.floci.core.common.AwsException;diff --git a/src/test/java/io/github/hectorvent/floci/services/iot/IotServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/iot/IotServiceTest.javaindex bacc529b2a..58a6f52391 100644--- a/src/test/java/io/github/hectorvent/floci/services/iot/IotServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iot/IotServiceTest.java@@ -1,8 +1,8 @@package io.github.hectorvent.floci.services.iot;import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.node.ObjectNode;import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -46,8 +46,8 @@ import static org.mockito.ArgumentMatchers.anyInt;import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.ArgumentMatchers.eq;import static org.mockito.ArgumentMatchers.isNull;-import static org.mockito.Mockito.doThrow;import static org.mockito.Mockito.RETURNS_DEEP_STUBS;+import static org.mockito.Mockito.doThrow;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.never;import static org.mockito.Mockito.times;diff --git a/src/test/java/io/github/hectorvent/floci/services/iot/IotTopicRuleIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iot/IotTopicRuleIntegrationTest.javaindex df2d55aa9a..df42bf7b2c 100644--- a/src/test/java/io/github/hectorvent/floci/services/iot/IotTopicRuleIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iot/IotTopicRuleIntegrationTest.java@@ -12,12 +12,12 @@ import java.time.Instant;import java.util.Arrays;import static io.restassured.RestAssured.given;-import static org.junit.jupiter.api.Assertions.assertFalse;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasItem;import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.notNullValue;+import static org.junit.jupiter.api.Assertions.assertFalse;@QuarkusTestclass IotTopicRuleIntegrationTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisServiceAccountTest.java b/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisServiceAccountTest.javaindex cd85504ec8..18fa64fcf7 100644--- a/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisServiceAccountTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisServiceAccountTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.kinesis;+import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;@@ -7,7 +8,6 @@ import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.services.kinesis.model.KinesisConsumer;import io.github.hectorvent.floci.services.kinesis.model.KinesisShard;import io.github.hectorvent.floci.services.kinesis.model.KinesisStream;-import com.fasterxml.jackson.databind.ObjectMapper;import org.junit.jupiter.api.Test;import java.nio.charset.StandardCharsets;diff --git a/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2IntegrationTest.javaindex a467859bbd..827bc37746 100644--- a/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/KinesisAnalyticsV2IntegrationTest.java@@ -7,8 +7,8 @@ import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasItem;import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.startsWith;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 6f17c2a281..e1f48a524a 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@@ -6,8 +6,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;-import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;+import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.kinesisanalytics.container.FlinkContainerManager;import jakarta.ws.rs.core.Response;diff --git a/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/container/FlinkContainerManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/container/FlinkContainerManagerTest.javaindex 44defd139a..79359c865f 100644--- a/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/container/FlinkContainerManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/kinesisanalytics/container/FlinkContainerManagerTest.java@@ -6,6 +6,7 @@ import com.github.dockerjava.api.DockerClient;import com.github.dockerjava.api.model.MountType;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;import io.github.hectorvent.floci.core.common.docker.ContainerDetector;import io.github.hectorvent.floci.core.common.docker.ContainerExecStubs;@@ -16,7 +17,6 @@ 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 io.github.hectorvent.floci.core.common.docker.LaunchedContainerAwsEnv;-import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;import io.github.hectorvent.floci.services.kinesisanalytics.model.FlinkApplication;import io.github.hectorvent.floci.services.kinesisanalytics.model.Snapshot;import io.github.hectorvent.floci.services.s3.S3Service;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 346cfd987e..acd4c82004 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@@ -29,16 +29,16 @@ import java.util.List;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.emptyString;import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.hasKey;import static org.hamcrest.Matchers.hasItem;+import static org.hamcrest.Matchers.hasKey;import static org.hamcrest.Matchers.matchesPattern;import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.notNullValue;import static org.hamcrest.Matchers.nullValue;import static org.hamcrest.Matchers.startsWith;import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertTrue;@QuarkusTestdiff --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 8dd76a3682..4e0f900e7f 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@@ -35,6 +35,9 @@ import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Nested;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.function.Executable;+import org.junit.jupiter.params.ParameterizedTest;+import org.junit.jupiter.params.provider.CsvSource;+import org.junit.jupiter.params.provider.ValueSource;import javax.crypto.Cipher;import javax.crypto.Mac;@@ -69,9 +72,6 @@ import java.util.concurrent.ExecutorService;import java.util.concurrent.Executors;import java.util.concurrent.Future;import java.util.concurrent.TimeUnit;-import org.junit.jupiter.params.ParameterizedTest;-import org.junit.jupiter.params.provider.CsvSource;-import org.junit.jupiter.params.provider.ValueSource;import static org.junit.jupiter.api.Assertions.*;diff --git a/src/test/java/io/github/hectorvent/floci/services/lakeformation/LakeFormationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/lakeformation/LakeFormationIntegrationTest.javaindex a4925bd908..d6d394c1ec 100644--- a/src/test/java/io/github/hectorvent/floci/services/lakeformation/LakeFormationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lakeformation/LakeFormationIntegrationTest.java@@ -3,8 +3,8 @@ package io.github.hectorvent.floci.services.lakeformation;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.BeforeAll;-import org.junit.jupiter.api.Test;import org.junit.jupiter.api.MethodOrderer;+import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;import static io.restassured.RestAssured.given;diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/EsmIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/EsmIntegrationTest.javaindex 0a79dae7d2..ac3bd63f76 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/EsmIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/EsmIntegrationTest.java@@ -16,7 +16,6 @@ import java.util.UUID;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.*;-import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertTrue;diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaExecutorServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaExecutorServiceTest.javaindex 8f196f3a70..7c84baabf8 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaExecutorServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaExecutorServiceTest.java@@ -5,8 +5,8 @@ import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.lambda.launcher.ContainerHandle;import io.github.hectorvent.floci.services.lambda.model.ContainerState;import io.github.hectorvent.floci.services.lambda.model.FunctionEventInvokeConfig;-import io.github.hectorvent.floci.services.lambda.model.InvokeResult;import io.github.hectorvent.floci.services.lambda.model.InvocationType;+import io.github.hectorvent.floci.services.lambda.model.InvokeResult;import io.github.hectorvent.floci.services.lambda.model.LambdaFunction;import io.github.hectorvent.floci.services.lambda.model.PendingInvocation;import io.github.hectorvent.floci.services.lambda.runtime.RuntimeApiServer;diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaImageConfigTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaImageConfigTest.javaindex 9d6eb13d9c..f4f630dd57 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaImageConfigTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaImageConfigTest.java@@ -1,12 +1,14 @@package io.github.hectorvent.floci.services.lambda;+import com.github.dockerjava.api.DockerClient;+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;-import io.github.hectorvent.floci.core.common.docker.ContainerReachableEndpoint;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.ContainerReachableEndpoint;import io.github.hectorvent.floci.core.common.docker.ContainerSpec;import io.github.hectorvent.floci.core.common.docker.DockerHostResolver;import io.github.hectorvent.floci.core.common.docker.LaunchedContainerAwsEnv;@@ -19,8 +21,6 @@ import io.github.hectorvent.floci.services.lambda.runtime.RuntimeApiServer;import io.github.hectorvent.floci.services.lambda.runtime.RuntimeApiServerFactory;import io.github.hectorvent.floci.services.lambda.zip.CodeStore;import io.github.hectorvent.floci.services.lambda.zip.ZipExtractor;-import com.github.dockerjava.api.DockerClient;-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Nested;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaLayerCodePathIsolationTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaLayerCodePathIsolationTest.javaindex f01d10d567..869797e59f 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaLayerCodePathIsolationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaLayerCodePathIsolationTest.java@@ -6,9 +6,9 @@ import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.services.lambda.model.LambdaLayerVersion;import io.github.hectorvent.floci.services.lambda.zip.ZipExtractor;-import org.mockito.Answers;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;+import org.mockito.Answers;import java.io.ByteArrayOutputStream;import java.nio.file.Files;diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaServiceTest.javaindex 35d7194c1e..05f33d46ae 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaServiceTest.java@@ -23,8 +23,8 @@ import java.nio.file.Files;import java.nio.file.Path;import java.util.ArrayList;import java.util.Base64;-import java.util.HashSet;import java.util.HashMap;+import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.Optional;diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/durable/LambdaDurableProtocolIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/durable/LambdaDurableProtocolIntegrationTest.javaindex c026280b73..680e22249e 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/durable/LambdaDurableProtocolIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/durable/LambdaDurableProtocolIntegrationTest.java@@ -21,8 +21,8 @@ import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.anyOf;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasKey;-import static org.hamcrest.Matchers.is;import static org.hamcrest.Matchers.hasSize;+import static org.hamcrest.Matchers.is;import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.notNullValue;import static org.junit.jupiter.api.Assertions.assertEquals;diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncherCopyRetryTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncherCopyRetryTest.javaindex 559d772fe5..24276bca39 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncherCopyRetryTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncherCopyRetryTest.java@@ -2,11 +2,10 @@ package io.github.hectorvent.floci.services.lambda.launcher;import com.github.dockerjava.api.DockerClient;import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;+import io.github.hectorvent.floci.config.EmulatorConfig;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;-import io.github.hectorvent.floci.config.EmulatorConfig;-import java.io.IOException;import java.nio.file.Files;import java.nio.file.Path;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 cac5997e7c..32862dfdfd 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@@ -1,5 +1,18 @@package io.github.hectorvent.floci.services.lambda.launcher;+import com.github.dockerjava.api.DockerClient;+import com.github.dockerjava.api.async.ResultCallback;+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;+import com.github.dockerjava.api.command.ExecCreateCmd;+import com.github.dockerjava.api.command.ExecCreateCmdResponse;+import com.github.dockerjava.api.command.ExecStartCmd;+import com.github.dockerjava.api.exception.NotFoundException;+import com.github.dockerjava.api.model.AccessMode;+import com.github.dockerjava.api.model.Frame;+import com.github.dockerjava.api.model.Mount;+import com.github.dockerjava.api.model.MountType;+import com.github.dockerjava.api.model.StreamType;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;@@ -9,25 +22,13 @@ import io.github.hectorvent.floci.core.common.docker.ContainerReachableEndpoint;import io.github.hectorvent.floci.core.common.docker.ContainerSpec;import io.github.hectorvent.floci.core.common.docker.DockerHostResolver;import io.github.hectorvent.floci.core.common.docker.LaunchedContainerAwsEnv;+import io.github.hectorvent.floci.services.cloudwatch.logs.CloudWatchLogsService;import io.github.hectorvent.floci.services.ecr.registry.EcrRegistryManager;import io.github.hectorvent.floci.services.iam.model.SessionCreds;import io.github.hectorvent.floci.services.lambda.model.LambdaFileSystemConfig;import io.github.hectorvent.floci.services.lambda.model.LambdaFunction;import io.github.hectorvent.floci.services.lambda.runtime.RuntimeApiServer;import io.github.hectorvent.floci.services.lambda.runtime.RuntimeApiServerFactory;-import com.github.dockerjava.api.DockerClient;-import com.github.dockerjava.api.async.ResultCallback;-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;-import com.github.dockerjava.api.command.ExecCreateCmd;-import com.github.dockerjava.api.command.ExecCreateCmdResponse;-import com.github.dockerjava.api.command.ExecStartCmd;-import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;-import com.github.dockerjava.api.exception.NotFoundException;-import com.github.dockerjava.api.model.AccessMode;-import com.github.dockerjava.api.model.Frame;-import com.github.dockerjava.api.model.StreamType;-import com.github.dockerjava.api.model.Mount;-import com.github.dockerjava.api.model.MountType;import org.apache.commons.compress.archivers.tar.TarArchiveEntry;import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;import org.junit.jupiter.api.BeforeEach;@@ -41,8 +42,6 @@ import org.mockito.InOrder;import org.mockito.Mock;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;diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ImageCacheServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ImageCacheServiceTest.javaindex 8ef6fbd92e..e3cbfc4bfa 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ImageCacheServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ImageCacheServiceTest.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.lambda.launcher;import com.github.dockerjava.api.DockerClient;+import com.github.dockerjava.api.command.InfoCmd;import com.github.dockerjava.api.command.InspectImageCmd;import com.github.dockerjava.api.command.InspectImageResponse;-import com.github.dockerjava.api.command.InfoCmd;import com.github.dockerjava.api.command.PullImageCmd;import com.github.dockerjava.api.command.PullImageResultCallback;import com.github.dockerjava.api.exception.DockerClientException;diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/runtime/RuntimeApiServerTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/runtime/RuntimeApiServerTest.javaindex bef8199be0..add8c338e0 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/runtime/RuntimeApiServerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/runtime/RuntimeApiServerTest.java@@ -8,6 +8,8 @@ import org.junit.jupiter.api.AfterEach;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.Timeout;+import org.junit.jupiter.api.condition.EnabledOnOs;+import org.junit.jupiter.api.condition.OS;import java.io.IOException;import java.net.BindException;@@ -25,9 +27,6 @@ import java.util.concurrent.Executors;import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.TimeUnit;-import org.junit.jupiter.api.condition.EnabledOnOs;-import org.junit.jupiter.api.condition.OS;-import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertNotNull;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 53a19511fd..e6fc64ee18 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@@ -14,8 +14,8 @@ import java.util.List;import java.util.stream.Stream;import java.util.zip.CRC32;import java.util.zip.Deflater;-import java.util.zip.ZipException;import java.util.zip.ZipEntry;+import java.util.zip.ZipException;import java.util.zip.ZipOutputStream;import static org.junit.jupiter.api.Assertions.*;diff --git a/src/test/java/io/github/hectorvent/floci/services/lambdamicrovms/LambdaMicrovmsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/lambdamicrovms/LambdaMicrovmsIntegrationTest.javaindex da28ff55b5..aa07d65cfb 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambdamicrovms/LambdaMicrovmsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambdamicrovms/LambdaMicrovmsIntegrationTest.java@@ -8,10 +8,10 @@ import org.junit.jupiter.api.TestMethodOrder;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.startsWith;import static org.hamcrest.Matchers.hasItem;import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.notNullValue;+import static org.hamcrest.Matchers.startsWith;@QuarkusTest@TestMethodOrder(MethodOrderer.OrderAnnotation.class)diff --git a/src/test/java/io/github/hectorvent/floci/services/lightsail/LightsailIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/lightsail/LightsailIntegrationTest.javaindex adb237c56d..2f75bf5d8b 100644--- a/src/test/java/io/github/hectorvent/floci/services/lightsail/LightsailIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lightsail/LightsailIntegrationTest.java@@ -10,8 +10,8 @@ import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasItem;import static org.hamcrest.Matchers.hasItems;import static org.hamcrest.Matchers.hasSize;-import static org.hamcrest.Matchers.notNullValue;import static org.hamcrest.Matchers.not;+import static org.hamcrest.Matchers.notNullValue;import static org.hamcrest.Matchers.startsWith;@QuarkusTestdiff --git a/src/test/java/io/github/hectorvent/floci/services/memorydb/container/MemoryDbContainerManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/memorydb/container/MemoryDbContainerManagerTest.javaindex 9634da0fb2..bbeddbb1d8 100644--- a/src/test/java/io/github/hectorvent/floci/services/memorydb/container/MemoryDbContainerManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/memorydb/container/MemoryDbContainerManagerTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.memorydb.container;+import com.github.dockerjava.api.DockerClient;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;@@ -7,7 +8,6 @@ import io.github.hectorvent.floci.core.common.docker.ContainerDetector;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 com.github.dockerjava.api.DockerClient;import org.jboss.logging.Logger;import org.junit.jupiter.api.Test;import org.mockito.Mockito;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 3ee325fb31..23739e37c9 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@@ -1,36 +1,36 @@package io.github.hectorvent.floci.services.msk;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.SerializationFeature;+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;import io.github.hectorvent.floci.config.EmulatorConfig;+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.InMemoryStorage;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;+import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;-import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.core.common.PaginatedResult;-import io.github.hectorvent.floci.services.msk.model.ClusterState;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.fasterxml.jackson.databind.SerializationFeature;-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;import io.github.hectorvent.floci.services.msk.model.BrokerNodeGroupInfo;import io.github.hectorvent.floci.services.msk.model.ClientAuthentication;+import io.github.hectorvent.floci.services.msk.model.ClusterState;import io.github.hectorvent.floci.services.msk.model.ConfigurationInfo;import io.github.hectorvent.floci.services.msk.model.ConfigurationRevision;import io.github.hectorvent.floci.services.msk.model.ConfigurationRevisionDetail;import io.github.hectorvent.floci.services.msk.model.ConfigurationState;import io.github.hectorvent.floci.services.msk.model.CreateClusterRequest;import io.github.hectorvent.floci.services.msk.model.CreateClusterV2Request;-import io.github.hectorvent.floci.services.msk.model.EncryptionInTransit;import io.github.hectorvent.floci.services.msk.model.EbsStorageInfo;+import io.github.hectorvent.floci.services.msk.model.EncryptionInTransit;import io.github.hectorvent.floci.services.msk.model.EncryptionInfo;import io.github.hectorvent.floci.services.msk.model.JmxExporter;import io.github.hectorvent.floci.services.msk.model.LoggingInfo;-import io.github.hectorvent.floci.services.msk.model.OpenMonitoring;-import io.github.hectorvent.floci.services.msk.model.Prometheus;-import io.github.hectorvent.floci.services.msk.model.Rebalancing;import io.github.hectorvent.floci.services.msk.model.MskCluster;import io.github.hectorvent.floci.services.msk.model.MskConfiguration;+import io.github.hectorvent.floci.services.msk.model.OpenMonitoring;+import io.github.hectorvent.floci.services.msk.model.Prometheus;import io.github.hectorvent.floci.services.msk.model.ProvisionedRequest;+import io.github.hectorvent.floci.services.msk.model.Rebalancing;import io.github.hectorvent.floci.services.msk.model.Sasl;import io.github.hectorvent.floci.services.msk.model.Scram;import io.github.hectorvent.floci.services.msk.model.Serverless;diff --git a/src/test/java/io/github/hectorvent/floci/services/msk/RedpandaManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/msk/RedpandaManagerTest.javaindex 419b54e970..b54aeb0415 100644--- a/src/test/java/io/github/hectorvent/floci/services/msk/RedpandaManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/msk/RedpandaManagerTest.java@@ -39,10 +39,10 @@ import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.eq;-import static org.mockito.Mockito.never;import static org.mockito.Mockito.RETURNS_DEEP_STUBS;import static org.mockito.Mockito.lenient;import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.never;import static org.mockito.Mockito.verify;import static org.mockito.Mockito.verifyNoInteractions;import static org.mockito.Mockito.when;diff --git a/src/test/java/io/github/hectorvent/floci/services/mwaa/MwaaEnvironmentManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/mwaa/MwaaEnvironmentManagerTest.javaindex 98cd21fbd1..3707ad92a6 100644--- a/src/test/java/io/github/hectorvent/floci/services/mwaa/MwaaEnvironmentManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/mwaa/MwaaEnvironmentManagerTest.java@@ -1,6 +1,11 @@package io.github.hectorvent.floci.services.mwaa;+import com.github.dockerjava.api.DockerClient;+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;+import com.github.dockerjava.api.exception.NotFoundException;+import com.github.dockerjava.api.model.Mount;import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;import io.github.hectorvent.floci.core.common.docker.ContainerDetector;import io.github.hectorvent.floci.core.common.docker.ContainerExec;@@ -11,12 +16,7 @@ import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.Eimport io.github.hectorvent.floci.core.common.docker.ContainerSpec;import io.github.hectorvent.floci.core.common.docker.DockerHostResolver;import io.github.hectorvent.floci.core.common.docker.LaunchedContainerAwsEnv;-import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;import io.github.hectorvent.floci.services.mwaa.model.Environment;-import com.github.dockerjava.api.DockerClient;-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;-import com.github.dockerjava.api.exception.NotFoundException;-import com.github.dockerjava.api.model.Mount;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Nested;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/mwaa/MwaaServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/mwaa/MwaaServiceTest.javaindex 2e780a93cf..bdf94ba634 100644--- a/src/test/java/io/github/hectorvent/floci/services/mwaa/MwaaServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/mwaa/MwaaServiceTest.java@@ -1,12 +1,13 @@package io.github.hectorvent.floci.services.mwaa;+import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.docker.PortAllocator;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.mwaa.model.CreateEnvironmentRequest;import io.github.hectorvent.floci.services.mwaa.model.Environment;@@ -15,7 +16,6 @@ import io.github.hectorvent.floci.services.mwaa.model.NetworkConfiguration;import io.github.hectorvent.floci.services.mwaa.model.UpdateEnvironmentRequest;import io.github.hectorvent.floci.services.mwaa.proxy.MwaaProxyManager;import io.github.hectorvent.floci.services.s3.S3Service;-import com.fasterxml.jackson.core.type.TypeReference;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Nested;import org.junit.jupiter.api.Test;@@ -30,8 +30,8 @@ import java.util.Optional;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertNotEquals;+import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;diff --git a/src/test/java/io/github/hectorvent/floci/services/neptune/NeptuneServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/neptune/NeptuneServiceTest.javaindex a126c7119e..d72a45f55d 100644--- a/src/test/java/io/github/hectorvent/floci/services/neptune/NeptuneServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/neptune/NeptuneServiceTest.java@@ -22,8 +22,8 @@ import java.util.Optional;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertNotEquals;+import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;diff --git a/src/test/java/io/github/hectorvent/floci/services/neptune/container/NeptuneContainerManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/neptune/container/NeptuneContainerManagerTest.javaindex 758203ea74..4b83fe405d 100644--- a/src/test/java/io/github/hectorvent/floci/services/neptune/container/NeptuneContainerManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/neptune/container/NeptuneContainerManagerTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.neptune.container;+import com.github.dockerjava.api.DockerClient;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;@@ -8,7 +9,6 @@ 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.services.neptune.model.NeptuneDbType;-import com.github.dockerjava.api.DockerClient;import org.jboss.logging.Logger;import org.junit.jupiter.api.Test;import org.mockito.Mockito;diff --git a/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallIntegrationTest.javaindex 022ea9384b..a742a7a324 100644--- a/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallIntegrationTest.java@@ -1,5 +1,11 @@package io.github.hectorvent.floci.services.networkfirewall;+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;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.aMapWithSize;import static org.hamcrest.Matchers.anEmptyMap;@@ -7,20 +13,14 @@ import static org.hamcrest.Matchers.contains;import static org.hamcrest.Matchers.empty;import static org.hamcrest.Matchers.emptyOrNullString;import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.hasKey;import static org.hamcrest.Matchers.hasItem;import static org.hamcrest.Matchers.hasItems;+import static org.hamcrest.Matchers.hasKey;import static org.hamcrest.Matchers.hasSize;import static org.hamcrest.Matchers.matchesPattern;import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.nullValue;-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;-@QuarkusTestclass NetworkFirewallIntegrationTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/pipes/KarapaceManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/pipes/KarapaceManagerTest.javaindex c3b811afcf..0ea8752de5 100644--- a/src/test/java/io/github/hectorvent/floci/services/pipes/KarapaceManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/pipes/KarapaceManagerTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.pipes;import com.sun.net.httpserver.HttpServer;import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;import io.github.hectorvent.floci.core.common.docker.ContainerDetector;import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager;@@ -10,7 +11,6 @@ import io.github.hectorvent.floci.core.common.docker.ContainerLifecycleManager.Eimport io.github.hectorvent.floci.core.common.docker.ContainerSpec;import io.github.hectorvent.floci.core.common.docker.DockerHostResolver;import io.github.hectorvent.floci.core.common.docker.PortAllocator;-import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;import org.junit.jupiter.api.AfterEach;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/pipes/PipesPollerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/pipes/PipesPollerIntegrationTest.javaindex 8a2ef4fe30..c020258d0e 100644--- a/src/test/java/io/github/hectorvent/floci/services/pipes/PipesPollerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/pipes/PipesPollerIntegrationTest.java@@ -7,8 +7,8 @@ import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.*;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.fail;import static org.junit.jupiter.api.Assertions.assertTrue;+import static org.junit.jupiter.api.Assertions.fail;@QuarkusTest@TestMethodOrder(MethodOrderer.OrderAnnotation.class)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 d61a87d8c3..e0c68dcfb2 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@@ -4,8 +4,8 @@ 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.core.common.RegionResolver;-import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;+import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.pipes.model.DesiredState;import io.github.hectorvent.floci.services.pipes.model.Pipe;diff --git a/src/test/java/io/github/hectorvent/floci/services/ram/RamServicePersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/ram/RamServicePersistenceTest.javaindex 1067872e3e..6027fa5755 100644--- a/src/test/java/io/github/hectorvent/floci/services/ram/RamServicePersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ram/RamServicePersistenceTest.java@@ -4,10 +4,10 @@ import com.fasterxml.jackson.core.type.TypeReference;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 io.github.hectorvent.floci.services.ram.model.ResourceShare;-import io.github.hectorvent.floci.services.ram.model.SharedResource;import io.github.hectorvent.floci.services.organizations.OrganizationsService;import io.github.hectorvent.floci.services.organizations.model.Organization;+import io.github.hectorvent.floci.services.ram.model.ResourceShare;+import io.github.hectorvent.floci.services.ram.model.SharedResource;import org.junit.jupiter.api.Test;import java.util.HashMap;diff --git a/src/test/java/io/github/hectorvent/floci/services/ram/RamServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ram/RamServiceTest.javaindex 6ca32efe48..4b26589551 100644--- a/src/test/java/io/github/hectorvent/floci/services/ram/RamServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ram/RamServiceTest.java@@ -5,18 +5,18 @@ import io.github.hectorvent.floci.core.common.AwsException;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 io.github.hectorvent.floci.services.organizations.OrganizationsService;+import io.github.hectorvent.floci.services.organizations.model.Organization;import io.github.hectorvent.floci.services.ram.model.ResourceShare;import io.github.hectorvent.floci.services.ram.model.ResourceShareInvitation;import io.github.hectorvent.floci.services.ram.model.SharedResource;-import io.github.hectorvent.floci.services.organizations.OrganizationsService;-import io.github.hectorvent.floci.services.organizations.model.Organization;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.function.Executable;import java.util.ArrayList;-import java.util.List;import java.util.HashMap;+import java.util.List;import java.util.Map;import java.util.concurrent.CountDownLatch;import java.util.concurrent.ExecutorService;diff --git a/src/test/java/io/github/hectorvent/floci/services/rds/RdsAwsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/RdsAwsIntegrationTest.javaindex 5bad22e150..69aa70efe8 100644--- a/src/test/java/io/github/hectorvent/floci/services/rds/RdsAwsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rds/RdsAwsIntegrationTest.java@@ -20,8 +20,8 @@ import java.util.concurrent.TimeUnit;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.containsString;-import static org.junit.jupiter.api.Assumptions.assumeTrue;import static org.junit.jupiter.api.Assertions.assertTrue;+import static org.junit.jupiter.api.Assumptions.assumeTrue;@QuarkusTest@Tag("docker")diff --git a/src/test/java/io/github/hectorvent/floci/services/rds/RdsInstanceMonitoringFieldsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/RdsInstanceMonitoringFieldsIntegrationTest.javaindex f383ec7b88..6a9b29ec9c 100644--- a/src/test/java/io/github/hectorvent/floci/services/rds/RdsInstanceMonitoringFieldsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rds/RdsInstanceMonitoringFieldsIntegrationTest.java@@ -2,18 +2,18 @@ package io.github.hectorvent.floci.services.rds;import io.github.hectorvent.floci.testing.RdsMockProfile;import io.quarkus.test.junit.QuarkusTest;+import io.quarkus.test.junit.TestProfile;import io.restassured.response.ValidatableResponse;import io.restassured.specification.RequestSpecification;-import io.quarkus.test.junit.TestProfile;import org.junit.jupiter.api.AfterEach;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;import static io.restassured.http.ContentType.URLENC;import static org.hamcrest.Matchers.containsString;-import static org.junit.jupiter.api.Assertions.assertFalse;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.not;+import static org.junit.jupiter.api.Assertions.assertFalse;/*** CreateDBInstance and ModifyDBInstance took the monitoring, Performance Insights, enginediff --git a/src/test/java/io/github/hectorvent/floci/services/rds/RdsQueryHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/RdsQueryHandlerTest.javaindex 884e8936dc..c58997c6a9 100644--- a/src/test/java/io/github/hectorvent/floci/services/rds/RdsQueryHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rds/RdsQueryHandlerTest.java@@ -2,12 +2,12 @@ package io.github.hectorvent.floci.services.rds;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.services.docdb.DocDbQueryHandler;+import io.github.hectorvent.floci.services.neptune.NeptuneQueryHandler;import io.github.hectorvent.floci.services.rds.model.DatabaseEngine;import io.github.hectorvent.floci.services.rds.model.DbCluster;-import io.github.hectorvent.floci.services.rds.model.DbClusterSnapshot;import io.github.hectorvent.floci.services.rds.model.DbClusterParameterGroup;-import io.github.hectorvent.floci.services.docdb.DocDbQueryHandler;-import io.github.hectorvent.floci.services.neptune.NeptuneQueryHandler;+import io.github.hectorvent.floci.services.rds.model.DbClusterSnapshot;import io.github.hectorvent.floci.services.rds.model.DbInstance;import io.github.hectorvent.floci.services.rds.model.DbInstanceScalingChanges;import io.github.hectorvent.floci.services.rds.model.DbInstanceSettings;diff --git a/src/test/java/io/github/hectorvent/floci/services/rds/RdsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/RdsServiceTest.javaindex bd1d3dbb58..cd21ab9d2b 100644--- a/src/test/java/io/github/hectorvent/floci/services/rds/RdsServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rds/RdsServiceTest.java@@ -13,18 +13,18 @@ import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.model.Subnet;import io.github.hectorvent.floci.services.ec2.model.Vpc;import io.github.hectorvent.floci.services.ec2.model.VpcIpv6CidrBlockAssociation;+import io.github.hectorvent.floci.services.kms.KmsService;+import io.github.hectorvent.floci.services.kms.model.KmsKey;+import io.github.hectorvent.floci.services.rds.container.AutoPauseListener;+import io.github.hectorvent.floci.services.rds.container.RdsContainerHandle;+import io.github.hectorvent.floci.services.rds.container.RdsContainerManager;import io.github.hectorvent.floci.services.rds.model.DatabaseEngine;import io.github.hectorvent.floci.services.rds.model.DbCluster;import io.github.hectorvent.floci.services.rds.model.DbClusterEndpoint;-import io.github.hectorvent.floci.services.rds.model.DbClusterSnapshot;import io.github.hectorvent.floci.services.rds.model.DbClusterParameterGroup;-import io.github.hectorvent.floci.services.rds.container.AutoPauseListener;-import io.github.hectorvent.floci.services.rds.container.RdsContainerHandle;-import io.github.hectorvent.floci.services.rds.container.RdsContainerManager;+import io.github.hectorvent.floci.services.rds.model.DbClusterSnapshot;import io.github.hectorvent.floci.services.rds.model.DbEndpoint;import io.github.hectorvent.floci.services.rds.model.DbInstance;-import io.github.hectorvent.floci.services.kms.KmsService;-import io.github.hectorvent.floci.services.kms.model.KmsKey;import io.github.hectorvent.floci.services.rds.model.DbInstanceScalingChanges;import io.github.hectorvent.floci.services.rds.model.DbInstanceSettings;import io.github.hectorvent.floci.services.rds.model.DbInstanceStatus;@@ -82,12 +82,12 @@ import static org.mockito.ArgumentMatchers.eq;import static org.mockito.ArgumentMatchers.isNull;import static org.mockito.Mockito.atLeastOnce;import static org.mockito.Mockito.clearInvocations;+import static org.mockito.Mockito.doAnswer;+import static org.mockito.Mockito.doCallRealMethod;import static org.mockito.Mockito.doReturn;+import static org.mockito.Mockito.doThrow;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.never;-import static org.mockito.Mockito.doCallRealMethod;-import static org.mockito.Mockito.doAnswer;-import static org.mockito.Mockito.doThrow;import static org.mockito.Mockito.spy;import static org.mockito.Mockito.times;import static org.mockito.Mockito.verify;diff --git a/src/test/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManagerPostgresTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManagerPostgresTest.javaindex d98a895042..52fd7479bd 100644--- a/src/test/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManagerPostgresTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rds/container/RdsContainerManagerPostgresTest.java@@ -28,7 +28,6 @@ import java.time.Duration;import java.util.List;import java.util.concurrent.TimeUnit;-import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.junit.jupiter.api.Assumptions.assumeTrue;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 9cf940a767..f9d58d2059 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@@ -1,5 +1,10 @@package io.github.hectorvent.floci.services.rds.container;+import com.github.dockerjava.api.DockerClient;+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;+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.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.ServiceConfigAccess;@@ -10,12 +15,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 io.github.hectorvent.floci.services.rds.model.DatabaseEngine;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 org.mockito.Mockito;import java.io.InputStream;import java.nio.file.Files;@@ -28,16 +35,8 @@ import java.util.concurrent.CompletableFuture;import java.util.concurrent.CountDownLatch;import java.util.concurrent.TimeUnit;-import com.github.dockerjava.api.DockerClient;-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;-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;+import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertSame;@@ -45,12 +44,12 @@ import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.eq;+import static org.mockito.Mockito.doAnswer;+import static org.mockito.Mockito.doThrow;+import static org.mockito.Mockito.inOrder;import static org.mockito.Mockito.lenient;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.never;-import static org.mockito.Mockito.doThrow;-import static org.mockito.Mockito.doAnswer;-import static org.mockito.Mockito.inOrder;import static org.mockito.Mockito.times;import static org.mockito.Mockito.verify;import static org.mockito.Mockito.when;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 83d808cdd5..5368aa356e 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@@ -10,6 +10,13 @@ import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.CsvSource;import org.junit.jupiter.params.provider.ValueSource;+import javax.net.ssl.SSLContext;+import javax.net.ssl.SSLHandshakeException;+import javax.net.ssl.SSLParameters;+import javax.net.ssl.SSLSocket;+import javax.net.ssl.TrustManager;+import javax.net.ssl.TrustManagerFactory;+import javax.net.ssl.X509TrustManager;import java.io.ByteArrayInputStream;import java.io.ByteArrayOutputStream;import java.io.DataInputStream;@@ -22,21 +29,14 @@ import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;import java.security.KeyStore;+import java.security.cert.CertificateFactory;+import java.security.cert.X509Certificate;import java.time.Instant;import java.util.HashMap;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.concurrent.atomic.AtomicReference;-import javax.net.ssl.SSLContext;-import javax.net.ssl.SSLHandshakeException;-import javax.net.ssl.SSLParameters;-import javax.net.ssl.SSLSocket;-import javax.net.ssl.TrustManager;-import javax.net.ssl.TrustManagerFactory;-import javax.net.ssl.X509TrustManager;-import java.security.cert.CertificateFactory;-import java.security.cert.X509Certificate;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertNotEquals;diff --git a/src/test/java/io/github/hectorvent/floci/services/rdsdata/RdsDataServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/rdsdata/RdsDataServiceTest.javaindex a07d442c95..02a23be5c4 100644--- a/src/test/java/io/github/hectorvent/floci/services/rdsdata/RdsDataServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rdsdata/RdsDataServiceTest.java@@ -9,6 +9,7 @@ import io.github.hectorvent.floci.services.rds.container.RdsBackendGate;import io.github.hectorvent.floci.services.rds.model.DatabaseEngine;import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;import io.github.hectorvent.floci.services.secretsmanager.model.SecretVersion;+import org.h2.Driver;import org.junit.jupiter.api.Test;import java.lang.reflect.Proxy;@@ -25,13 +26,12 @@ import java.util.UUID;import java.util.concurrent.CopyOnWriteArrayList;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicInteger;-import org.h2.Driver;import static org.junit.jupiter.api.Assertions.assertArrayEquals;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertTrue;import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.Mockito.doReturn;import static org.mockito.Mockito.doThrow;diff --git a/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftProxyIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftProxyIntegrationTest.javaindex ac5381ee0c..3a9340bf9d 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftProxyIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftProxyIntegrationTest.java@@ -3,6 +3,8 @@ package io.github.hectorvent.floci.services.redshift;import io.github.hectorvent.floci.services.redshift.model.Cluster;import io.quarkus.test.junit.QuarkusTest;import jakarta.inject.Inject;+import org.awaitility.Awaitility;+import org.awaitility.core.ConditionTimeoutException;import org.junit.jupiter.api.AfterEach;import org.junit.jupiter.api.Test;@@ -13,8 +15,6 @@ import java.sql.SQLException;import java.sql.Statement;import java.time.Duration;import java.util.Objects;-import org.awaitility.Awaitility;-import org.awaitility.core.ConditionTimeoutException;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertThrows;diff --git a/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftQueryHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftQueryHandlerTest.javaindex 73365065f9..fa6d401c53 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftQueryHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftQueryHandlerTest.java@@ -17,6 +17,7 @@ import jakarta.ws.rs.core.Response;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.mockito.ArgumentCaptor;+import java.time.Instant;import java.util.List;import java.util.Map;diff --git a/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftServiceTest.javaindex 2e68b28fc0..179224dc8b 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftServiceTest.java@@ -8,10 +8,10 @@ import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.docker.DockerHostResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;-import io.github.hectorvent.floci.services.rds.proxy.PasswordValidator;import io.github.hectorvent.floci.services.dynamodb.backend.DynamoDbApiStreamReader;import io.github.hectorvent.floci.services.dynamodb.backend.DynamoDbOperations;import io.github.hectorvent.floci.services.dynamodb.backend.DynamoDbStreamReader.CheckpointLifetime;+import io.github.hectorvent.floci.services.rds.proxy.PasswordValidator;import io.github.hectorvent.floci.services.redshift.container.RedshiftContainerHandle;import io.github.hectorvent.floci.services.redshift.container.RedshiftContainerManager;import io.github.hectorvent.floci.services.redshift.model.Cluster;diff --git a/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftSpectrumIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftSpectrumIntegrationTest.javaindex 1dab9c0de8..e04a7a5e03 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftSpectrumIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshift/RedshiftSpectrumIntegrationTest.java@@ -1,16 +1,16 @@package io.github.hectorvent.floci.services.redshift;import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.services.iam.IamService;import io.github.hectorvent.floci.services.glue.GlueService;import io.github.hectorvent.floci.services.glue.model.Database;+import io.github.hectorvent.floci.services.iam.IamService;import io.github.hectorvent.floci.services.redshift.model.Cluster;+import io.github.hectorvent.floci.services.redshift.spectrum.ExternalCatalogRegistry;import io.github.hectorvent.floci.services.redshift.spectrum.ExternalStatement;import io.github.hectorvent.floci.services.redshift.spectrum.ExternalStatementParser;import io.github.hectorvent.floci.services.redshift.spectrum.GlueTableBuilder;-import io.github.hectorvent.floci.services.redshift.spectrum.ExternalCatalogRegistry;-import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.github.hectorvent.floci.services.s3.S3Service;+import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.junit.QuarkusTestProfile;import io.quarkus.test.junit.TestProfile;@@ -21,26 +21,26 @@ import org.junit.jupiter.api.Assumptions;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.Timeout;+import org.postgresql.PGStatement;import java.nio.charset.StandardCharsets;import java.sql.Connection;import java.sql.DriverManager;+import java.sql.PreparedStatement;import java.sql.ResultSet;import java.sql.SQLException;-import java.sql.Statement;import java.sql.Savepoint;+import java.sql.Statement;+import java.time.Duration;+import java.util.ArrayList;+import java.util.List;+import java.util.Map;+import java.util.Objects;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.sql.PreparedStatement;-import java.time.Duration;-import java.util.ArrayList;-import java.util.List;-import java.util.Objects;-import java.util.Map;-import org.postgresql.PGStatement;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertThrows;diff --git a/src/test/java/io/github/hectorvent/floci/services/redshift/container/RedshiftContainerManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/redshift/container/RedshiftContainerManagerTest.javaindex 3575ec2a3b..8ca23d80fc 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshift/container/RedshiftContainerManagerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshift/container/RedshiftContainerManagerTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.redshift.container;import com.github.dockerjava.api.DockerClient;import com.github.dockerjava.api.async.ResultCallback;+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;import com.github.dockerjava.api.command.ExecCreateCmd;import com.github.dockerjava.api.command.ExecCreateCmdResponse;@@ -32,7 +33,6 @@ import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;import java.util.Map;-import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;import java.util.Optional;import static org.junit.jupiter.api.Assertions.assertEquals;@@ -44,12 +44,12 @@ import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyInt;import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.ArgumentMatchers.eq;+import static org.mockito.Mockito.RETURNS_SELF;import static org.mockito.Mockito.clearInvocations;import static org.mockito.Mockito.doThrow;import static org.mockito.Mockito.inOrder;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.never;-import static org.mockito.Mockito.RETURNS_SELF;import static org.mockito.Mockito.verify;import static org.mockito.Mockito.when;diff --git a/src/test/java/io/github/hectorvent/floci/services/redshift/proxy/RedshiftRoleAccessTest.java b/src/test/java/io/github/hectorvent/floci/services/redshift/proxy/RedshiftRoleAccessTest.javaindex 4a15cc2bf4..79115cecbe 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshift/proxy/RedshiftRoleAccessTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshift/proxy/RedshiftRoleAccessTest.java@@ -16,8 +16,8 @@ import java.util.Optional;import static org.hamcrest.MatcherAssert.assertThat;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;-import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertThrows;import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.ArgumentMatchers.eq;import static org.mockito.ArgumentMatchers.isNull;diff --git a/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/ExternalTableMaterializerTest.java b/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/ExternalTableMaterializerTest.javaindex f42ba4594e..57fddd57ad 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/ExternalTableMaterializerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/ExternalTableMaterializerTest.java@@ -38,8 +38,8 @@ import static org.hamcrest.MatcherAssert.assertThat;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.not;-import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertThrows;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyInt;import static org.mockito.ArgumentMatchers.anyString;diff --git a/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/SpectrumCatalogTest.java b/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/SpectrumCatalogTest.javaindex 96751b68d8..7fe21220be 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/SpectrumCatalogTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/SpectrumCatalogTest.java@@ -9,8 +9,8 @@ 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.assertTrue;import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.eq;import static org.mockito.Mockito.mock;diff --git a/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/SpectrumQueryPreparationTest.java b/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/SpectrumQueryPreparationTest.javaindex 7a2c5dacba..8bfbd13e8b 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/SpectrumQueryPreparationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/SpectrumQueryPreparationTest.java@@ -1,7 +1,7 @@package io.github.hectorvent.floci.services.redshift.spectrum;-import io.github.hectorvent.floci.services.glue.GlueService;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.services.glue.GlueService;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/SpectrumS3ReaderTest.java b/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/SpectrumS3ReaderTest.javaindex e964a1cdfa..a7656d5e8c 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/SpectrumS3ReaderTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshift/spectrum/SpectrumS3ReaderTest.java@@ -9,9 +9,9 @@ import io.github.hectorvent.floci.services.s3.S3Service;import io.github.hectorvent.floci.services.s3.model.S3Object;import org.junit.jupiter.api.Test;-import java.util.List;import java.nio.charset.StandardCharsets;import java.util.Arrays;+import java.util.List;import java.util.Optional;import java.util.stream.Stream;@@ -19,9 +19,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertThrows;import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.ArgumentMatchers.eq;-import static org.mockito.Mockito.never;import static org.mockito.Mockito.doThrow;import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.never;import static org.mockito.Mockito.verify;import static org.mockito.Mockito.when;diff --git a/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataColumnMetadataTest.java b/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataColumnMetadataTest.javaindex 53b365d6b7..63be1e17b6 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataColumnMetadataTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataColumnMetadataTest.java@@ -1,7 +1,7 @@package io.github.hectorvent.floci.services.redshiftdata;-import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.node.ArrayNode;import org.h2.Driver;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataServiceTest.javaindex 0ee9b680d1..dc2b599b3b 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataServiceTest.java@@ -6,8 +6,8 @@ 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.redshift.spectrum.SpectrumQueryPreparation;-import io.github.hectorvent.floci.services.redshift.spectrum.SpectrumSession;import io.github.hectorvent.floci.services.redshift.spectrum.SpectrumReadException;+import io.github.hectorvent.floci.services.redshift.spectrum.SpectrumSession;import org.h2.Driver;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;@@ -16,20 +16,20 @@ import java.sql.DriverManager;import java.sql.ResultSetMetaData;import java.sql.SQLException;import java.time.Clock;-import java.util.UUID;import java.util.List;+import java.util.UUID;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;-import static org.mockito.Mockito.mock;-import static org.mockito.Mockito.when;+import static org.mockito.ArgumentMatchers.argThat;+import static org.mockito.ArgumentMatchers.eq;import static org.mockito.Mockito.doThrow;+import static org.mockito.Mockito.mock;import static org.mockito.Mockito.verify;-import static org.mockito.ArgumentMatchers.eq;-import static org.mockito.ArgumentMatchers.argThat;+import static org.mockito.Mockito.when;class RedshiftDataServiceTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/rekognition/RekognitionIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/rekognition/RekognitionIntegrationTest.javaindex e27f4df597..7438acc880 100644--- a/src/test/java/io/github/hectorvent/floci/services/rekognition/RekognitionIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rekognition/RekognitionIntegrationTest.java@@ -3,6 +3,7 @@ import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.*;/**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 b18232b14a..571807f246 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@@ -6,8 +6,8 @@ import java.util.Base64;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertTrue;import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;/*** Unit tests for the pure pagination math behind ListResources/Search:diff --git a/src/test/java/io/github/hectorvent/floci/services/resourcegroupstagging/ResourceGroupsTaggingServicePersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/resourcegroupstagging/ResourceGroupsTaggingServicePersistenceTest.javaindex 71a0f653d1..6d4d7c109e 100644--- a/src/test/java/io/github/hectorvent/floci/services/resourcegroupstagging/ResourceGroupsTaggingServicePersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/resourcegroupstagging/ResourceGroupsTaggingServicePersistenceTest.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.resourcegroupstagging;import com.fasterxml.jackson.core.type.TypeReference;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.resourcegroupstagging.model.ResourceTagMapping;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/route53resolver/GetFirewallDomainListConsumerTest.java b/src/test/java/io/github/hectorvent/floci/services/route53resolver/GetFirewallDomainListConsumerTest.javaindex cb0248bc13..7b930897cc 100644--- a/src/test/java/io/github/hectorvent/floci/services/route53resolver/GetFirewallDomainListConsumerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/route53resolver/GetFirewallDomainListConsumerTest.java@@ -1,5 +1,10 @@package io.github.hectorvent.floci.services.route53resolver;+import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;+import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.BeforeAll;+import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasItems;@@ -7,11 +12,6 @@ import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.notNullValue;import static org.hamcrest.Matchers.startsWith;-import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;-import io.quarkus.test.junit.QuarkusTest;-import org.junit.jupiter.api.BeforeAll;-import org.junit.jupiter.api.Test;-/*** Integration tests for {@code Route53Resolver.GetFirewallDomainList}.*diff --git a/src/test/java/io/github/hectorvent/floci/services/route53resolver/Route53ResolverIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/route53resolver/Route53ResolverIntegrationTest.javaindex 42507d408a..bb242bfe36 100644--- a/src/test/java/io/github/hectorvent/floci/services/route53resolver/Route53ResolverIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/route53resolver/Route53ResolverIntegrationTest.java@@ -1,15 +1,15 @@package io.github.hectorvent.floci.services.route53resolver;-import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.equalTo;-import static org.hamcrest.Matchers.hasItems;-import static org.hamcrest.Matchers.startsWith;-import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.hasItems;+import static org.hamcrest.Matchers.startsWith;+/*** Integration tests for Route 53 Resolver DNS Firewall operations* (JSON 1.1 protocol, {@code X-Amz-Target: Route53Resolver.*}).diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/CloudFormationHijackTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/CloudFormationHijackTest.javaindex e1902162a2..c595241449 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/CloudFormationHijackTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/CloudFormationHijackTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.s3;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.*;diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/FilterTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/FilterTest.javaindex 3239d9362e..bb7fd07895 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/FilterTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/FilterTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.s3;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.*;diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3AuthEnforcementIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3AuthEnforcementIntegrationTest.javaindex 47616cbfa1..93a71a59d5 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3AuthEnforcementIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3AuthEnforcementIntegrationTest.java@@ -12,6 +12,8 @@ import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;+import javax.crypto.Mac;+import javax.crypto.spec.SecretKeySpec;import java.net.URI;import java.net.URLEncoder;import java.net.http.HttpClient;@@ -25,8 +27,6 @@ import java.time.format.DateTimeFormatter;import java.util.Arrays;import java.util.Map;import java.util.stream.Collectors;-import javax.crypto.Mac;-import javax.crypto.spec.SecretKeySpec;import static io.restassured.RestAssured.given;import static org.hamcrest.MatcherAssert.assertThat;diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3BucketNameTraversalIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3BucketNameTraversalIntegrationTest.javaindex 76b5528ea8..430281ab71 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3BucketNameTraversalIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3BucketNameTraversalIntegrationTest.java@@ -6,8 +6,8 @@ import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.ValueSource;import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.anyOf;+import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.is;import static org.hamcrest.Matchers.not;diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3ConditionalWriteIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3ConditionalWriteIntegrationTest.javaindex 51077d5c8d..785f92bef7 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3ConditionalWriteIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3ConditionalWriteIntegrationTest.java@@ -13,10 +13,10 @@ import java.util.concurrent.ExecutorService;import java.util.concurrent.Executors;import java.util.concurrent.Future;+import static io.restassured.RestAssured.given;import static java.util.Collections.frequency;import static java.util.concurrent.TimeUnit.SECONDS;import static java.util.stream.Collectors.toList;-import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.notNullValue;diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3ControlUrlEncodedArnIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3ControlUrlEncodedArnIntegrationTest.javaindex 8ccbd4a3c4..973d7c534b 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3ControlUrlEncodedArnIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3ControlUrlEncodedArnIntegrationTest.java@@ -1,8 +1,8 @@package io.github.hectorvent.floci.services.s3;import io.github.hectorvent.floci.core.common.XmlParser;-import io.restassured.response.Response;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.response.Response;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3DumpTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3DumpTest.javaindex 0d875871d9..21f1eca590 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3DumpTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3DumpTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.s3;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;@QuarkusTestdiff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3IntegrationTest.javaindex 82706b4eae..e2ab433a05 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3IntegrationTest.java@@ -1,16 +1,16 @@package io.github.hectorvent.floci.services.s3;import io.quarkus.test.junit.QuarkusTest;+import io.restassured.config.DecoderConfig;+import io.restassured.config.RestAssuredConfig;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import io.restassured.config.DecoderConfig;-import io.restassured.config.RestAssuredConfig;+import java.nio.charset.StandardCharsets;import java.security.MessageDigest;import java.security.NoSuchAlgorithmException;-import java.nio.charset.StandardCharsets;import java.util.Arrays;import java.util.Base64;import java.util.List;diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3LeadingSlashKeyAuthEnforcementIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3LeadingSlashKeyAuthEnforcementIntegrationTest.javaindex 7ccad6c9d8..320561c33e 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3LeadingSlashKeyAuthEnforcementIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3LeadingSlashKeyAuthEnforcementIntegrationTest.java@@ -10,6 +10,8 @@ import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;+import javax.crypto.Mac;+import javax.crypto.spec.SecretKeySpec;import java.io.ByteArrayOutputStream;import java.io.InputStream;import java.io.OutputStream;@@ -26,8 +28,6 @@ import java.time.ZoneOffset;import java.time.format.DateTimeFormatter;import java.util.LinkedHashMap;import java.util.Map;-import javax.crypto.Mac;-import javax.crypto.spec.SecretKeySpec;import static io.restassured.RestAssured.given;import static org.hamcrest.MatcherAssert.assertThat;diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3NotificationDestinationValidationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3NotificationDestinationValidationIntegrationTest.javaindex 67b4ea4140..a7b6e17d65 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3NotificationDestinationValidationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3NotificationDestinationValidationIntegrationTest.java@@ -21,12 +21,12 @@ import java.util.Map;import java.util.UUID;import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.not;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertTrue;-import static org.hamcrest.Matchers.containsString;-import static org.hamcrest.Matchers.not;import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.ArgumentMatchers.eq;import static org.mockito.ArgumentMatchers.isNull;diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3PresignedPostAuthEnforcementIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3PresignedPostAuthEnforcementIntegrationTest.javaindex 1db64ec18c..e9473f8864 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3PresignedPostAuthEnforcementIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3PresignedPostAuthEnforcementIntegrationTest.java@@ -9,14 +9,14 @@ import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;+import javax.crypto.Mac;+import javax.crypto.spec.SecretKeySpec;import java.nio.charset.StandardCharsets;import java.time.Instant;import java.time.ZoneOffset;import java.time.format.DateTimeFormatter;import java.util.Base64;import java.util.Map;-import javax.crypto.Mac;-import javax.crypto.spec.SecretKeySpec;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.equalTo;diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTaggingTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTaggingTest.javaindex 7669ee7f24..8e69746012 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTaggingTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTaggingTest.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.s3;-import static org.junit.jupiter.api.Assertions.*;-import org.junit.jupiter.api.Test;+import static org.junit.jupiter.api.Assertions.*;+/*** Tests for S3 tagging: service-layer behavior and {@link S3RequestParser} utility methods.*diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTest.javaindex dcac975cb9..67490f6b5b 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTest.java@@ -8,6 +8,7 @@ import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.services.lambda.LambdaService;import io.github.hectorvent.floci.services.lambda.model.InvocationType;import io.github.hectorvent.floci.services.lambda.model.LambdaFunction;+import io.github.hectorvent.floci.services.s3.model.Bucket;import io.github.hectorvent.floci.services.s3.model.ChecksumType;import io.github.hectorvent.floci.services.s3.model.FilterRule;import io.github.hectorvent.floci.services.s3.model.GetObjectAttributesResult;@@ -15,7 +16,6 @@ import io.github.hectorvent.floci.services.s3.model.LambdaNotification;import io.github.hectorvent.floci.services.s3.model.NotificationConfiguration;import io.github.hectorvent.floci.services.s3.model.ObjectAttributeName;import io.github.hectorvent.floci.services.s3.model.PutObjectOptions;-import io.github.hectorvent.floci.services.s3.model.Bucket;import io.github.hectorvent.floci.services.s3.model.S3Object;import io.github.hectorvent.floci.services.s3.model.WebsiteConfiguration;import org.junit.jupiter.api.BeforeEach;@@ -28,10 +28,10 @@ import java.io.IOException;import java.net.URLDecoder;import java.nio.charset.StandardCharsets;import java.nio.file.Files;+import java.nio.file.Path;import java.security.MessageDigest;import java.security.NoSuchAlgorithmException;import java.util.HexFormat;-import java.nio.file.Path;import java.util.List;import java.util.Map;import java.util.Set;diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3VirtualHostFilterTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3VirtualHostFilterTest.javaindex 1ab96b3eca..3bb9ac63e3 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3VirtualHostFilterTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3VirtualHostFilterTest.java@@ -13,7 +13,6 @@ import org.junit.jupiter.params.provider.NullSource;import org.mockito.ArgumentCaptor;import java.net.URI;-import java.util.Optional;import java.util.Set;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 ae22fd565b..404bf4b8df 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@@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;import static io.restassured.RestAssured.given;-import static org.junit.jupiter.api.Assertions.assertEquals;import static org.hamcrest.Matchers.*;+import static org.junit.jupiter.api.Assertions.assertEquals;/*** Integration tests for virtual-hosted-style S3 requests.diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/UriBuilderTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/UriBuilderTest.javaindex 2b303fb39f..73eda3a90c 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/UriBuilderTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/UriBuilderTest.java@@ -2,7 +2,9 @@ package io.github.hectorvent.floci.services.s3;import jakarta.ws.rs.core.UriBuilder;import org.junit.jupiter.api.Test;+import java.net.URI;+import static org.junit.jupiter.api.Assertions.assertEquals;class UriBuilderTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/sagemaker/SageMakerGpuIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/sagemaker/SageMakerGpuIntegrationTest.javaindex 4ac0719ba7..20940e0069 100644--- a/src/test/java/io/github/hectorvent/floci/services/sagemaker/SageMakerGpuIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sagemaker/SageMakerGpuIntegrationTest.java@@ -2,8 +2,8 @@ package io.github.hectorvent.floci.services.sagemaker;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;-import io.quarkus.test.junit.TestProfile;import io.quarkus.test.junit.QuarkusTestProfile;+import io.quarkus.test.junit.TestProfile;import io.restassured.response.Response;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/sagemaker/SageMakerGpuResolverTest.java b/src/test/java/io/github/hectorvent/floci/services/sagemaker/SageMakerGpuResolverTest.javaindex 1016944521..30d8788eb1 100644--- a/src/test/java/io/github/hectorvent/floci/services/sagemaker/SageMakerGpuResolverTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sagemaker/SageMakerGpuResolverTest.java@@ -1,13 +1,13 @@package io.github.hectorvent.floci.services.sagemaker;+import com.github.dockerjava.api.model.DeviceRequest;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.config.EmulatorConfig.SageMakerServiceConfig.GpuRequestMode;-import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;+import io.github.hectorvent.floci.core.common.docker.ContainerBuilder;import io.github.hectorvent.floci.core.common.docker.ContainerSpec;import io.github.hectorvent.floci.core.common.docker.CurrentContainerNetworkResolver;import io.github.hectorvent.floci.core.common.docker.DockerHostResolver;-import com.github.dockerjava.api.model.DeviceRequest;import org.junit.jupiter.api.Test;import java.util.List;diff --git a/src/test/java/io/github/hectorvent/floci/services/scheduler/ScheduleDispatcherTest.java b/src/test/java/io/github/hectorvent/floci/services/scheduler/ScheduleDispatcherTest.javaindex fc4871c0e9..5ee05d9164 100644--- a/src/test/java/io/github/hectorvent/floci/services/scheduler/ScheduleDispatcherTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/scheduler/ScheduleDispatcherTest.java@@ -2,9 +2,9 @@ package io.github.hectorvent.floci.services.scheduler;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;-import io.github.hectorvent.floci.services.scheduler.model.Schedule;import io.github.hectorvent.floci.services.scheduler.model.DeadLetterConfig;import io.github.hectorvent.floci.services.scheduler.model.RetryPolicy;+import io.github.hectorvent.floci.services.scheduler.model.Schedule;import io.github.hectorvent.floci.services.scheduler.model.Target;import io.github.hectorvent.floci.services.sqs.SqsService;import io.github.hectorvent.floci.services.sqs.model.MessageAttributeValue;diff --git a/src/test/java/io/github/hectorvent/floci/services/scheduler/ScheduleInvokerTest.java b/src/test/java/io/github/hectorvent/floci/services/scheduler/ScheduleInvokerTest.javaindex db10396284..a3489e0467 100644--- a/src/test/java/io/github/hectorvent/floci/services/scheduler/ScheduleInvokerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/scheduler/ScheduleInvokerTest.java@@ -8,9 +8,9 @@ import io.github.hectorvent.floci.services.ecs.model.ContainerOverride;import io.github.hectorvent.floci.services.ecs.model.LaunchType;import io.github.hectorvent.floci.services.eventbridge.EventBridgeService;import io.github.hectorvent.floci.services.lambda.LambdaService;-import io.github.hectorvent.floci.services.scheduler.model.EventBridgeParameters;import io.github.hectorvent.floci.services.scheduler.model.AwsVpcConfiguration;import io.github.hectorvent.floci.services.scheduler.model.EcsParameters;+import io.github.hectorvent.floci.services.scheduler.model.EventBridgeParameters;import io.github.hectorvent.floci.services.scheduler.model.NetworkConfiguration;import io.github.hectorvent.floci.services.scheduler.model.Schedule;import io.github.hectorvent.floci.services.scheduler.model.SqsParameters;@@ -36,9 +36,9 @@ import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertThrows;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyString;+import static org.mockito.ArgumentMatchers.argThat;import static org.mockito.ArgumentMatchers.eq;import static org.mockito.ArgumentMatchers.isNull;-import static org.mockito.ArgumentMatchers.argThat;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.never;import static org.mockito.Mockito.verify;diff --git a/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerIntegrationTest.javaindex c12c4e5ffa..7c94a20656 100644--- a/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/scheduler/SchedulerIntegrationTest.java@@ -1,14 +1,13 @@package io.github.hectorvent.floci.services.scheduler;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;-import com.fasterxml.jackson.databind.JsonNode;-import com.fasterxml.jackson.databind.ObjectMapper;-import java.util.List;import static io.restassured.RestAssured.given;diff --git a/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerRotationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerRotationIntegrationTest.javaindex 36e87e76d9..1351f86169 100644--- a/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerRotationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerRotationIntegrationTest.java@@ -4,8 +4,8 @@ import io.github.hectorvent.floci.services.lambda.LambdaService;import io.github.hectorvent.floci.services.lambda.model.InvocationType;import io.github.hectorvent.floci.services.lambda.model.InvokeResult;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;-import io.quarkus.test.junit.QuarkusTest;import io.quarkus.test.InjectMock;+import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.AfterEach;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;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 48d2883737..d15a8298a3 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@@ -2,8 +2,8 @@ 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 jakarta.inject.Inject;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesConfigurationSetServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesConfigurationSetServiceTest.javaindex a6f4147ac3..7afcbfb13e 100644--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesConfigurationSetServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesConfigurationSetServiceTest.java@@ -8,8 +8,8 @@ import io.github.hectorvent.floci.services.ses.model.ConfigurationSet;import io.github.hectorvent.floci.services.ses.model.DeliveryOptions;import io.github.hectorvent.floci.services.ses.model.MessageSecurityOptions;import io.github.hectorvent.floci.services.ses.model.SigningScheme;-import io.github.hectorvent.floci.services.ses.model.TrackingOptions;import io.github.hectorvent.floci.services.ses.model.Tag;+import io.github.hectorvent.floci.services.ses.model.TrackingOptions;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesCvetServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesCvetServiceTest.javaindex b277079161..1ec1658161 100644--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesCvetServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesCvetServiceTest.java@@ -4,11 +4,11 @@ import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.services.ses.model.CustomVerificationEmailTemplate;import io.github.hectorvent.floci.services.ses.model.Tag;--import java.util.List;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.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesMetricsV2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesMetricsV2IntegrationTest.javaindex ddb0e3cd52..5d4f641240 100644--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesMetricsV2IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesMetricsV2IntegrationTest.java@@ -14,12 +14,12 @@ import java.util.Base64;import java.util.List;import static io.restassured.RestAssured.given;-import static org.junit.jupiter.api.Assertions.assertEquals;import static org.hamcrest.Matchers.contains;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.empty;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasSize;+import static org.junit.jupiter.api.Assertions.assertEquals;/*** Integration tests for {@code POST /v2/email/metrics/batch} (BatchGetMetricData).diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceHelperTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceHelperTest.javaindex 0324356226..7d1c487138 100644--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceHelperTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceHelperTest.java@@ -4,9 +4,9 @@ import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.services.ses.model.BulkEmailEntryResult;import org.junit.jupiter.api.Test;-import org.junit.jupiter.params.provider.MethodSource;-import org.junit.jupiter.params.provider.Arguments;import org.junit.jupiter.params.ParameterizedTest;+import org.junit.jupiter.params.provider.Arguments;+import org.junit.jupiter.params.provider.MethodSource;import java.util.stream.Stream;diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceSmtpTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceSmtpTest.javaindex c9bfa1344f..fa938e076b 100644--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceSmtpTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceSmtpTest.java@@ -13,11 +13,10 @@ import io.github.hectorvent.floci.services.ses.model.SentEmail;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.extension.ExtendWith;+import org.mockito.ArgumentCaptor;import org.mockito.Mock;import org.mockito.junit.jupiter.MockitoExtension;-import org.mockito.ArgumentCaptor;-import java.nio.charset.StandardCharsets;import java.util.Base64;import java.util.List;diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceTestBuilder.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceTestBuilder.javaindex b27aaaeee6..2bd7623b42 100644--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceTestBuilder.java+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceTestBuilder.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.ses;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.services.acm.AcmService;+import io.github.hectorvent.floci.services.route53.Route53Service;import io.github.hectorvent.floci.services.ses.model.AccountSuppressionAttributes;import io.github.hectorvent.floci.services.ses.model.ConfigurationSet;import io.github.hectorvent.floci.services.ses.model.Contact;@@ -16,7 +17,6 @@ import io.github.hectorvent.floci.services.ses.model.SentEmail;import io.github.hectorvent.floci.services.ses.model.SuppressedDestination;import io.github.hectorvent.floci.services.ses.model.Tenant;import io.github.hectorvent.floci.services.ses.model.TenantResourceAssociation;-import io.github.hectorvent.floci.services.route53.Route53Service;import java.security.SecureRandom;import java.time.Clock;diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesTemplateServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesTemplateServiceTest.javaindex 656c3e3e3a..7c054bc11a 100644--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesTemplateServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesTemplateServiceTest.java@@ -10,9 +10,9 @@ import io.github.hectorvent.floci.services.ses.model.Tag;import io.github.hectorvent.floci.testing.MutableClock;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;-import org.junit.jupiter.params.provider.MethodSource;-import org.junit.jupiter.params.provider.Arguments;import org.junit.jupiter.params.ParameterizedTest;+import org.junit.jupiter.params.provider.Arguments;+import org.junit.jupiter.params.provider.MethodSource;import java.security.SecureRandom;import java.time.Clock;@@ -21,9 +21,9 @@ import java.util.List;import java.util.stream.Stream;import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertNotNull;+import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;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 0ddd2b73cf..a006ae4f50 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@@ -16,8 +16,8 @@ import java.util.UUID;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasKey;-import static org.hamcrest.Matchers.notNullValue;import static org.hamcrest.Matchers.not;+import static org.hamcrest.Matchers.notNullValue;import static org.hamcrest.Matchers.nullValue;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;diff --git a/src/test/java/io/github/hectorvent/floci/services/sns/SnsHttpDeliveryIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/sns/SnsHttpDeliveryIntegrationTest.javaindex 96ca3c23fb..8957df271e 100644--- a/src/test/java/io/github/hectorvent/floci/services/sns/SnsHttpDeliveryIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sns/SnsHttpDeliveryIntegrationTest.java@@ -11,10 +11,10 @@ import org.junit.jupiter.api.Test;import java.io.IOException;import java.net.InetSocketAddress;import java.nio.charset.StandardCharsets;-import java.util.concurrent.CopyOnWriteArrayList;-import java.util.concurrent.TimeUnit;import java.util.List;import java.util.Map;+import java.util.concurrent.CopyOnWriteArrayList;+import java.util.concurrent.TimeUnit;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.containsString;diff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsInspectionControllerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsInspectionControllerIntegrationTest.javaindex 47a31fe688..ea90dbe104 100644--- a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsInspectionControllerIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsInspectionControllerIntegrationTest.java@@ -2,7 +2,6 @@ package io.github.hectorvent.floci.services.sqs;import io.quarkus.test.junit.QuarkusTest;import io.restassured.specification.RequestSpecification;-import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.DisplayName;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsIntegrationTest.javaindex 83d78027c0..7fb6eee656 100644--- a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsIntegrationTest.java@@ -10,10 +10,10 @@ import java.util.List;import java.util.Map;import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.*;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertTrue;-import static org.hamcrest.Matchers.*;@QuarkusTest@TestMethodOrder(MethodOrderer.OrderAnnotation.class)diff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsJsonProtocolTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsJsonProtocolTest.javaindex fc563d1359..e43f3b088b 100644--- a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsJsonProtocolTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsJsonProtocolTest.java@@ -9,8 +9,8 @@ import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;import static io.restassured.RestAssured.given;-import static org.junit.jupiter.api.Assertions.assertTrue;import static org.hamcrest.Matchers.*;+import static org.junit.jupiter.api.Assertions.assertTrue;/*** Integration tests for the SQS JSON 1.0 protocol (application/x-amz-json-1.0).diff --git a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmCommandServiceDirectExecutionTest.java b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmCommandServiceDirectExecutionTest.javaindex 7e8c428014..305b33ed80 100644--- a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmCommandServiceDirectExecutionTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmCommandServiceDirectExecutionTest.java@@ -5,9 +5,9 @@ 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.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.ssm.model.Command;import io.github.hectorvent.floci.services.ssm.model.CommandInvocation;diff --git a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmDirectCommandExecutorTest.java b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmDirectCommandExecutorTest.javaindex 56ef8a9ed1..64a6a34213 100644--- a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmDirectCommandExecutorTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmDirectCommandExecutorTest.java@@ -6,9 +6,9 @@ import com.github.dockerjava.api.command.ExecCreateCmd;import com.github.dockerjava.api.command.ExecCreateCmdResponse;import com.github.dockerjava.api.command.ExecStartCmd;import com.github.dockerjava.api.command.InspectExecCmd;+import com.github.dockerjava.api.command.InspectExecResponse;import com.github.dockerjava.api.model.Frame;import com.github.dockerjava.api.model.StreamType;-import com.github.dockerjava.api.command.InspectExecResponse;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.model.Instance;import io.github.hectorvent.floci.services.ec2.model.InstanceState;diff --git a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmSecretsManagerReferenceIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmSecretsManagerReferenceIntegrationTest.javaindex c3b3f9d328..8d4fa063f9 100644--- a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmSecretsManagerReferenceIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmSecretsManagerReferenceIntegrationTest.java@@ -8,13 +8,13 @@ import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;-import static org.junit.jupiter.api.Assertions.assertEquals;import static org.hamcrest.Matchers.containsInAnyOrder;import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.hasKey;import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.startsWith;+import static org.junit.jupiter.api.Assertions.assertEquals;/*** Parameter Store answers {@code /aws/reference/secretsmanager/<secret-id>} from Secrets Manager.diff --git a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmSendCommandIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmSendCommandIntegrationTest.javaindex ee1dc14383..98d3eec821 100644--- a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmSendCommandIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmSendCommandIntegrationTest.java@@ -3,8 +3,8 @@ package io.github.hectorvent.floci.services.ssm;import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusMock;import io.quarkus.test.junit.QuarkusTest;-import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.BeforeAll;+import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.MethodOrderer;import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;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 e0547a57b2..0f5b80b871 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@@ -7,13 +7,15 @@ 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;-import io.github.hectorvent.floci.services.ssoadmin.model.AssignmentOperation;-import io.github.hectorvent.floci.services.ssoadmin.model.AssignmentDeletionOperation;+import io.github.hectorvent.floci.services.identitystore.IdentityStoreService;+import io.github.hectorvent.floci.services.organizations.OrganizationsService;import io.github.hectorvent.floci.services.ssoadmin.model.ApplicationAccessScope;import io.github.hectorvent.floci.services.ssoadmin.model.ApplicationAssignment;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.InstanceAccessControlAttributeConfiguration;import io.github.hectorvent.floci.services.ssoadmin.model.InstanceUpdateState;import io.github.hectorvent.floci.services.ssoadmin.model.PermissionSet;@@ -23,8 +25,6 @@ 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 io.github.hectorvent.floci.services.identitystore.IdentityStoreService;-import io.github.hectorvent.floci.services.organizations.OrganizationsService;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;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 a22a995415..457ae79d64 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@@ -15,8 +15,8 @@ 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;-import static org.junit.jupiter.api.Assertions.assertTrue;import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;class SsoOidcServiceTest {private final ObjectMapper mapper = new ObjectMapper();diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorChoiceRuntimeTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorChoiceRuntimeTest.javaindex 1c440d93b7..eaa51554eb 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorChoiceRuntimeTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorChoiceRuntimeTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.stepfunctions;+import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.services.cloudformation.CloudFormationQueryHandler;import io.github.hectorvent.floci.services.dynamodb.DynamoDbFacade;@@ -15,7 +16,6 @@ import io.github.hectorvent.floci.services.sqs.SqsJsonHandler;import io.github.hectorvent.floci.services.stepfunctions.model.Execution;import io.github.hectorvent.floci.services.stepfunctions.model.HistoryEvent;import io.github.hectorvent.floci.services.stepfunctions.model.StateMachine;-import com.fasterxml.jackson.databind.ObjectMapper;import jakarta.enterprise.inject.Instance;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;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 be93ac5c72..ac791b2de8 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@@ -16,7 +16,6 @@ import io.github.hectorvent.floci.services.stepfunctions.model.HistoryEvent;import io.github.hectorvent.floci.services.stepfunctions.model.StateMachine;import io.quarkus.logging.Log;import io.quarkus.test.junit.QuarkusTest;-import io.smallrye.mutiny.Uni;import io.vertx.core.json.JsonObject;import io.vertx.mutiny.core.MultiMap;diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorNestedStartExecutionTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorNestedStartExecutionTest.javaindex 89ccf189ea..f8aefc36ab 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorNestedStartExecutionTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorNestedStartExecutionTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.stepfunctions;+import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.cloudformation.CloudFormationQueryHandler;@@ -16,7 +17,6 @@ import io.github.hectorvent.floci.services.sqs.SqsJsonHandler;import io.github.hectorvent.floci.services.stepfunctions.model.Execution;import io.github.hectorvent.floci.services.stepfunctions.model.HistoryEvent;import io.github.hectorvent.floci.services.stepfunctions.model.StateMachine;-import com.fasterxml.jackson.databind.ObjectMapper;import jakarta.enterprise.inject.Instance;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorResultPathTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorResultPathTest.javaindex 2206fed367..53a67259d0 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorResultPathTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorResultPathTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.stepfunctions;+import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.services.cloudformation.CloudFormationQueryHandler;import io.github.hectorvent.floci.services.dynamodb.DynamoDbFacade;@@ -15,7 +16,6 @@ import io.github.hectorvent.floci.services.sqs.SqsJsonHandler;import io.github.hectorvent.floci.services.stepfunctions.model.Execution;import io.github.hectorvent.floci.services.stepfunctions.model.HistoryEvent;import io.github.hectorvent.floci.services.stepfunctions.model.StateMachine;-import com.fasterxml.jackson.databind.ObjectMapper;import jakarta.enterprise.inject.Instance;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorResultWriterTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorResultWriterTest.javaindex 9bb50234ec..78cd0f70eb 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorResultWriterTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/AslExecutorResultWriterTest.java@@ -1,9 +1,9 @@package io.github.hectorvent.floci.services.stepfunctions;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.ObjectMapper;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.dynamodb.DynamoDbFacade;diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsAliasesIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsAliasesIntegrationTest.javaindex ed71cdcd20..d09c72fd14 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsAliasesIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsAliasesIntegrationTest.java@@ -7,11 +7,11 @@ import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.is;import static org.junit.jupiter.api.Assertions.assertNotEquals;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertNull;-import static org.hamcrest.Matchers.containsString;-import static org.hamcrest.Matchers.is;/** State-machine aliases resolve to their published version while preserving execution metadata. */@QuarkusTestdiff --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 6babd5efb3..fdfc1e4eb5 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@@ -13,10 +13,10 @@ import java.util.ArrayList;import java.util.List;import static io.restassured.RestAssured.given;+import static org.awaitility.Awaitility.await;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.notNullValue;import static org.hamcrest.Matchers.nullValue;-import static org.awaitility.Awaitility.await;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertTrue;diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServicePersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServicePersistenceTest.javaindex aa070af3f8..1975c51bb1 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServicePersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServicePersistenceTest.java@@ -18,17 +18,17 @@ import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;import org.mockito.Mockito;+import java.nio.file.Path;import java.text.MessageFormat;import java.util.ArrayList;import java.util.HashMap;import java.util.List;import java.util.Map;import java.util.Optional;-import java.nio.file.Path;import java.util.concurrent.CountDownLatch;import java.util.concurrent.TimeUnit;-import java.util.concurrent.atomic.AtomicReference;import java.util.concurrent.atomic.AtomicInteger;+import java.util.concurrent.atomic.AtomicReference;import java.util.logging.Handler;import java.util.logging.Level;import java.util.logging.LogRecord;@@ -39,11 +39,11 @@ import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertTrue;-import static org.mockito.Mockito.verifyNoInteractions;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyList;import static org.mockito.ArgumentMatchers.isNull;import static org.mockito.Mockito.doAnswer;+import static org.mockito.Mockito.verifyNoInteractions;/** Verifies executions abandoned by a restart reach a terminal status when the emulator comes back. */class StepFunctionsServicePersistenceTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServiceStartExecutionExpressTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServiceStartExecutionExpressTest.javaindex 0722d7ea97..2489e2a648 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServiceStartExecutionExpressTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServiceStartExecutionExpressTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.stepfunctions;+import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;@@ -7,7 +8,6 @@ import io.github.hectorvent.floci.services.stepfunctions.model.Activity;import io.github.hectorvent.floci.services.stepfunctions.model.Execution;import io.github.hectorvent.floci.services.stepfunctions.model.HistoryEvent;import io.github.hectorvent.floci.services.stepfunctions.model.StateMachine;-import com.fasterxml.jackson.databind.ObjectMapper;import org.junit.jupiter.api.Test;import org.mockito.ArgumentCaptor;diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServiceStartExecutionIdempotencyTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServiceStartExecutionIdempotencyTest.javaindex bf467a43b8..bb62b0e948 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServiceStartExecutionIdempotencyTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServiceStartExecutionIdempotencyTest.java@@ -1,5 +1,6 @@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.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;@@ -7,7 +8,6 @@ import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.stepfunctions.model.Activity;import io.github.hectorvent.floci.services.stepfunctions.model.Execution;import io.github.hectorvent.floci.services.stepfunctions.model.StateMachine;-import com.fasterxml.jackson.databind.ObjectMapper;import org.junit.jupiter.api.Test;import static org.junit.jupiter.api.Assertions.assertEquals;diff --git a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServiceStartExecutionRaceTest.java b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServiceStartExecutionRaceTest.javaindex 8dcb9f7155..b3a9a05b30 100644--- a/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServiceStartExecutionRaceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/stepfunctions/StepFunctionsServiceStartExecutionRaceTest.java@@ -1,5 +1,6 @@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.core.common.RegionResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;@@ -7,7 +8,6 @@ import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.stepfunctions.model.Execution;import io.github.hectorvent.floci.services.stepfunctions.model.StateMachine;-import com.fasterxml.jackson.databind.ObjectMapper;import org.junit.jupiter.api.Test;import java.util.ArrayList;diff --git a/src/test/java/io/github/hectorvent/floci/services/swf/SwfServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/swf/SwfServiceTest.javaindex f3b000a7bb..35a2f49dc3 100644--- a/src/test/java/io/github/hectorvent/floci/services/swf/SwfServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/swf/SwfServiceTest.java@@ -4,6 +4,8 @@ import com.fasterxml.jackson.core.type.TypeReference;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.core.storage.InMemoryStorage;+import io.github.hectorvent.floci.core.storage.StorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.swf.SwfService.Decision;import io.github.hectorvent.floci.services.swf.SwfService.ExecutionFilter;@@ -24,9 +26,6 @@ import java.time.Duration;import java.util.ArrayList;import java.util.LinkedHashMap;import java.util.LinkedHashSet;-import io.github.hectorvent.floci.core.storage.InMemoryStorage;-import io.github.hectorvent.floci.core.storage.StorageBackend;-import java.util.concurrent.atomic.AtomicBoolean;import java.util.List;import java.util.Map;import java.util.Optional;@@ -36,14 +35,15 @@ import java.util.concurrent.ExecutionException;import java.util.concurrent.ExecutorService;import java.util.concurrent.Executors;import java.util.concurrent.Future;-import java.util.concurrent.TimeoutException;import java.util.concurrent.TimeUnit;+import java.util.concurrent.TimeoutException;+import java.util.concurrent.atomic.AtomicBoolean;import java.util.stream.Collectors;import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertNotEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertInstanceOf;+import static org.junit.jupiter.api.Assertions.assertNotEquals;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertThrows;diff --git a/src/test/java/io/github/hectorvent/floci/services/textract/TextractIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/textract/TextractIntegrationTest.javaindex c05720837a..928c06ba08 100644--- a/src/test/java/io/github/hectorvent/floci/services/textract/TextractIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/textract/TextractIntegrationTest.java@@ -3,9 +3,10 @@ import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;+import static io.restassured.RestAssured.given;-import static org.hamcrest.Matchers.*;import static org.hamcrest.MatcherAssert.assertThat;+import static org.hamcrest.Matchers.*;/*** Integration tests for the Amazon Textract stub.* Validates AWS-compatible wire format using RestAssured.diff --git a/src/test/java/io/github/hectorvent/floci/services/transcribe/TranscribeServicePersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/transcribe/TranscribeServicePersistenceTest.javaindex 1ab7934eec..9791cb3fa5 100644--- a/src/test/java/io/github/hectorvent/floci/services/transcribe/TranscribeServicePersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/transcribe/TranscribeServicePersistenceTest.java@@ -2,9 +2,9 @@ package io.github.hectorvent.floci.services.transcribe;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;-import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.transcribe.model.VocabularyInfo;import org.junit.jupiter.api.Test;diff --git a/src/test/java/io/github/hectorvent/floci/services/transcribe/TranscribeServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/transcribe/TranscribeServiceTest.javaindex 1b0b9c7ad8..80579122d8 100644--- a/src/test/java/io/github/hectorvent/floci/services/transcribe/TranscribeServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/transcribe/TranscribeServiceTest.java@@ -1,7 +1,7 @@package io.github.hectorvent.floci.services.transcribe;-import io.github.hectorvent.floci.core.common.RegionResolver;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.core.storage.StorageFactory;import io.github.hectorvent.floci.services.transcribe.model.VocabularyInfo;diff --git a/src/test/java/io/github/hectorvent/floci/services/transfer/TransferServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/transfer/TransferServiceTest.javaindex fdb3bacaf6..d88e1fcfdd 100644--- a/src/test/java/io/github/hectorvent/floci/services/transfer/TransferServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/transfer/TransferServiceTest.java@@ -2,17 +2,17 @@ package io.github.hectorvent.floci.services.transfer;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;-import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.AwsArnUtils;-import io.github.hectorvent.floci.core.common.RequestContext;+import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.core.common.RequestContext;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageFactory;-import jakarta.enterprise.inject.Instance;import io.github.hectorvent.floci.services.transfer.model.Server;import io.github.hectorvent.floci.services.transfer.model.SshPublicKey;import io.github.hectorvent.floci.services.transfer.model.User;+import jakarta.enterprise.inject.Instance;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.mockito.Mockito;@@ -24,10 +24,10 @@ import java.util.Optional;import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertThrows;import static org.junit.jupiter.api.Assertions.assertTrue;-import static org.mockito.Mockito.when;-import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.ArgumentMatchers.any;+import static org.mockito.ArgumentMatchers.anyString;import static org.mockito.Mockito.doThrow;+import static org.mockito.Mockito.when;class TransferServiceTest {diff --git a/src/test/java/io/github/hectorvent/floci/services/translate/TranslateIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/translate/TranslateIntegrationTest.javaindex a2b1d90cee..0776aa31bd 100644--- a/src/test/java/io/github/hectorvent/floci/services/translate/TranslateIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/translate/TranslateIntegrationTest.java@@ -3,7 +3,9 @@ import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;import io.quarkus.test.junit.QuarkusTest;import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;+import java.util.Base64;+import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.*;/**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 d9df773aef..26e923f895 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@@ -1,9 +1,7 @@package io.github.hectorvent.floci.tools.ami;-import static org.junit.jupiter.api.Assertions.assertEquals;-import static org.junit.jupiter.api.Assertions.assertFalse;-import static org.junit.jupiter.api.Assertions.assertThrows;-import static org.junit.jupiter.api.Assertions.assertTrue;+import org.junit.jupiter.api.Test;+import org.junit.jupiter.api.io.TempDir;import java.nio.charset.StandardCharsets;import java.nio.file.Files;@@ -12,8 +10,10 @@ 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;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;class AmiImageToolTest {@TempDirdiff --git a/tools/checkstyle/checkstyle.xml b/tools/checkstyle/checkstyle.xmlindex 3f459b9556..835081d6f3 100644--- a/tools/checkstyle/checkstyle.xml+++ b/tools/checkstyle/checkstyle.xml@@ -10,6 +10,22 @@<property name="file" value="${config_loc}/suppressions.xml"/></module><module name="TreeWalker">+ <!-- IntelliJ layout: other imports, javax, java, then static imports. -->+ <module name="ImportOrder">+ <property name="groups" value="*,javax,java"/>+ <property name="ordered" value="true"/>+ <property name="separated" value="true"/>+ <property name="option" value="bottom"/>+ <property name="sortStaticImportsAlphabetically" value="true"/>+ </module>+ <!-- ImportOrder otherwise requires a blank line between javax and java.+ Exempt only that boundary, retaining ordering and other separation checks. -->+ <module name="SuppressionXpathSingleFilter">+ <property name="checks" value="ImportOrder"/>+ <property name="message" value="^'java\..*' should be separated from previous imports\.$"/>+ <property name="query"+ value="//IMPORT[preceding-sibling::IMPORT[1]//IDENT[@text='javax' and not(preceding-sibling::*)]]"/>+ </module><!-- Reviewers need the concrete type, such as LinkedHashMap versus Map.Record pattern components (case Node(var left, var right)) are allowed. --><module name="MatchXpath">diff --git a/tools/checkstyle/test_import_order.py b/tools/checkstyle/test_import_order.pynew file mode 100644index 0000000000..ec40eee4ee--- /dev/null+++ b/tools/checkstyle/test_import_order.py@@ -0,0 +1,144 @@+"""Exercise the repository's actual Checkstyle configuration on import fixtures."""++import copy+from pathlib import Path+import subprocess+import tempfile+import unittest+import xml.etree.ElementTree as ET+++ROOT = Path(__file__).resolve().parents[2]+NS = "{http://maven.apache.org/POM/4.0.0}"+++class ImportOrderTest(unittest.TestCase):+ def test_import_layout(self):+ fixtures = {+ "Ordered": ("""import org.junit.jupiter.api.Test;++import javax.net.SocketFactory;+import java.util.List;++import static org.mockito.ArgumentMatchers.anyList;+import static org.mockito.ArgumentMatchers.eq;+import static org.mockito.Mockito.doThrow;+import static org.mockito.Mockito.mock;+""", False),+ "Wildcards": ("""import org.junit.jupiter.api.Test;++import static org.junit.jupiter.api.Assertions.*;+import static org.mockito.Mockito.*;+""", False),+ "StaticOnly": ("""import static org.mockito.ArgumentMatchers.anyList;+import static org.mockito.ArgumentMatchers.eq;+""", False),+ "MatcherOrder": ("""import static org.mockito.ArgumentMatchers.eq;+import static org.mockito.ArgumentMatchers.anyList;+""", True),+ "MockitoOrder": ("""import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.doThrow;+""", True),+ "TypeOrder": ("""import org.junit.jupiter.api.Test;+import org.junit.jupiter.api.BeforeEach;+""", True),+ "JdkFirst": ("""import java.util.List;++import org.junit.jupiter.api.Test;+""", True),+ "StaticFirst": ("""import static org.mockito.Mockito.mock;++import org.junit.jupiter.api.Test;+""", True),+ "MissingSeparation": ("""import org.junit.jupiter.api.Test;+import java.util.List;+""", True),+ "JavaBeforeJavax": ("""import java.util.List;+import javax.net.SocketFactory;+""", True),+ "JavaOnly": ("""import org.junit.jupiter.api.Test;++import java.util.List;++import static org.mockito.Mockito.mock;+""", False),+ "JavaxOnly": ("""import org.junit.jupiter.api.Test;++import javax.net.SocketFactory;++import static org.mockito.Mockito.mock;+""", False),+ "MissingJavaxSeparation": ("""import org.junit.jupiter.api.Test;+import javax.net.SocketFactory;+import java.util.List;+""", True),+ "UnsortedJavaAfterJavax": ("""import javax.net.SocketFactory;+import java.util.Map;+import java.util.List;+""", True),+ "MissingStaticSeparation": ("""import javax.net.SocketFactory;+import java.util.List;+import static org.mockito.Mockito.mock;+""", True),+ "JavaxInOtherPackage": ("""import org.example.javax.Widget;+import java.util.List;+""", True),+ }+ with tempfile.TemporaryDirectory(prefix="floci-import-order-") as directory:+ temporary = Path(directory)+ source = temporary / "src"+ source.mkdir()+ for name, (imports, _) in fixtures.items():+ (source / f"{name}.java").write_text(+ f"package fixtures;\n\n{imports}\nclass {name} {{}}\n",+ encoding="utf-8",+ )++ # Reuse the pinned plugin and engine versions from pom.xml.+ project = ET.parse(ROOT / "pom.xml").getroot()+ plugin = copy.deepcopy(next(+ item for item in project.findall(f"{NS}build/{NS}plugins/{NS}plugin")+ if item.findtext(f"{NS}artifactId") == "maven-checkstyle-plugin"+ ))+ configuration = plugin.find(f"{NS}configuration")+ configuration.find(f"{NS}configLocation").text = str(+ ROOT / "tools/checkstyle/checkstyle.xml"+ )+ configuration.find(f"{NS}propertyExpansion").text = (+ f"config_loc={ROOT / 'tools/checkstyle'}"+ )+ directories = configuration.find(f"{NS}sourceDirectories")+ directories.clear()+ ET.SubElement(directories, f"{NS}sourceDirectory").text = str(source)+ pom = ET.fromstring(+ '<project xmlns="http://maven.apache.org/POM/4.0.0">'+ '<modelVersion>4.0.0</modelVersion><groupId>io.github.hectorvent</groupId>'+ '<artifactId>import-order-fixtures</artifactId><version>1</version>'+ '<build><plugins/></build></project>'+ )+ pom.find(f"{NS}build/{NS}plugins").append(plugin)+ ET.register_namespace("", NS[1:-1])+ ET.ElementTree(pom).write(temporary / "pom.xml", encoding="utf-8")+ result = subprocess.run(+ [str(ROOT / "mvnw"), "-B", "-f", str(temporary / "pom.xml"),+ "checkstyle:check"],+ cwd=ROOT, capture_output=True, text=True, timeout=180,+ )+ report = temporary / "target/checkstyle-result.xml"+ self.assertTrue(report.exists(), result.stdout + result.stderr)+ checked = {}+ diagnostics = {}+ for file in ET.parse(report).getroot().findall("file"):+ name = Path(file.get("name")).stem+ if name in fixtures:+ errors = file.findall("error")+ for error in errors:+ self.assertTrue(error.get("source").endswith(".ImportOrderCheck"))+ checked[name] = bool(errors)+ diagnostics[name] = [error.attrib for error in errors]+ self.assertEqual({name: bad for name, (_, bad) in fixtures.items()}, checked, diagnostics)+ self.assertNotEqual(0, result.returncode, "Invalid import fixtures must fail Checkstyle")+++if __name__ == "__main__":+ unittest.main()