Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions extension/persistence/eclipselink/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ dependencies {

implementation(libs.eclipselink)

implementation(platform(libs.quarkus.bom))
implementation("io.quarkus:quarkus-core")

implementation(libs.slf4j.api)

val eclipseLinkDeps: String? = project.findProperty("eclipseLinkDeps") as String?
Expand All @@ -58,8 +55,8 @@ dependencies {
compileOnly(libs.jakarta.annotation.api)
compileOnly(libs.jakarta.enterprise.cdi.api)
compileOnly(libs.jakarta.inject.api)
compileOnly("io.smallrye.common:smallrye-common-annotation") // @Identifier
compileOnly("io.smallrye.config:smallrye-config-core") // @ConfigMapping
compileOnly(libs.smallrye.common.annotation) // @Identifier
compileOnly(libs.smallrye.config.core) // @ConfigMapping

compileOnly(platform(libs.jackson.bom))
compileOnly("com.fasterxml.jackson.core:jackson-annotations")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@
*/
package org.apache.polaris.extension.persistence.impl.eclipselink;

import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;
import io.smallrye.config.WithDefault;
import java.nio.file.Path;
import java.util.Optional;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.persistence.eclipselink")
public interface EclipseLinkConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@
*/
package org.apache.polaris.service.quarkus.auth;

import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;
import org.apache.polaris.service.auth.AuthenticationConfiguration;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.authentication")
public interface QuarkusAuthenticationConfiguration extends AuthenticationConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
*/
package org.apache.polaris.service.quarkus.catalog.io;

import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.file-io")
public interface QuarkusFileIOConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.polaris.service.config.FeaturesConfiguration;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.behavior-changes")
// FIXME: this should extend FeatureConfiguration, but that causes conflicts with
// QuarkusFeaturesConfiguration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
*/
package org.apache.polaris.service.quarkus.config;

import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;
import java.util.Map;
import org.apache.polaris.service.config.FeaturesConfiguration;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.features")
public interface QuarkusFeaturesConfiguration extends FeaturesConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@
*/
package org.apache.polaris.service.quarkus.context;

import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;
import org.apache.polaris.service.context.RealmContextConfiguration;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.realm-context")
public interface QuarkusRealmContextConfiguration extends RealmContextConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@
*/
package org.apache.polaris.service.quarkus.logging;

import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;
import java.util.Map;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.log")
public interface QuarkusLoggingConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@
*/
package org.apache.polaris.service.quarkus.metrics;

import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;
import java.util.Map;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.metrics")
public interface QuarkusMetricsConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
*/
package org.apache.polaris.service.quarkus.persistence;

import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.persistence")
public interface QuarkusPersistenceConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
*/
package org.apache.polaris.service.quarkus.ratelimiter;

import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.rate-limiter.filter")
public interface QuarkusRateLimiterFilterConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@
*/
package org.apache.polaris.service.quarkus.ratelimiter;

import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;
import org.apache.polaris.service.ratelimiter.TokenBucketConfiguration;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.rate-limiter.token-bucket")
public interface QuarkusTokenBucketConfiguration extends TokenBucketConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@
*/
package org.apache.polaris.service.quarkus.storage;

import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;
import io.smallrye.config.WithName;
import java.time.Duration;
import java.util.*;
import org.apache.polaris.service.storage.StorageConfiguration;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.storage")
public interface QuarkusStorageConfiguration extends StorageConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
*/
package org.apache.polaris.service.quarkus.task;

import io.quarkus.runtime.annotations.StaticInitSafe;
import io.smallrye.config.ConfigMapping;
import io.smallrye.config.WithDefault;
import org.apache.polaris.service.task.TaskHandlerConfiguration;

@StaticInitSafe
@ConfigMapping(prefix = "polaris.tasks")
public interface QuarkusTaskHandlerConfiguration extends TaskHandlerConfiguration {

Expand Down