Skip to content

Commit 0bf0c79

Browse files
adnanhemaniadnanhemani
committed
Revision based on comments from @adutra 
1 parent 46a95ab commit 0bf0c79

14 files changed

+56
-136
lines changed

‎runtime/defaults/src/main/resources/application.properties‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,37 @@ polaris.realm-context.realms=POLARIS
111111
polaris.realm-context.header-name=Polaris-Realm
112112
polaris.realm-context.require-header=false
113113

114+
#polaris.features."ENFORCE_PRINCIPAL_CREDENTIAL_ROTATION_REQUIRED_CHECKING"=false
115+
#polaris.features."SUPPORTED_CATALOG_STORAGE_TYPES"=["S3","GCS","AZURE"]
116+
## polaris.features."ENABLE_CATALOG_FEDERATION"=true
117+
#polaris.features."SUPPORTED_CATALOG_CONNECTION_TYPES"=["ICEBERG_REST"]
118+
#polaris.features."SUPPORTED_EXTERNAL_CATALOG_AUTHENTICATION_TYPES"=["OAUTH", "BEARER"]
119+
#
120+
## realm overrides
121+
## polaris.features.realm-overrides."my-realm"."SKIP_CREDENTIAL_SUBSCOPING_INDIRECTION"=true
122+
#
123+
## polaris.persistence.type=eclipse-link
124+
## polaris.persistence.type=in-memory-atomic
125+
#polaris.persistence.type=in-memory
126+
114127
polaris.features."ENFORCE_PRINCIPAL_CREDENTIAL_ROTATION_REQUIRED_CHECKING"=false
115-
polaris.features."SUPPORTED_CATALOG_STORAGE_TYPES"=["S3","GCS","AZURE"]
128+
polaris.features."SUPPORTED_CATALOG_STORAGE_TYPES"=["S3","GCS","AZURE","FILE"]
129+
polaris.features."ALLOW_INSECURE_STORAGE_TYPES"=true
130+
polaris.readiness.ignore-severe-issues=true
116131
# polaris.features."ENABLE_CATALOG_FEDERATION"=true
117132
polaris.features."SUPPORTED_CATALOG_CONNECTION_TYPES"=["ICEBERG_REST"]
118-
polaris.features."SUPPORTED_EXTERNAL_CATALOG_AUTHENTICATION_TYPES"=["OAUTH", "BEARER"]
119133

120134
# realm overrides
121135
# polaris.features.realm-overrides."my-realm"."SKIP_CREDENTIAL_SUBSCOPING_INDIRECTION"=true
122136

123137
# polaris.persistence.type=eclipse-link
124138
# polaris.persistence.type=in-memory-atomic
125-
polaris.persistence.type=in-memory
139+
# polaris.persistence.type=in-memory
140+
polaris.persistence.type=relational-jdbc
141+
quarkus.datasource.db-kind=pgsql
142+
quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/POLARIS
143+
quarkus.datasource.username=postgres
144+
quarkus.datasource.password=postgres
126145

127146
polaris.secrets-manager.type=in-memory
128147

‎runtime/service/src/main/java/org/apache/polaris/service/admin/EventsServiceDelegator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.lang.annotation.Retention;
3030
import java.lang.annotation.Target;
3131

32-
// Used to annotate delegator classes, which are emitting events
32+
/** Used to annotate delegator classes, which are emitting events. */
3333
@Qualifier
3434
@Retention(RUNTIME)
3535
@Target({TYPE, METHOD, FIELD, PARAMETER})

‎runtime/service/src/main/java/org/apache/polaris/service/admin/MainService.java‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisCatalogsServiceDefaultDelegator.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
package org.apache.polaris.service.admin;
2121

