Rename directory and package names (Quarkus switch follow-up)

apache · Jan 7, 2025 · 5edce16 · 5edce16
1 parent a36d0ac
commit 5edce16
Show file tree

Hide file tree

Showing 79 changed files with 132 additions and 207 deletions.
diff --git 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
@@ -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
@@ -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
@@ -91,7 +91,7 @@ tasks.named<RatTask>("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/...service/src/main/java/org/apache/polaris/service/dropwizard/config/TokenBrokerConfig.java b/...service/src/main/java/org/apache/polaris/service/dropwizard/config/TokenBrokerConfig.java
diff --git 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 → quarkus/service/README-quarkus.md b/dropwizard/service/README-quarkus.md → quarkus/service/README-quarkus.md
diff --git a/dropwizard/service/build.gradle.kts → quarkus/service/build.gradle.kts b/dropwizard/service/build.gradle.kts → quarkus/service/build.gradle.kts
diff --git a/...rd/service/src/main/docker/Dockerfile.jvm → ...us/service/src/main/docker/Dockerfile.jvm b/...rd/service/src/main/docker/Dockerfile.jvm → ...us/service/src/main/docker/Dockerfile.jvm
diff --git a/...h/QuarkusAuthenticationConfiguration.java → ...h/QuarkusAuthenticationConfiguration.java b/...h/QuarkusAuthenticationConfiguration.java → ...h/QuarkusAuthenticationConfiguration.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/...e/dropwizard/auth/QuarkusOAuthFilter.java → ...vice/quarkus/auth/QuarkusOAuthFilter.java b/...e/dropwizard/auth/QuarkusOAuthFilter.java → ...vice/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/...log/io/QuarkusCatalogIOConfiguration.java → ...log/io/QuarkusCatalogIOConfiguration.java b/...log/io/QuarkusCatalogIOConfiguration.java → ...log/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/.../config/QuarkusFeaturesConfiguration.java → .../config/QuarkusFeaturesConfiguration.java b/.../config/QuarkusFeaturesConfiguration.java → .../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/...opwizard/config/QuarkusJacksonConfig.java → .../quarkus/config/QuarkusJacksonConfig.java b/...opwizard/config/QuarkusJacksonConfig.java → .../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/...e/dropwizard/config/QuarkusProducers.java → ...vice/quarkus/config/QuarkusProducers.java b/...e/dropwizard/config/QuarkusProducers.java → ...vice/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.QuarkusAuthenticationConfiguration;
-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.QuarkusAuthenticationConfiguration;
+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/.../context/QuarkusContextConfiguration.java → .../context/QuarkusContextConfiguration.java b/.../context/QuarkusContextConfiguration.java → .../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/.../logging/QuarkusLoggingConfiguration.java → .../logging/QuarkusLoggingConfiguration.java b/.../logging/QuarkusLoggingConfiguration.java → .../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/...zard/logging/QuarkusLoggingMDCFilter.java → ...rkus/logging/QuarkusLoggingMDCFilter.java b/...zard/logging/QuarkusLoggingMDCFilter.java → ...rkus/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/...d/metrics/QuarkusMeterFilterProducer.java → ...s/metrics/QuarkusMeterFilterProducer.java b/...d/metrics/QuarkusMeterFilterProducer.java → ...s/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/.../metrics/QuarkusMetricsConfiguration.java → .../metrics/QuarkusMetricsConfiguration.java b/.../metrics/QuarkusMetricsConfiguration.java → .../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/...trics/QuarkusValueExpressionResolver.java → ...trics/QuarkusValueExpressionResolver.java b/...trics/QuarkusValueExpressionResolver.java → ...trics/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/...wizard/metrics/RealmIdTagContributor.java → ...uarkus/metrics/RealmIdTagContributor.java b/...wizard/metrics/RealmIdTagContributor.java → ...uarkus/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/...ence/QuarkusPersistenceConfiguration.java → ...ence/QuarkusPersistenceConfiguration.java b/...ence/QuarkusPersistenceConfiguration.java → ...ence/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/...iter/QuarkusRateLimiterConfiguration.java → ...iter/QuarkusRateLimiterConfiguration.java b/...iter/QuarkusRateLimiterConfiguration.java → ...iter/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/.../storage/QuarkusStorageConfiguration.java → .../storage/QuarkusStorageConfiguration.java b/.../storage/QuarkusStorageConfiguration.java → .../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/...pwizard/task/QuarkusTaskExecutorImpl.java → ...quarkus/task/QuarkusTaskExecutorImpl.java b/...pwizard/task/QuarkusTaskExecutorImpl.java → ...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/...task/QuarkusTaskHandlerConfiguration.java → ...task/QuarkusTaskHandlerConfiguration.java b/...task/QuarkusTaskHandlerConfiguration.java → ...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/...pwizard/tracing/QuarkusTracingFilter.java → ...quarkus/tracing/QuarkusTracingFilter.java b/...pwizard/tracing/QuarkusTracingFilter.java → ...quarkus/tracing/QuarkusTracingFilter.java
@@ -16,13 +16,13 @@
  * 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 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/...o.smallrye.config.ConfigSourceInterceptor → ...o.smallrye.config.ConfigSourceInterceptor b/...o.smallrye.config.ConfigSourceInterceptor → ...o.smallrye.config.ConfigSourceInterceptor
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...ropwizard/IcebergExceptionMapperTest.java → ...e/quarkus/IcebergExceptionMapperTest.java b/...ropwizard/IcebergExceptionMapperTest.java → ...e/quarkus/IcebergExceptionMapperTest.java
diff --git a/...rd/PolarisApplicationIntegrationTest.java → ...us/PolarisApplicationIntegrationTest.java b/...rd/PolarisApplicationIntegrationTest.java → ...us/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/...aris/service/dropwizard/TestServices.java → ...polaris/service/quarkus/TestServices.java b/...aris/service/dropwizard/TestServices.java → ...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/...rd/TimedApplicationEventListenerTest.java → ...us/TimedApplicationEventListenerTest.java b/...rd/TimedApplicationEventListenerTest.java → ...us/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;