From 05a2d4725f4a1551944b6f96bc6e8bfeb3834363 Mon Sep 17 00:00:00 2001 From: Alexandre Dutra Date: Thu, 2 Jan 2025 15:11:06 +0100 Subject: [PATCH] Rename directory and package names (Quarkus switch follow-up) --- .github/workflows/check-md-link.yml | 2 +- .github/workflows/gradle.yml | 2 +- Dockerfile | 8 ++++---- build.gradle.kts | 2 +- gradle/projects.main.properties | 2 +- {dropwizard => quarkus}/service/README-quarkus.md | 0 {dropwizard => quarkus}/service/build.gradle.kts | 0 .../service/src/main/docker/Dockerfile.jvm | 0 .../auth/QuarkusAuthenticatorConfiguration.java | 2 +- .../service/quarkus}/auth/QuarkusOAuthFilter.java | 2 +- .../catalog/io/QuarkusCatalogIOConfiguration.java | 2 +- .../config/QuarkusFeaturesConfiguration.java | 2 +- .../quarkus}/config/QuarkusJacksonConfig.java | 2 +- .../service/quarkus}/config/QuarkusProducers.java | 12 ++++++------ .../context/QuarkusContextConfiguration.java | 2 +- .../logging/QuarkusLoggingConfiguration.java | 2 +- .../quarkus}/logging/QuarkusLoggingMDCFilter.java | 2 +- .../metrics/QuarkusMeterFilterProducer.java | 2 +- .../metrics/QuarkusMetricsConfiguration.java | 2 +- .../metrics/QuarkusValueExpressionResolver.java | 2 +- .../quarkus}/metrics/RealmIdTagContributor.java | 2 +- .../QuarkusPersistenceConfiguration.java | 2 +- .../QuarkusRateLimiterConfiguration.java | 2 +- .../storage/QuarkusStorageConfiguration.java | 2 +- .../quarkus}/task/QuarkusTaskExecutorImpl.java | 4 ++-- .../task/QuarkusTaskHandlerConfiguration.java | 2 +- .../tracing/QuarkusTelemetryConfiguration.java | 2 +- .../quarkus}/tracing/QuarkusTracingFilter.java | 4 ++-- .../io.smallrye.config.ConfigSourceInterceptor | 0 .../src/main/resources/application.properties | 0 .../quarkus}/IcebergExceptionMapperTest.java | 0 .../PolarisApplicationIntegrationTest.java | 10 +++++----- .../polaris/service/quarkus}/TestServices.java | 4 ++-- .../TimedApplicationEventListenerTest.java | 14 +++++++------- .../admin/PolarisAdminServiceAuthzTest.java | 2 +- .../quarkus}/admin/PolarisAuthzTestBase.java | 4 ++-- .../admin/PolarisOverlappingCatalogTest.java | 6 +++--- .../admin/PolarisOverlappingTableTest.java | 6 +++--- .../admin/PolarisServiceImplIntegrationTest.java | 12 ++++++------ .../service/quarkus}/auth/JWTRSAKeyPairTest.java | 2 +- .../auth/JWTSymmetricKeyGeneratorTest.java | 2 +- .../quarkus}/auth/TokenRequestValidatorTest.java | 2 +- .../polaris/service/quarkus}/auth/TokenUtils.java | 2 +- .../quarkus}/catalog/AccessDelegationModeTest.java | 2 +- .../quarkus}/catalog/BasePolarisCatalogTest.java | 4 ++-- .../catalog/BasePolarisCatalogViewTest.java | 2 +- .../PolarisCatalogHandlerWrapperAuthzTest.java | 4 ++-- .../catalog/PolarisPassthroughResolutionView.java | 2 +- .../catalog/PolarisRestCatalogIntegrationTest.java | 10 +++++----- .../PolarisRestCatalogViewAwsIntegrationTest.java | 2 +- ...PolarisRestCatalogViewAzureIntegrationTest.java | 2 +- .../PolarisRestCatalogViewFileIntegrationTest.java | 2 +- .../PolarisRestCatalogViewGcpIntegrationTest.java | 2 +- .../PolarisRestCatalogViewIntegrationTest.java | 10 +++++----- .../catalog/PolarisSparkIntegrationTest.java | 10 +++++----- .../polaris/service/quarkus}/catalog/TestUtil.java | 6 +++--- .../quarkus}/catalog/io/FileIOExceptionsTest.java | 4 ++-- .../service/quarkus}/catalog/io/TestFileIO.java | 2 +- .../quarkus}/catalog/io/TestFileIOFactory.java | 2 +- .../service/quarkus}/catalog/io/TestInputFile.java | 2 +- .../config/DefaultConfigurationStoreTest.java | 2 +- .../service/quarkus}/entity/CatalogEntityTest.java | 2 +- .../ratelimiter/MockTokenBucketFactory.java | 2 +- .../ratelimiter/RateLimiterFilterTest.java | 14 +++++++------- .../service/quarkus}/ratelimiter/TestUtil.java | 6 +++--- .../quarkus}/ratelimiter/TokenBucketTest.java | 2 +- .../task/ManifestFileCleanupTaskHandlerTest.java | 2 +- .../quarkus}/task/TableCleanupTaskHandlerTest.java | 2 +- .../service/quarkus}/task/TaskTestUtils.java | 2 +- .../service/quarkus}/task/TestSnapshot.java | 2 +- .../test/DefaultTestEnvironmentResolver.java | 2 +- .../test/PolarisIntegrationTestFixture.java | 4 ++-- .../test/PolarisIntegrationTestHelper.java | 2 +- .../service/quarkus}/test/TestEnvironment.java | 2 +- .../quarkus}/test/TestEnvironmentExtension.java | 2 +- .../quarkus}/test/TestEnvironmentResolver.java | 2 +- .../service/quarkus}/test/TestMetricsUtil.java | 2 +- site/content/in-dev/unreleased/metastores.md | 4 ++-- 78 files changed, 130 insertions(+), 130 deletions(-) rename {dropwizard => quarkus}/service/README-quarkus.md (100%) rename {dropwizard => quarkus}/service/build.gradle.kts (100%) rename {dropwizard => quarkus}/service/src/main/docker/Dockerfile.jvm (100%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/auth/QuarkusAuthenticatorConfiguration.java (97%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/auth/QuarkusOAuthFilter.java (99%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/catalog/io/QuarkusCatalogIOConfiguration.java (95%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/config/QuarkusFeaturesConfiguration.java (96%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/config/QuarkusJacksonConfig.java (98%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/config/QuarkusProducers.java (93%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/context/QuarkusContextConfiguration.java (96%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/logging/QuarkusLoggingConfiguration.java (95%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/logging/QuarkusLoggingMDCFilter.java (98%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/metrics/QuarkusMeterFilterProducer.java (96%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/metrics/QuarkusMetricsConfiguration.java (95%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/metrics/QuarkusValueExpressionResolver.java (96%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/metrics/RealmIdTagContributor.java (97%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/persistence/QuarkusPersistenceConfiguration.java (95%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/ratelimiter/QuarkusRateLimiterConfiguration.java (96%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/storage/QuarkusStorageConfiguration.java (96%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/task/QuarkusTaskExecutorImpl.java (95%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/task/QuarkusTaskHandlerConfiguration.java (96%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/tracing/QuarkusTelemetryConfiguration.java (95%) rename {dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard => quarkus/service/src/main/java/org/apache/polaris/service/quarkus}/tracing/QuarkusTracingFilter.java (93%) rename {dropwizard => quarkus}/service/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor (100%) rename {dropwizard => quarkus}/service/src/main/resources/application.properties (100%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/IcebergExceptionMapperTest.java (100%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/PolarisApplicationIntegrationTest.java (98%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/TestServices.java (98%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/TimedApplicationEventListenerTest.java (91%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/admin/PolarisAdminServiceAuthzTest.java (99%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/admin/PolarisAuthzTestBase.java (99%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/admin/PolarisOverlappingCatalogTest.java (97%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/admin/PolarisOverlappingTableTest.java (97%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/admin/PolarisServiceImplIntegrationTest.java (99%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/auth/JWTRSAKeyPairTest.java (98%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/auth/JWTSymmetricKeyGeneratorTest.java (98%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/auth/TokenRequestValidatorTest.java (98%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/auth/TokenUtils.java (97%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/AccessDelegationModeTest.java (97%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/BasePolarisCatalogTest.java (99%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/BasePolarisCatalogViewTest.java (99%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/PolarisCatalogHandlerWrapperAuthzTest.java (99%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/PolarisPassthroughResolutionView.java (99%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/PolarisRestCatalogIntegrationTest.java (99%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/PolarisRestCatalogViewAwsIntegrationTest.java (97%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/PolarisRestCatalogViewAzureIntegrationTest.java (97%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/PolarisRestCatalogViewFileIntegrationTest.java (96%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/PolarisRestCatalogViewGcpIntegrationTest.java (97%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/PolarisRestCatalogViewIntegrationTest.java (94%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/PolarisSparkIntegrationTest.java (97%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/TestUtil.java (97%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/io/FileIOExceptionsTest.java (97%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/io/TestFileIO.java (98%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/io/TestFileIOFactory.java (98%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/catalog/io/TestInputFile.java (96%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/config/DefaultConfigurationStoreTest.java (98%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/entity/CatalogEntityTest.java (99%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/ratelimiter/MockTokenBucketFactory.java (96%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/ratelimiter/RateLimiterFilterTest.java (93%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/ratelimiter/TestUtil.java (90%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/ratelimiter/TokenBucketTest.java (98%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/task/ManifestFileCleanupTaskHandlerTest.java (99%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/task/TableCleanupTaskHandlerTest.java (99%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/task/TaskTestUtils.java (99%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/task/TestSnapshot.java (98%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/test/DefaultTestEnvironmentResolver.java (96%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/test/PolarisIntegrationTestFixture.java (98%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/test/PolarisIntegrationTestHelper.java (97%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/test/TestEnvironment.java (97%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/test/TestEnvironmentExtension.java (98%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/test/TestEnvironmentResolver.java (95%) rename {dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard => quarkus/service/src/test/java/org/apache/polaris/service/quarkus}/test/TestMetricsUtil.java (97%) diff --git a/.github/workflows/check-md-link.yml b/.github/workflows/check-md-link.yml index 029f676c55..093496c850 100644 --- a/.github/workflows/check-md-link.yml +++ b/.github/workflows/check-md-link.yml @@ -41,5 +41,5 @@ jobs: with: use-quiet-mode: 'yes' config-file: '.github/workflows/check-md-link-config.json' - folder-path: 'regtests, .github, build-logic, polaris-core, service, dropwizard, extension, spec, k8, getting-started, helm' + folder-path: 'regtests, .github, build-logic, polaris-core, service, quarkus, extension, spec, k8, getting-started, helm' file-path: 'CHAT_BYLAWS.md, CODE_OF_CONDUCT.md, CONTRIBUTING.md, README.md, SECURITY.md' diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7ae4446b92..8a8eda25fa 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -69,7 +69,7 @@ jobs: name: upload-test-artifacts path: | polaris-core/build/test-results/test - dropwizard/service/build/test-results/test + quarkus/service/build/test-results/test # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html). # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version. diff --git a/Dockerfile b/Dockerfile index 8fd17ef6af..3e7c8c8ae4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,10 +55,10 @@ ENV UID=10000 ENV HOME=/home/polaris # We make four distinct layers so if there are application changes the library layers can be re-used -COPY --from=build --chown=polaris:polaris /app/dropwizard/service/build/quarkus-app/lib/ /deployments/lib/ -COPY --from=build --chown=polaris:polaris /app/dropwizard/service/build/quarkus-app/*.jar /deployments/ -COPY --from=build --chown=polaris:polaris /app/dropwizard/service/build/quarkus-app/app/ /deployments/app/ -COPY --from=build --chown=polaris:polaris /app/dropwizard/service/build/quarkus-app/quarkus/ /deployments/quarkus/ +COPY --from=build --chown=polaris:polaris /app/quarkus/service/build/quarkus-app/lib/ /deployments/lib/ +COPY --from=build --chown=polaris:polaris /app/quarkus/service/build/quarkus-app/*.jar /deployments/ +COPY --from=build --chown=polaris:polaris /app/quarkus/service/build/quarkus-app/app/ /deployments/app/ +COPY --from=build --chown=polaris:polaris /app/quarkus/service/build/quarkus-app/quarkus/ /deployments/quarkus/ EXPOSE 8181 EXPOSE 8182 diff --git a/build.gradle.kts b/build.gradle.kts index 373a04a4ef..902ee03d84 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -91,7 +91,7 @@ tasks.named("rat").configure { excludes.add("logs/**") excludes.add("service/common/src/**/banner.txt") - excludes.add("dropwizard/service/logs") + excludes.add("quarkus/service/logs") excludes.add("site/node_modules/**") excludes.add("site/layouts/robots.txt") diff --git a/gradle/projects.main.properties b/gradle/projects.main.properties index cc8ef1f781..bee8683226 100644 --- a/gradle/projects.main.properties +++ b/gradle/projects.main.properties @@ -23,7 +23,7 @@ polaris-api-iceberg-service=api/iceberg-service polaris-api-management-model=api/management-model polaris-api-management-service=api/management-service polaris-service-common=service/common -polaris-quarkus-service=dropwizard/service +polaris-quarkus-service=quarkus/service polaris-eclipselink=extension/persistence/eclipselink polaris-jpa-model=extension/persistence/jpa-model aggregated-license-report=aggregated-license-report diff --git a/dropwizard/service/README-quarkus.md b/quarkus/service/README-quarkus.md similarity index 100% rename from dropwizard/service/README-quarkus.md rename to quarkus/service/README-quarkus.md diff --git a/dropwizard/service/build.gradle.kts b/quarkus/service/build.gradle.kts similarity index 100% rename from dropwizard/service/build.gradle.kts rename to quarkus/service/build.gradle.kts diff --git a/dropwizard/service/src/main/docker/Dockerfile.jvm b/quarkus/service/src/main/docker/Dockerfile.jvm similarity index 100% rename from dropwizard/service/src/main/docker/Dockerfile.jvm rename to quarkus/service/src/main/docker/Dockerfile.jvm diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/auth/QuarkusAuthenticatorConfiguration.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusAuthenticatorConfiguration.java similarity index 97% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/auth/QuarkusAuthenticatorConfiguration.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusAuthenticatorConfiguration.java index 0441d60f0f..d9f396c46e 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/auth/QuarkusAuthenticatorConfiguration.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusAuthenticatorConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.auth; +package org.apache.polaris.service.quarkus.auth; import io.quarkus.runtime.annotations.StaticInitSafe; import io.smallrye.config.ConfigMapping; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/auth/QuarkusOAuthFilter.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusOAuthFilter.java similarity index 99% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/auth/QuarkusOAuthFilter.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusOAuthFilter.java index 50c56640b6..57ffc82c21 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/auth/QuarkusOAuthFilter.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/auth/QuarkusOAuthFilter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.auth; +package org.apache.polaris.service.quarkus.auth; import jakarta.inject.Inject; import jakarta.ws.rs.NotAuthorizedException; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/catalog/io/QuarkusCatalogIOConfiguration.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/catalog/io/QuarkusCatalogIOConfiguration.java similarity index 95% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/catalog/io/QuarkusCatalogIOConfiguration.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/catalog/io/QuarkusCatalogIOConfiguration.java index 1224423128..0b19d6da8d 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/catalog/io/QuarkusCatalogIOConfiguration.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/catalog/io/QuarkusCatalogIOConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog.io; +package org.apache.polaris.service.quarkus.catalog.io; import io.quarkus.runtime.annotations.StaticInitSafe; import io.smallrye.config.ConfigMapping; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/config/QuarkusFeaturesConfiguration.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusFeaturesConfiguration.java similarity index 96% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/config/QuarkusFeaturesConfiguration.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusFeaturesConfiguration.java index 41616100bd..ae477fbe50 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/config/QuarkusFeaturesConfiguration.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusFeaturesConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.config; +package org.apache.polaris.service.quarkus.config; import io.smallrye.config.ConfigMapping; import io.smallrye.config.WithParentName; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/config/QuarkusJacksonConfig.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusJacksonConfig.java similarity index 98% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/config/QuarkusJacksonConfig.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusJacksonConfig.java index 19213d420e..4550fc65e7 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/config/QuarkusJacksonConfig.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusJacksonConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.config; +package org.apache.polaris.service.quarkus.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/config/QuarkusProducers.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java similarity index 93% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/config/QuarkusProducers.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java index 48794e7bd4..6559b0fed8 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/config/QuarkusProducers.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.config; +package org.apache.polaris.service.quarkus.config; import io.smallrye.common.annotation.Identifier; import io.smallrye.context.SmallRyeManagedExecutor; @@ -48,11 +48,11 @@ import org.apache.polaris.service.catalog.api.IcebergRestOAuth2ApiService; import org.apache.polaris.service.catalog.io.FileIOFactory; import org.apache.polaris.service.context.RealmContextResolver; -import org.apache.polaris.service.dropwizard.auth.QuarkusAuthenticatorConfiguration; -import org.apache.polaris.service.dropwizard.catalog.io.QuarkusCatalogIOConfiguration; -import org.apache.polaris.service.dropwizard.context.QuarkusContextConfiguration; -import org.apache.polaris.service.dropwizard.persistence.QuarkusPersistenceConfiguration; -import org.apache.polaris.service.dropwizard.ratelimiter.QuarkusRateLimiterConfiguration; +import org.apache.polaris.service.quarkus.auth.QuarkusAuthenticatorConfiguration; +import org.apache.polaris.service.quarkus.catalog.io.QuarkusCatalogIOConfiguration; +import org.apache.polaris.service.quarkus.context.QuarkusContextConfiguration; +import org.apache.polaris.service.quarkus.persistence.QuarkusPersistenceConfiguration; +import org.apache.polaris.service.quarkus.ratelimiter.QuarkusRateLimiterConfiguration; import org.apache.polaris.service.ratelimiter.RateLimiter; import org.apache.polaris.service.ratelimiter.TokenBucketFactory; import org.apache.polaris.service.task.TaskHandlerConfiguration; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/context/QuarkusContextConfiguration.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/context/QuarkusContextConfiguration.java similarity index 96% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/context/QuarkusContextConfiguration.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/context/QuarkusContextConfiguration.java index bcb22b6fd6..9cd617b912 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/context/QuarkusContextConfiguration.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/context/QuarkusContextConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.context; +package org.apache.polaris.service.quarkus.context; import io.quarkus.runtime.annotations.StaticInitSafe; import io.smallrye.config.ConfigMapping; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/logging/QuarkusLoggingConfiguration.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingConfiguration.java similarity index 95% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/logging/QuarkusLoggingConfiguration.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingConfiguration.java index ace4d62e9a..145bd740e5 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/logging/QuarkusLoggingConfiguration.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.logging; +package org.apache.polaris.service.quarkus.logging; import io.quarkus.runtime.annotations.StaticInitSafe; import io.smallrye.config.ConfigMapping; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/logging/QuarkusLoggingMDCFilter.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingMDCFilter.java similarity index 98% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/logging/QuarkusLoggingMDCFilter.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingMDCFilter.java index eebb6b995d..98fb2888dd 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/logging/QuarkusLoggingMDCFilter.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/logging/QuarkusLoggingMDCFilter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.logging; +package org.apache.polaris.service.quarkus.logging; import io.quarkus.vertx.web.RouteFilter; import io.vertx.ext.web.RoutingContext; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/metrics/QuarkusMeterFilterProducer.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMeterFilterProducer.java similarity index 96% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/metrics/QuarkusMeterFilterProducer.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMeterFilterProducer.java index d49dd40ec3..28f77e9130 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/metrics/QuarkusMeterFilterProducer.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMeterFilterProducer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.metrics; +package org.apache.polaris.service.quarkus.metrics; import io.micrometer.core.instrument.Tag; import io.micrometer.core.instrument.config.MeterFilter; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/metrics/QuarkusMetricsConfiguration.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMetricsConfiguration.java similarity index 95% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/metrics/QuarkusMetricsConfiguration.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMetricsConfiguration.java index a4c819de80..c599e85e2d 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/metrics/QuarkusMetricsConfiguration.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusMetricsConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.metrics; +package org.apache.polaris.service.quarkus.metrics; import io.quarkus.runtime.annotations.StaticInitSafe; import io.smallrye.config.ConfigMapping; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/metrics/QuarkusValueExpressionResolver.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusValueExpressionResolver.java similarity index 96% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/metrics/QuarkusValueExpressionResolver.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusValueExpressionResolver.java index 8054bfb8f8..98783de60f 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/metrics/QuarkusValueExpressionResolver.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/QuarkusValueExpressionResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.metrics; +package org.apache.polaris.service.quarkus.metrics; import io.micrometer.common.annotation.ValueExpressionResolver; import io.micrometer.common.lang.Nullable; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/metrics/RealmIdTagContributor.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagContributor.java similarity index 97% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/metrics/RealmIdTagContributor.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagContributor.java index ad1e96b42d..6cc971ed86 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/metrics/RealmIdTagContributor.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/metrics/RealmIdTagContributor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.metrics; +package org.apache.polaris.service.quarkus.metrics; import io.micrometer.core.instrument.Tags; import io.quarkus.micrometer.runtime.HttpServerMetricsTagsContributor; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/persistence/QuarkusPersistenceConfiguration.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/persistence/QuarkusPersistenceConfiguration.java similarity index 95% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/persistence/QuarkusPersistenceConfiguration.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/persistence/QuarkusPersistenceConfiguration.java index cb4fbeeaa8..5c3223f696 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/persistence/QuarkusPersistenceConfiguration.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/persistence/QuarkusPersistenceConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.persistence; +package org.apache.polaris.service.quarkus.persistence; import io.quarkus.runtime.annotations.StaticInitSafe; import io.smallrye.config.ConfigMapping; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/ratelimiter/QuarkusRateLimiterConfiguration.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/ratelimiter/QuarkusRateLimiterConfiguration.java similarity index 96% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/ratelimiter/QuarkusRateLimiterConfiguration.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/ratelimiter/QuarkusRateLimiterConfiguration.java index 5dfaad2fc1..0a1e72de84 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/ratelimiter/QuarkusRateLimiterConfiguration.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/ratelimiter/QuarkusRateLimiterConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.ratelimiter; +package org.apache.polaris.service.quarkus.ratelimiter; import io.quarkus.runtime.annotations.StaticInitSafe; import io.smallrye.config.ConfigMapping; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/storage/QuarkusStorageConfiguration.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/storage/QuarkusStorageConfiguration.java similarity index 96% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/storage/QuarkusStorageConfiguration.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/storage/QuarkusStorageConfiguration.java index f4078518b7..cf2c716bcd 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/storage/QuarkusStorageConfiguration.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/storage/QuarkusStorageConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.storage; +package org.apache.polaris.service.quarkus.storage; import io.quarkus.runtime.annotations.StaticInitSafe; import io.smallrye.config.ConfigMapping; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/task/QuarkusTaskExecutorImpl.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskExecutorImpl.java similarity index 95% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/task/QuarkusTaskExecutorImpl.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskExecutorImpl.java index 0ec96ee078..8f38de648e 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/task/QuarkusTaskExecutorImpl.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskExecutorImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.task; +package org.apache.polaris.service.quarkus.task; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; @@ -29,7 +29,7 @@ import java.util.concurrent.ExecutorService; import org.apache.polaris.core.context.CallContext; import org.apache.polaris.core.persistence.MetaStoreManagerFactory; -import org.apache.polaris.service.dropwizard.tracing.QuarkusTracingFilter; +import org.apache.polaris.service.quarkus.tracing.QuarkusTracingFilter; import org.apache.polaris.service.task.TaskExecutorImpl; import org.apache.polaris.service.task.TaskFileIOSupplier; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/task/QuarkusTaskHandlerConfiguration.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskHandlerConfiguration.java similarity index 96% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/task/QuarkusTaskHandlerConfiguration.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskHandlerConfiguration.java index 75c43f6e66..ff9416f97f 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/task/QuarkusTaskHandlerConfiguration.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/task/QuarkusTaskHandlerConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.task; +package org.apache.polaris.service.quarkus.task; import io.quarkus.runtime.annotations.StaticInitSafe; import io.smallrye.config.ConfigMapping; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/tracing/QuarkusTelemetryConfiguration.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/tracing/QuarkusTelemetryConfiguration.java similarity index 95% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/tracing/QuarkusTelemetryConfiguration.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/tracing/QuarkusTelemetryConfiguration.java index c3915ebcd2..48227e9efa 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/tracing/QuarkusTelemetryConfiguration.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/tracing/QuarkusTelemetryConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.tracing; +package org.apache.polaris.service.quarkus.tracing; import io.quarkus.runtime.annotations.StaticInitSafe; import io.smallrye.config.ConfigMapping; diff --git a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/tracing/QuarkusTracingFilter.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/tracing/QuarkusTracingFilter.java similarity index 93% rename from dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/tracing/QuarkusTracingFilter.java rename to quarkus/service/src/main/java/org/apache/polaris/service/quarkus/tracing/QuarkusTracingFilter.java index 9601288716..72cf0b5442 100644 --- a/dropwizard/service/src/main/java/org/apache/polaris/service/dropwizard/tracing/QuarkusTracingFilter.java +++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/tracing/QuarkusTracingFilter.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.tracing; +package org.apache.polaris.service.quarkus.tracing; import io.opentelemetry.api.trace.Span; import io.quarkus.vertx.web.RouteFilter; import io.vertx.ext.web.RoutingContext; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.polaris.service.dropwizard.logging.QuarkusLoggingMDCFilter; +import org.apache.polaris.service.quarkus.logging.QuarkusLoggingMDCFilter; import org.eclipse.microprofile.config.inject.ConfigProperty; @ApplicationScoped diff --git a/dropwizard/service/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/quarkus/service/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor similarity index 100% rename from dropwizard/service/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor rename to quarkus/service/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor diff --git a/dropwizard/service/src/main/resources/application.properties b/quarkus/service/src/main/resources/application.properties similarity index 100% rename from dropwizard/service/src/main/resources/application.properties rename to quarkus/service/src/main/resources/application.properties diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/IcebergExceptionMapperTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/IcebergExceptionMapperTest.java similarity index 100% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/IcebergExceptionMapperTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/IcebergExceptionMapperTest.java diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/PolarisApplicationIntegrationTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/PolarisApplicationIntegrationTest.java similarity index 98% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/PolarisApplicationIntegrationTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/PolarisApplicationIntegrationTest.java index 2bbd872014..0245cd2cf3 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/PolarisApplicationIntegrationTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/PolarisApplicationIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard; +package org.apache.polaris.service.quarkus; import static org.apache.polaris.service.auth.BasePolarisAuthenticator.PRINCIPAL_ROLE_ALL; import static org.apache.polaris.service.context.DefaultRealmContextResolver.REALM_PROPERTY_KEY; @@ -77,10 +77,10 @@ import org.apache.polaris.core.admin.model.StorageConfigInfo; import org.apache.polaris.core.entity.CatalogEntity; import org.apache.polaris.core.entity.PolarisEntityConstants; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestFixture; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestHelper; -import org.apache.polaris.service.dropwizard.test.TestEnvironment; -import org.apache.polaris.service.dropwizard.test.TestEnvironmentExtension; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestFixture; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestHelper; +import org.apache.polaris.service.quarkus.test.TestEnvironment; +import org.apache.polaris.service.quarkus.test.TestEnvironmentExtension; import org.assertj.core.api.Assertions; import org.assertj.core.api.InstanceOfAssertFactories; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/TestServices.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/TestServices.java similarity index 98% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/TestServices.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/TestServices.java index faeb429632..a31d4bb47d 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/TestServices.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/TestServices.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard; +package org.apache.polaris.service.quarkus; import com.google.auth.oauth2.AccessToken; import com.google.auth.oauth2.GoogleCredentials; @@ -47,8 +47,8 @@ import org.apache.polaris.service.config.RealmEntityManagerFactory; import org.apache.polaris.service.context.CallContextCatalogFactory; import org.apache.polaris.service.context.PolarisCallContextCatalogFactory; -import org.apache.polaris.service.dropwizard.catalog.io.TestFileIOFactory; import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; +import org.apache.polaris.service.quarkus.catalog.io.TestFileIOFactory; import org.apache.polaris.service.storage.PolarisStorageIntegrationProviderImpl; import org.apache.polaris.service.task.TaskExecutor; import org.mockito.Mockito; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/TimedApplicationEventListenerTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/TimedApplicationEventListenerTest.java similarity index 91% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/TimedApplicationEventListenerTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/TimedApplicationEventListenerTest.java index 1783cbd63f..fe5e574bce 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/TimedApplicationEventListenerTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/TimedApplicationEventListenerTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard; +package org.apache.polaris.service.quarkus; import static org.apache.polaris.service.context.DefaultRealmContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; @@ -29,12 +29,12 @@ import jakarta.inject.Inject; import jakarta.ws.rs.core.Response; import java.util.Map; -import org.apache.polaris.service.dropwizard.TimedApplicationEventListenerTest.Profile; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestFixture; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestHelper; -import org.apache.polaris.service.dropwizard.test.TestEnvironment; -import org.apache.polaris.service.dropwizard.test.TestEnvironmentExtension; -import org.apache.polaris.service.dropwizard.test.TestMetricsUtil; +import org.apache.polaris.service.quarkus.TimedApplicationEventListenerTest.Profile; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestFixture; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestHelper; +import org.apache.polaris.service.quarkus.test.TestEnvironment; +import org.apache.polaris.service.quarkus.test.TestEnvironmentExtension; +import org.apache.polaris.service.quarkus.test.TestMetricsUtil; import org.hawkular.agent.prometheus.types.MetricFamily; import org.hawkular.agent.prometheus.types.Summary; import org.junit.jupiter.api.Assertions; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisAdminServiceAuthzTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAdminServiceAuthzTest.java similarity index 99% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisAdminServiceAuthzTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAdminServiceAuthzTest.java index 03873c2d41..8075d62648 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisAdminServiceAuthzTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAdminServiceAuthzTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.admin; +package org.apache.polaris.service.quarkus.admin; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisAuthzTestBase.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAuthzTestBase.java similarity index 99% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisAuthzTestBase.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAuthzTestBase.java index ba43131f52..b2b5ece866 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisAuthzTestBase.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAuthzTestBase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.admin; +package org.apache.polaris.service.quarkus.admin; import static org.apache.iceberg.types.Types.NestedField.required; @@ -78,7 +78,7 @@ import org.apache.polaris.service.config.RealmEntityManagerFactory; import org.apache.polaris.service.context.CallContextCatalogFactory; import org.apache.polaris.service.context.PolarisCallContextCatalogFactory; -import org.apache.polaris.service.dropwizard.catalog.PolarisPassthroughResolutionView; +import org.apache.polaris.service.quarkus.catalog.PolarisPassthroughResolutionView; import org.apache.polaris.service.storage.PolarisStorageIntegrationProviderImpl; import org.apache.polaris.service.task.TaskExecutor; import org.assertj.core.api.Assertions; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisOverlappingCatalogTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingCatalogTest.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisOverlappingCatalogTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingCatalogTest.java index a37929a2ba..505bc57d92 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisOverlappingCatalogTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingCatalogTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.admin; +package org.apache.polaris.service.quarkus.admin; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -33,8 +33,8 @@ import org.apache.polaris.core.admin.model.CatalogProperties; import org.apache.polaris.core.admin.model.CreateCatalogRequest; import org.apache.polaris.core.admin.model.StorageConfigInfo; -import org.apache.polaris.service.dropwizard.TestServices; -import org.apache.polaris.service.dropwizard.catalog.io.TestFileIOFactory; +import org.apache.polaris.service.quarkus.TestServices; +import org.apache.polaris.service.quarkus.catalog.io.TestFileIOFactory; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisOverlappingTableTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingTableTest.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisOverlappingTableTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingTableTest.java index 876f9b3cdc..9abbed9402 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisOverlappingTableTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisOverlappingTableTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.admin; +package org.apache.polaris.service.quarkus.admin; import static org.apache.polaris.core.PolarisConfiguration.ALLOW_TABLE_LOCATION_OVERLAP; import static org.apache.polaris.core.PolarisConfiguration.ALLOW_UNSTRUCTURED_TABLE_LOCATION; -import static org.apache.polaris.service.dropwizard.admin.PolarisAuthzTestBase.SCHEMA; +import static org.apache.polaris.service.quarkus.admin.PolarisAuthzTestBase.SCHEMA; import static org.assertj.core.api.Assertions.assertThat; import jakarta.ws.rs.core.Response; @@ -36,7 +36,7 @@ import org.apache.polaris.core.admin.model.CreateCatalogRequest; import org.apache.polaris.core.admin.model.FileStorageConfigInfo; import org.apache.polaris.core.admin.model.StorageConfigInfo; -import org.apache.polaris.service.dropwizard.TestServices; +import org.apache.polaris.service.quarkus.TestServices; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisServiceImplIntegrationTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisServiceImplIntegrationTest.java similarity index 99% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisServiceImplIntegrationTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisServiceImplIntegrationTest.java index a09199e249..4c21fa7a15 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/admin/PolarisServiceImplIntegrationTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisServiceImplIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.admin; +package org.apache.polaris.service.quarkus.admin; import static org.apache.polaris.service.context.DefaultRealmContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; @@ -85,11 +85,11 @@ import org.apache.polaris.core.admin.model.UpdatePrincipalRoleRequest; import org.apache.polaris.core.entity.PolarisEntityConstants; import org.apache.polaris.service.auth.BasePolarisAuthenticator; -import org.apache.polaris.service.dropwizard.auth.TokenUtils; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestFixture; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestHelper; -import org.apache.polaris.service.dropwizard.test.TestEnvironment; -import org.apache.polaris.service.dropwizard.test.TestEnvironmentExtension; +import org.apache.polaris.service.quarkus.auth.TokenUtils; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestFixture; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestHelper; +import org.apache.polaris.service.quarkus.test.TestEnvironment; +import org.apache.polaris.service.quarkus.test.TestEnvironmentExtension; import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/auth/JWTRSAKeyPairTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTRSAKeyPairTest.java similarity index 98% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/auth/JWTRSAKeyPairTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTRSAKeyPairTest.java index 65e914e04d..ba624e6217 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/auth/JWTRSAKeyPairTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTRSAKeyPairTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.auth; +package org.apache.polaris.service.quarkus.auth; import static org.assertj.core.api.Assertions.assertThat; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/auth/JWTSymmetricKeyGeneratorTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTSymmetricKeyGeneratorTest.java similarity index 98% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/auth/JWTSymmetricKeyGeneratorTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTSymmetricKeyGeneratorTest.java index a5851ae334..aaa62643d9 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/auth/JWTSymmetricKeyGeneratorTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/JWTSymmetricKeyGeneratorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.auth; +package org.apache.polaris.service.quarkus.auth; import static org.assertj.core.api.Assertions.assertThat; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/auth/TokenRequestValidatorTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenRequestValidatorTest.java similarity index 98% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/auth/TokenRequestValidatorTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenRequestValidatorTest.java index 4fa519eeef..54e07f4865 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/auth/TokenRequestValidatorTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenRequestValidatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.auth; +package org.apache.polaris.service.quarkus.auth; import org.apache.polaris.service.auth.OAuthTokenErrorResponse; import org.apache.polaris.service.auth.TokenRequestValidator; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/auth/TokenUtils.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenUtils.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/auth/TokenUtils.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenUtils.java index af08c5a8ac..606d87a140 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/auth/TokenUtils.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/auth/TokenUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.auth; +package org.apache.polaris.service.quarkus.auth; import static org.apache.polaris.service.auth.BasePolarisAuthenticator.PRINCIPAL_ROLE_ALL; import static org.apache.polaris.service.context.DefaultRealmContextResolver.REALM_PROPERTY_KEY; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/AccessDelegationModeTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AccessDelegationModeTest.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/AccessDelegationModeTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AccessDelegationModeTest.java index 7e85a9a815..1a24fe3ae9 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/AccessDelegationModeTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/AccessDelegationModeTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import static org.apache.polaris.service.catalog.AccessDelegationMode.*; import static org.apache.polaris.service.catalog.AccessDelegationMode.REMOTE_SIGNING; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/BasePolarisCatalogTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/BasePolarisCatalogTest.java similarity index 99% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/BasePolarisCatalogTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/BasePolarisCatalogTest.java index e212c48487..ae9f22496c 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/BasePolarisCatalogTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/BasePolarisCatalogTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.iceberg.types.Types.NestedField.required; @@ -92,8 +92,8 @@ import org.apache.polaris.service.catalog.BasePolarisCatalog; import org.apache.polaris.service.catalog.io.DefaultFileIOFactory; import org.apache.polaris.service.catalog.io.FileIOFactory; -import org.apache.polaris.service.dropwizard.catalog.io.TestFileIOFactory; import org.apache.polaris.service.exception.IcebergExceptionMapper; +import org.apache.polaris.service.quarkus.catalog.io.TestFileIOFactory; import org.apache.polaris.service.storage.PolarisStorageIntegrationProviderImpl; import org.apache.polaris.service.task.TableCleanupTaskHandler; import org.apache.polaris.service.task.TaskExecutor; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/BasePolarisCatalogViewTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/BasePolarisCatalogViewTest.java similarity index 99% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/BasePolarisCatalogViewTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/BasePolarisCatalogViewTest.java index 1f5a0bd327..01fb704971 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/BasePolarisCatalogViewTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/BasePolarisCatalogViewTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import com.google.common.collect.ImmutableMap; import io.quarkus.test.junit.QuarkusMock; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisCatalogHandlerWrapperAuthzTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisCatalogHandlerWrapperAuthzTest.java similarity index 99% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisCatalogHandlerWrapperAuthzTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisCatalogHandlerWrapperAuthzTest.java index 8eade23442..ed182dc1fb 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisCatalogHandlerWrapperAuthzTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisCatalogHandlerWrapperAuthzTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import com.google.common.collect.ImmutableMap; import io.quarkus.test.junit.QuarkusTest; @@ -67,7 +67,7 @@ import org.apache.polaris.service.config.RealmEntityManagerFactory; import org.apache.polaris.service.context.CallContextCatalogFactory; import org.apache.polaris.service.context.PolarisCallContextCatalogFactory; -import org.apache.polaris.service.dropwizard.admin.PolarisAuthzTestBase; +import org.apache.polaris.service.quarkus.admin.PolarisAuthzTestBase; import org.apache.polaris.service.types.NotificationRequest; import org.apache.polaris.service.types.NotificationType; import org.apache.polaris.service.types.TableUpdateNotification; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisPassthroughResolutionView.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisPassthroughResolutionView.java similarity index 99% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisPassthroughResolutionView.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisPassthroughResolutionView.java index 549184c59e..dc9dec0d13 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisPassthroughResolutionView.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisPassthroughResolutionView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import java.util.Arrays; import org.apache.iceberg.catalog.Namespace; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogIntegrationTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogIntegrationTest.java similarity index 99% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogIntegrationTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogIntegrationTest.java index ac04aac98b..e6afe06f35 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogIntegrationTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import static org.apache.polaris.service.context.DefaultRealmContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; @@ -77,10 +77,10 @@ import org.apache.polaris.core.admin.model.ViewPrivilege; import org.apache.polaris.core.entity.CatalogEntity; import org.apache.polaris.core.entity.PolarisEntityConstants; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestFixture; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestHelper; -import org.apache.polaris.service.dropwizard.test.TestEnvironment; -import org.apache.polaris.service.dropwizard.test.TestEnvironmentExtension; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestFixture; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestHelper; +import org.apache.polaris.service.quarkus.test.TestEnvironment; +import org.apache.polaris.service.quarkus.test.TestEnvironmentExtension; import org.apache.polaris.service.types.NotificationRequest; import org.apache.polaris.service.types.NotificationType; import org.apache.polaris.service.types.TableUpdateNotification; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewAwsIntegrationTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewAwsIntegrationTest.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewAwsIntegrationTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewAwsIntegrationTest.java index fb378ed8b2..60c8af18c0 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewAwsIntegrationTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewAwsIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import io.quarkus.test.junit.QuarkusTest; import java.util.List; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewAzureIntegrationTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewAzureIntegrationTest.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewAzureIntegrationTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewAzureIntegrationTest.java index 9742c198c6..fddf9d8f18 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewAzureIntegrationTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewAzureIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import io.quarkus.test.junit.QuarkusTest; import java.util.List; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewFileIntegrationTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewFileIntegrationTest.java similarity index 96% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewFileIntegrationTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewFileIntegrationTest.java index c8045baa3c..8b847d8600 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewFileIntegrationTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewFileIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import io.quarkus.test.junit.QuarkusTest; import java.util.List; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewGcpIntegrationTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewGcpIntegrationTest.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewGcpIntegrationTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewGcpIntegrationTest.java index d12646eb0a..06266e1000 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewGcpIntegrationTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewGcpIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import io.quarkus.test.junit.QuarkusTest; import java.util.List; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewIntegrationTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewIntegrationTest.java similarity index 94% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewIntegrationTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewIntegrationTest.java index a1ab497aa7..4bbb721d25 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisRestCatalogViewIntegrationTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisRestCatalogViewIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import static org.apache.polaris.service.context.DefaultRealmContextResolver.REALM_PROPERTY_KEY; @@ -32,10 +32,10 @@ import org.apache.polaris.core.admin.model.PolarisCatalog; import org.apache.polaris.core.admin.model.StorageConfigInfo; import org.apache.polaris.core.entity.CatalogEntity; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestFixture; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestHelper; -import org.apache.polaris.service.dropwizard.test.TestEnvironment; -import org.apache.polaris.service.dropwizard.test.TestEnvironmentExtension; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestFixture; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestHelper; +import org.apache.polaris.service.quarkus.test.TestEnvironment; +import org.apache.polaris.service.quarkus.test.TestEnvironmentExtension; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisSparkIntegrationTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisSparkIntegrationTest.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisSparkIntegrationTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisSparkIntegrationTest.java index 047f356f5f..87ecdd91b5 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/PolarisSparkIntegrationTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisSparkIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import static org.apache.polaris.service.context.DefaultRealmContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; @@ -38,10 +38,10 @@ import org.apache.polaris.core.admin.model.ExternalCatalog; import org.apache.polaris.core.admin.model.PolarisCatalog; import org.apache.polaris.core.admin.model.StorageConfigInfo; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestFixture; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestHelper; -import org.apache.polaris.service.dropwizard.test.TestEnvironment; -import org.apache.polaris.service.dropwizard.test.TestEnvironmentExtension; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestFixture; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestHelper; +import org.apache.polaris.service.quarkus.test.TestEnvironment; +import org.apache.polaris.service.quarkus.test.TestEnvironmentExtension; import org.apache.polaris.service.types.NotificationRequest; import org.apache.polaris.service.types.NotificationType; import org.apache.polaris.service.types.TableUpdateNotification; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/TestUtil.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/TestUtil.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/TestUtil.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/TestUtil.java index 2f5a9c8988..de9c0aab97 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/TestUtil.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/TestUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog; +package org.apache.polaris.service.quarkus.catalog; import static org.apache.polaris.service.context.DefaultRealmContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; @@ -37,8 +37,8 @@ import org.apache.polaris.core.admin.model.CatalogRole; import org.apache.polaris.core.admin.model.GrantResource; import org.apache.polaris.service.auth.BasePolarisAuthenticator; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestFixture; -import org.apache.polaris.service.dropwizard.test.TestEnvironment; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestFixture; +import org.apache.polaris.service.quarkus.test.TestEnvironment; /** Test utilities for catalog tests */ public class TestUtil { diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/io/FileIOExceptionsTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/FileIOExceptionsTest.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/io/FileIOExceptionsTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/FileIOExceptionsTest.java index 59918500f1..bc1f0f9e62 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/io/FileIOExceptionsTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/FileIOExceptionsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog.io; +package org.apache.polaris.service.quarkus.catalog.io; import static org.apache.iceberg.types.Types.NestedField.required; import static org.assertj.core.api.Assertions.assertThat; @@ -38,7 +38,7 @@ import org.apache.polaris.core.admin.model.FileStorageConfigInfo; import org.apache.polaris.core.admin.model.PolarisCatalog; import org.apache.polaris.core.admin.model.StorageConfigInfo; -import org.apache.polaris.service.dropwizard.TestServices; +import org.apache.polaris.service.quarkus.TestServices; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/io/TestFileIO.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/TestFileIO.java similarity index 98% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/io/TestFileIO.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/TestFileIO.java index a5d60da93c..8acf2efd8e 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/io/TestFileIO.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/TestFileIO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog.io; +package org.apache.polaris.service.quarkus.catalog.io; import java.util.Map; import java.util.Optional; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/io/TestFileIOFactory.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/TestFileIOFactory.java similarity index 98% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/io/TestFileIOFactory.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/TestFileIOFactory.java index 9c0b048750..7504755995 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/io/TestFileIOFactory.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/TestFileIOFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog.io; +package org.apache.polaris.service.quarkus.catalog.io; import jakarta.enterprise.inject.Vetoed; import java.util.ArrayList; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/io/TestInputFile.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/TestInputFile.java similarity index 96% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/io/TestInputFile.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/TestInputFile.java index ebeb7145d7..da050c1198 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/catalog/io/TestInputFile.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/catalog/io/TestInputFile.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.catalog.io; +package org.apache.polaris.service.quarkus.catalog.io; import java.util.Optional; import java.util.function.Supplier; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/config/DefaultConfigurationStoreTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/config/DefaultConfigurationStoreTest.java similarity index 98% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/config/DefaultConfigurationStoreTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/config/DefaultConfigurationStoreTest.java index 29fc0da60c..ac7c0116aa 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/config/DefaultConfigurationStoreTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/config/DefaultConfigurationStoreTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.config; +package org.apache.polaris.service.quarkus.config; import static org.assertj.core.api.Assertions.assertThat; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/entity/CatalogEntityTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/entity/CatalogEntityTest.java similarity index 99% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/entity/CatalogEntityTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/entity/CatalogEntityTest.java index d7dcffd66e..2d4667d106 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/entity/CatalogEntityTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/entity/CatalogEntityTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.entity; +package org.apache.polaris.service.quarkus.entity; import java.util.List; import org.apache.polaris.core.admin.model.AwsStorageConfigInfo; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/ratelimiter/MockTokenBucketFactory.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/MockTokenBucketFactory.java similarity index 96% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/ratelimiter/MockTokenBucketFactory.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/MockTokenBucketFactory.java index 509d2af428..bff955c9c1 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/ratelimiter/MockTokenBucketFactory.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/MockTokenBucketFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.ratelimiter; +package org.apache.polaris.service.quarkus.ratelimiter; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Alternative; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/ratelimiter/RateLimiterFilterTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/RateLimiterFilterTest.java similarity index 93% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/ratelimiter/RateLimiterFilterTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/RateLimiterFilterTest.java index 1717658f2e..6e39a5d096 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/ratelimiter/RateLimiterFilterTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/RateLimiterFilterTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.ratelimiter; +package org.apache.polaris.service.quarkus.ratelimiter; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.InstanceOfAssertFactories.type; @@ -31,12 +31,12 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; -import org.apache.polaris.service.dropwizard.ratelimiter.RateLimiterFilterTest.Profile; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestFixture; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestHelper; -import org.apache.polaris.service.dropwizard.test.TestEnvironment; -import org.apache.polaris.service.dropwizard.test.TestEnvironmentExtension; -import org.apache.polaris.service.dropwizard.test.TestMetricsUtil; +import org.apache.polaris.service.quarkus.ratelimiter.RateLimiterFilterTest.Profile; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestFixture; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestHelper; +import org.apache.polaris.service.quarkus.test.TestEnvironment; +import org.apache.polaris.service.quarkus.test.TestEnvironmentExtension; +import org.apache.polaris.service.quarkus.test.TestMetricsUtil; import org.hawkular.agent.prometheus.types.MetricFamily; import org.hawkular.agent.prometheus.types.Summary; import org.junit.jupiter.api.AfterAll; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/ratelimiter/TestUtil.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TestUtil.java similarity index 90% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/ratelimiter/TestUtil.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TestUtil.java index f33cb65177..a27f1c311d 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/ratelimiter/TestUtil.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TestUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.ratelimiter; +package org.apache.polaris.service.quarkus.ratelimiter; import static org.apache.polaris.service.context.DefaultRealmContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; @@ -24,8 +24,8 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; import java.util.function.Consumer; -import org.apache.polaris.service.dropwizard.test.PolarisIntegrationTestFixture; -import org.apache.polaris.service.dropwizard.test.TestEnvironment; +import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestFixture; +import org.apache.polaris.service.quarkus.test.TestEnvironment; /** Common test utils for testing rate limiting */ public class TestUtil { diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/ratelimiter/TokenBucketTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TokenBucketTest.java similarity index 98% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/ratelimiter/TokenBucketTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TokenBucketTest.java index 33a7451ea1..3364b4cde6 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/ratelimiter/TokenBucketTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/ratelimiter/TokenBucketTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.ratelimiter; +package org.apache.polaris.service.quarkus.ratelimiter; import java.time.Clock; import java.time.Duration; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/task/ManifestFileCleanupTaskHandlerTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/ManifestFileCleanupTaskHandlerTest.java similarity index 99% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/task/ManifestFileCleanupTaskHandlerTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/ManifestFileCleanupTaskHandlerTest.java index 7e6487931d..18196d4761 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/task/ManifestFileCleanupTaskHandlerTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/ManifestFileCleanupTaskHandlerTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.task; +package org.apache.polaris.service.quarkus.task; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/task/TableCleanupTaskHandlerTest.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TableCleanupTaskHandlerTest.java similarity index 99% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/task/TableCleanupTaskHandlerTest.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TableCleanupTaskHandlerTest.java index 90188dc1ed..42efb95d2c 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/task/TableCleanupTaskHandlerTest.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TableCleanupTaskHandlerTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.task; +package org.apache.polaris.service.quarkus.task; import static org.assertj.core.api.Assertions.assertThat; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/task/TaskTestUtils.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TaskTestUtils.java similarity index 99% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/task/TaskTestUtils.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TaskTestUtils.java index c1f6021edd..9cd0ddd9e4 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/task/TaskTestUtils.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TaskTestUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.task; +package org.apache.polaris.service.quarkus.task; import jakarta.annotation.Nonnull; import java.io.IOException; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/task/TestSnapshot.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TestSnapshot.java similarity index 98% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/task/TestSnapshot.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TestSnapshot.java index f10db52d68..1a9064e964 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/task/TestSnapshot.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/task/TestSnapshot.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.task; +package org.apache.polaris.service.quarkus.task; import com.google.common.collect.Lists; import java.io.IOException; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/DefaultTestEnvironmentResolver.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/DefaultTestEnvironmentResolver.java similarity index 96% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/DefaultTestEnvironmentResolver.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/DefaultTestEnvironmentResolver.java index d5330d5505..4f793f63df 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/DefaultTestEnvironmentResolver.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/DefaultTestEnvironmentResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.test; +package org.apache.polaris.service.quarkus.test; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/PolarisIntegrationTestFixture.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java similarity index 98% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/PolarisIntegrationTestFixture.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java index a6ba12605a..618918dee6 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/PolarisIntegrationTestFixture.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestFixture.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.test; +package org.apache.polaris.service.quarkus.test; import static org.apache.polaris.service.context.DefaultRealmContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; @@ -44,8 +44,8 @@ import org.apache.polaris.core.entity.PolarisPrincipalSecrets; import org.apache.polaris.core.persistence.PolarisMetaStoreManager; import org.apache.polaris.core.persistence.PolarisMetaStoreSession; -import org.apache.polaris.service.dropwizard.auth.TokenUtils; import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; +import org.apache.polaris.service.quarkus.auth.TokenUtils; import org.junit.jupiter.api.TestInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/PolarisIntegrationTestHelper.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestHelper.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/PolarisIntegrationTestHelper.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestHelper.java index df3808e2ad..f7f5ed7193 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/PolarisIntegrationTestHelper.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/PolarisIntegrationTestHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.test; +package org.apache.polaris.service.quarkus.test; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.inject.Inject; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/TestEnvironment.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironment.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/TestEnvironment.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironment.java index 7ce7262171..72808de417 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/TestEnvironment.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironment.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.test; +package org.apache.polaris.service.quarkus.test; import java.net.URI; import java.util.UUID; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/TestEnvironmentExtension.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentExtension.java similarity index 98% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/TestEnvironmentExtension.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentExtension.java index 94d16e07b5..729db42dfb 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/TestEnvironmentExtension.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentExtension.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.test; +package org.apache.polaris.service.quarkus.test; import java.lang.reflect.InvocationTargetException; import java.util.Optional; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/TestEnvironmentResolver.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentResolver.java similarity index 95% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/TestEnvironmentResolver.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentResolver.java index 3c4a44e906..6178629123 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/TestEnvironmentResolver.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestEnvironmentResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.test; +package org.apache.polaris.service.quarkus.test; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/TestMetricsUtil.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestMetricsUtil.java similarity index 97% rename from dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/TestMetricsUtil.java rename to quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestMetricsUtil.java index 6458b84b00..be61bb79f3 100644 --- a/dropwizard/service/src/test/java/org/apache/polaris/service/dropwizard/test/TestMetricsUtil.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/test/TestMetricsUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.service.dropwizard.test; +package org.apache.polaris.service.quarkus.test; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; diff --git a/site/content/in-dev/unreleased/metastores.md b/site/content/in-dev/unreleased/metastores.md index 74766c9c80..8b287ffb2a 100644 --- a/site/content/in-dev/unreleased/metastores.md +++ b/site/content/in-dev/unreleased/metastores.md @@ -76,7 +76,7 @@ A single `persistence.xml` can describe multiple [persistence units](https://ecl To build Polaris with the necessary H2 dependency and start the Polaris service, run the following: ```bash polaris> ./gradlew --no-daemon --info -PeclipseLink=true -PeclipseLinkDeps=com.h2database:h2:2.3.232 clean shadowJar -polaris> java -jar dropwizard/service/build/libs/polaris-dropwizard-service-*.jar server ./polaris-server.yml +polaris> java -jar quarkus/service/build/quarkus-app/quarkus-run.jar ``` ### Postgres @@ -108,5 +108,5 @@ The following shows a sample configuration for integrating Polaris with Postgres To build Polaris with the necessary Postgres dependency and start the Polaris service, run the following: ```bash polaris> ./gradlew --no-daemon --info -PeclipseLink=true -PeclipseLinkDeps=org.postgresql:postgresql:42.7.4 clean shadowJar -polaris> java -jar dropwizard/service/build/libs/polaris-dropwizard-service-*.jar server ./polaris-server.yml +polaris> java -jar quarkus/service/build/quarkus-app/quarkus-run.jar ``` \ No newline at end of file