22-
import jakarta.annotation.Priority;
23-
import jakarta.enterprise.context.RequestScoped;
24-
import jakarta.enterprise.inject.Alternative;
22+
import jakarta.decorator.Decorator;
23+
import jakarta.decorator.Delegate;
2524
import jakarta.enterprise.inject.Default;
25+
import jakarta.inject.Inject;
2626
import jakarta.ws.rs.core.Response;
2727
import jakarta.ws.rs.core.SecurityContext;
2828
import org.apache.polaris.core.admin.model.AddGrantRequest;
@@ -34,17 +34,12 @@
3434
import org.apache.polaris.core.context.RealmContext;
3535
import org.apache.polaris.service.admin.api.PolarisCatalogsApiService;
3636

37-
@RequestScoped
38-
@Default
3937
@EventsServiceDelegator
40-
@Alternative
41-
@Priority(1000) // Will allow downstream project-specific delegators to be added and used
38+
@Default
39+
@Decorator
4240
public class PolarisCatalogsServiceDefaultDelegator implements PolarisCatalogsApiService {
43-
private final PolarisCatalogsApiService delegate;
4441

45-
public PolarisCatalogsServiceDefaultDelegator(@MainService PolarisCatalogsApiService delegate) {
46-
this.delegate = delegate;
47-
}
42+
@Inject @Delegate PolarisCatalogsApiService delegate;
4843

4944
/** From PolarisCatalogsApiService */
5045
@Override

‎runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisPrincipalRolesServiceDefaultDelegator.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919

2020
package org.apache.polaris.service.admin;
2121

22-
import jakarta.annotation.Priority;
23-
import jakarta.enterprise.context.RequestScoped;
24-
import jakarta.enterprise.inject.Alternative;
22+
import jakarta.decorator.Decorator;
23+
import jakarta.decorator.Delegate;
2524
import jakarta.enterprise.inject.Default;
2625
import jakarta.inject.Inject;
2726
import jakarta.ws.rs.core.Response;
@@ -32,20 +31,13 @@
3231
import org.apache.polaris.core.context.RealmContext;
3332
import org.apache.polaris.service.admin.api.PolarisPrincipalRolesApiService;
3433

35-
@RequestScoped
3634
@Default
3735
@EventsServiceDelegator
38-
@Alternative
39-
@Priority(1000) // Will allow downstream project-specific delegators to be added and used
36+
@Decorator
4037
public class PolarisPrincipalRolesServiceDefaultDelegator
4138
implements PolarisPrincipalRolesApiService {
42-
private final PolarisPrincipalRolesApiService delegate;
4339

44-
@Inject
45-
public PolarisPrincipalRolesServiceDefaultDelegator(
46-
@MainService PolarisPrincipalRolesApiService polarisService) {
47-
this.delegate = polarisService;
48-
}
40+
@Inject @Delegate PolarisPrincipalRolesApiService delegate;
4941

5042
/** From PolarisPrincipalRolesApiService */
5143
@Override

‎runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisPrincipalsServiceDefaultDelegator.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
package org.apache.polaris.service.admin;
2121

22-
import jakarta.annotation.Priority;
23-
import jakarta.enterprise.context.RequestScoped;
24-
import jakarta.enterprise.inject.Alternative;
22+
import jakarta.decorator.Decorator;
23+
import jakarta.decorator.Delegate;
2524
import jakarta.enterprise.inject.Default;
25+
import jakarta.inject.Inject;
2626
import jakarta.ws.rs.core.Response;
2727
import jakarta.ws.rs.core.SecurityContext;
2828
import org.apache.polaris.core.admin.model.CreatePrincipalRequest;
@@ -31,18 +31,12 @@
3131
import org.apache.polaris.core.context.RealmContext;
3232
import org.apache.polaris.service.admin.api.PolarisPrincipalsApiService;
3333

34-
@RequestScoped
3534
@Default
3635
@EventsServiceDelegator
37-
@Alternative
38-
@Priority(1000) // Will allow downstream project-specific delegators to be added and used
36+
@Decorator
3937
public class PolarisPrincipalsServiceDefaultDelegator implements PolarisPrincipalsApiService {
40-
private final PolarisPrincipalsApiService delegate;
4138

42-
public PolarisPrincipalsServiceDefaultDelegator(
43-
@MainService PolarisPrincipalsApiService delegate) {
44-
this.delegate = delegate;
45-
}
39+
@Inject @Delegate PolarisPrincipalsApiService delegate;
4640

4741
/** From PolarisPrincipalsApiService */
4842
@Override

‎runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989

9090
/** Concrete implementation of the Polaris API services */
9191
@RequestScoped
92-
@MainService
9392
public class PolarisServiceImpl
9493
implements PolarisCatalogsApiService,
9594
PolarisPrincipalsApiService,

‎runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/CatalogGenericTableServiceDefaultDelegator.java‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,25 @@
1919

2020
package org.apache.polaris.service.catalog.generic;
2121

22-
import jakarta.annotation.Priority;
23-
import jakarta.enterprise.context.RequestScoped;
24-
import jakarta.enterprise.inject.Alternative;
22+
import jakarta.decorator.Decorator;
23+
import jakarta.decorator.Delegate;
2524
import jakarta.enterprise.inject.Default;
2625
import jakarta.inject.Inject;
2726
import jakarta.ws.rs.core.Response;
2827
import jakarta.ws.rs.core.SecurityContext;
2928
import org.apache.polaris.core.context.RealmContext;
3029
import org.apache.polaris.service.admin.EventsServiceDelegator;
31-
import org.apache.polaris.service.admin.MainService;
3230
import org.apache.polaris.service.catalog.api.PolarisCatalogGenericTableApiService;
3331
import org.apache.polaris.service.catalog.common.CatalogAdapter;
3432
import org.apache.polaris.service.types.CreateGenericTableRequest;
3533

36-
@RequestScoped
3734
@Default
3835
@EventsServiceDelegator
39-
@Alternative
40-
@Priority(1000) // Will allow downstream project-specific delegators to be added and used
36+
@Decorator
4137
public class CatalogGenericTableServiceDefaultDelegator
4238
implements PolarisCatalogGenericTableApiService, CatalogAdapter {
43-
private final GenericTableCatalogAdapter delegate;
4439

45-
@Inject
46-
public CatalogGenericTableServiceDefaultDelegator(
47-
@MainService GenericTableCatalogAdapter delegate) {
48-
this.delegate = delegate;
49-
}
40+
@Inject @Delegate GenericTableCatalogAdapter delegate;
5041

5142
@Override
5243
public Response createGenericTable(

‎runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogAdapter.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
3535
import org.apache.polaris.core.persistence.resolver.ResolutionManifestFactory;
3636
import org.apache.polaris.core.secrets.UserSecretsManager;
37-
import org.apache.polaris.service.admin.MainService;
3837
import org.apache.polaris.service.catalog.CatalogPrefixParser;
3938
import org.apache.polaris.service.catalog.api.PolarisCatalogGenericTableApiService;
4039
import org.apache.polaris.service.catalog.common.CatalogAdapter;
@@ -46,7 +45,6 @@
4645
import org.slf4j.LoggerFactory;
4746

4847
@RequestScoped
49-
@MainService
5048
public class GenericTableCatalogAdapter
5149
implements PolarisCatalogGenericTableApiService, CatalogAdapter {
5250

‎runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogAdapter.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
import org.apache.polaris.core.persistence.resolver.ResolverStatus;
7777
import org.apache.polaris.core.rest.PolarisEndpoints;
7878
import org.apache.polaris.core.secrets.UserSecretsManager;
79-
import org.apache.polaris.service.admin.MainService;
8079
import org.apache.polaris.service.catalog.AccessDelegationMode;
8180
import org.apache.polaris.service.catalog.CatalogPrefixParser;
8281
import org.apache.polaris.service.catalog.api.IcebergRestCatalogApiService;
@@ -97,7 +96,6 @@
9796
* `IcebergCatalogHandler`.
9897
*/
9998
@RequestScoped
100-
@MainService
10199
public class IcebergCatalogAdapter
102100
implements IcebergRestCatalogApiService, IcebergRestConfigurationApiService, CatalogAdapter {
103101

0 commit comments

Comments
 (0)