From fbf689f0ad836f5f5c43d30124548a730fa7c97d Mon Sep 17 00:00:00 2001 From: Robert Stupp Date: Fri, 17 Oct 2025 16:40:37 +0200 Subject: [PATCH] testcontainers v2: tackle deprecation warnings --- .../aws/cloudwatch/AwsCloudWatchEventListenerTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/runtime/service/src/test/java/org/apache/polaris/service/events/jsonEventListener/aws/cloudwatch/AwsCloudWatchEventListenerTest.java b/runtime/service/src/test/java/org/apache/polaris/service/events/jsonEventListener/aws/cloudwatch/AwsCloudWatchEventListenerTest.java index ffc157b9d8..3aac097b17 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/events/jsonEventListener/aws/cloudwatch/AwsCloudWatchEventListenerTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/events/jsonEventListener/aws/cloudwatch/AwsCloudWatchEventListenerTest.java @@ -27,7 +27,6 @@ import io.quarkus.runtime.configuration.MemorySize; import jakarta.ws.rs.core.SecurityContext; import java.math.BigInteger; -import java.security.Principal; import java.time.Clock; import java.time.Duration; import java.util.Set; @@ -50,7 +49,7 @@ import org.mockito.MockitoAnnotations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.containers.localstack.LocalStackContainer; +import org.testcontainers.localstack.LocalStackContainer; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; @@ -72,7 +71,7 @@ class AwsCloudWatchEventListenerTest { new LocalStackContainer( containerSpecHelper("localstack", AwsCloudWatchEventListenerTest.class) .dockerImageName(null)) - .withServices(LocalStackContainer.Service.CLOUDWATCHLOGS); + .withServices("logs"); private static final String LOG_GROUP = "test-log-group"; private static final String LOG_STREAM = "test-log-stream"; @@ -143,13 +142,13 @@ protected CloudWatchLogsAsyncClient createCloudWatchAsyncClient() { PolarisCallContext polarisCallContext = Mockito.mock(PolarisCallContext.class); RealmContext realmContext = Mockito.mock(RealmContext.class); SecurityContext securityContext = Mockito.mock(SecurityContext.class); - Principal principal = Mockito.mock(PolarisPrincipal.class); + PolarisPrincipal principal = Mockito.mock(PolarisPrincipal.class); when(callContext.getRealmContext()).thenReturn(realmContext); when(callContext.getPolarisCallContext()).thenReturn(polarisCallContext); when(realmContext.getRealmIdentifier()).thenReturn(REALM); when(securityContext.getUserPrincipal()).thenReturn(principal); when(principal.getName()).thenReturn(TEST_USER); - when(((PolarisPrincipal) principal).getRoles()).thenReturn(Set.of("role1", "role2")); + when(principal.getRoles()).thenReturn(Set.of("role1", "role2")); listener.callContext = callContext; listener.securityContext = securityContext;