Changes based on reviews from @adutra and @dimas-b

Author: adnanhemani

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

@@ -19,9 +19,10 @@
 
 package org.apache.polaris.service.admin;
 
+import jakarta.annotation.Priority;
 import jakarta.decorator.Decorator;
 import jakarta.decorator.Delegate;
-import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Alternative;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.SecurityContext;
@@ -34,35 +35,31 @@
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.service.admin.api.PolarisCatalogsApiService;
 
-@EventsServiceDelegator
-@Default
 @Decorator
-public class PolarisCatalogsServiceDefaultDelegator implements PolarisCatalogsApiService {
+@Priority(1000)
+@Alternative
+public class PolarisCatalogsEventServiceDelegator implements PolarisCatalogsApiService {
 
   @Inject @Delegate PolarisCatalogsApiService delegate;
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response createCatalog(
       CreateCatalogRequest request, RealmContext realmContext, SecurityContext securityContext) {
     return delegate.createCatalog(request, realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response deleteCatalog(
       String catalogName, RealmContext realmContext, SecurityContext securityContext) {
     return delegate.deleteCatalog(catalogName, realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response getCatalog(
       String catalogName, RealmContext realmContext, SecurityContext securityContext) {
     return delegate.getCatalog(catalogName, realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response updateCatalog(
       String catalogName,
@@ -72,13 +69,11 @@ public Response updateCatalog(
     return delegate.updateCatalog(catalogName, updateRequest, realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response listCatalogs(RealmContext realmContext, SecurityContext securityContext) {
     return delegate.listCatalogs(realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response createCatalogRole(
       String catalogName,
@@ -88,7 +83,6 @@ public Response createCatalogRole(
     return delegate.createCatalogRole(catalogName, request, realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response deleteCatalogRole(
       String catalogName,
@@ -98,7 +92,6 @@ public Response deleteCatalogRole(
     return delegate.deleteCatalogRole(catalogName, catalogRoleName, realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response getCatalogRole(
       String catalogName,
@@ -108,7 +101,6 @@ public Response getCatalogRole(
     return delegate.getCatalogRole(catalogName, catalogRoleName, realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response updateCatalogRole(
       String catalogName,
@@ -120,14 +112,12 @@ public Response updateCatalogRole(
         catalogName, catalogRoleName, updateRequest, realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response listCatalogRoles(
       String catalogName, RealmContext realmContext, SecurityContext securityContext) {
     return delegate.listCatalogRoles(catalogName, realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response addGrantToCatalogRole(
       String catalogName,
@@ -139,7 +129,6 @@ public Response addGrantToCatalogRole(
         catalogName, catalogRoleName, grantRequest, realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response revokeGrantFromCatalogRole(
       String catalogName,
@@ -152,7 +141,6 @@ public Response revokeGrantFromCatalogRole(
         catalogName, catalogRoleName, cascade, grantRequest, realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response listAssigneePrincipalRolesForCatalogRole(
       String catalogName,
@@ -163,7 +151,6 @@ public Response listAssigneePrincipalRolesForCatalogRole(
         catalogName, catalogRoleName, realmContext, securityContext);
   }
 
-  /** From PolarisCatalogsApiService */
   @Override
   public Response listGrantsForCatalogRole(
       String catalogName,

runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisCatalogsServiceDefaultDelegator.java renamed to runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisCatalogsEventServiceDelegator.java

@@ -19,9 +19,10 @@
 
 package org.apache.polaris.service.admin;
 
+import jakarta.annotation.Priority;
 import jakarta.decorator.Decorator;
 import jakarta.decorator.Delegate;
-import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Alternative;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.SecurityContext;
@@ -31,15 +32,13 @@
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.service.admin.api.PolarisPrincipalRolesApiService;
 
-@Default
-@EventsServiceDelegator
 @Decorator
-public class PolarisPrincipalRolesServiceDefaultDelegator
-    implements PolarisPrincipalRolesApiService {
+@Priority(1000)
+@Alternative
+public class PolarisPrincipalRolesEventServiceDelegator implements PolarisPrincipalRolesApiService {
 
   @Inject @Delegate PolarisPrincipalRolesApiService delegate;
 
-  /** From PolarisPrincipalRolesApiService */
   @Override
   public Response createPrincipalRole(
       CreatePrincipalRoleRequest request,
@@ -48,21 +47,18 @@ public Response createPrincipalRole(
     return delegate.createPrincipalRole(request, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalRolesApiService */
   @Override
   public Response deletePrincipalRole(
       String principalRoleName, RealmContext realmContext, SecurityContext securityContext) {
     return delegate.deletePrincipalRole(principalRoleName, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalRolesApiService */
   @Override
   public Response getPrincipalRole(
       String principalRoleName, RealmContext realmContext, SecurityContext securityContext) {
     return delegate.getPrincipalRole(principalRoleName, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalRolesApiService */
   @Override
   public Response updatePrincipalRole(
       String principalRoleName,
@@ -73,13 +69,11 @@ public Response updatePrincipalRole(
         principalRoleName, updateRequest, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalRolesApiService */
   @Override
   public Response listPrincipalRoles(RealmContext realmContext, SecurityContext securityContext) {
     return delegate.listPrincipalRoles(realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalRolesApiService */
   @Override
   public Response assignCatalogRoleToPrincipalRole(
       String principalRoleName,
@@ -91,7 +85,6 @@ public Response assignCatalogRoleToPrincipalRole(
         principalRoleName, catalogName, request, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalRolesApiService */
   @Override
   public Response revokeCatalogRoleFromPrincipalRole(
       String principalRoleName,
@@ -103,15 +96,13 @@ public Response revokeCatalogRoleFromPrincipalRole(
         principalRoleName, catalogName, catalogRoleName, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalRolesApiService */
   @Override
   public Response listAssigneePrincipalsForPrincipalRole(
       String principalRoleName, RealmContext realmContext, SecurityContext securityContext) {
     return delegate.listAssigneePrincipalsForPrincipalRole(
         principalRoleName, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalRolesApiService */
   @Override
   public Response listCatalogRolesForPrincipalRole(
       String principalRoleName,

runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisPrincipalRolesServiceDefaultDelegator.java renamed to runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisPrincipalRolesEventServiceDelegator.java

@@ -19,9 +19,10 @@
 
 package org.apache.polaris.service.admin;
 
+import jakarta.annotation.Priority;
 import jakarta.decorator.Decorator;
 import jakarta.decorator.Delegate;
-import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Alternative;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.SecurityContext;
@@ -31,35 +32,31 @@
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.service.admin.api.PolarisPrincipalsApiService;
 
-@Default
-@EventsServiceDelegator
 @Decorator
-public class PolarisPrincipalsServiceDefaultDelegator implements PolarisPrincipalsApiService {
+@Priority(1000)
+@Alternative
+public class PolarisPrincipalsEventServiceDelegator implements PolarisPrincipalsApiService {
 
   @Inject @Delegate PolarisPrincipalsApiService delegate;
 
-  /** From PolarisPrincipalsApiService */
   @Override
   public Response createPrincipal(
       CreatePrincipalRequest request, RealmContext realmContext, SecurityContext securityContext) {
     return delegate.createPrincipal(request, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalsApiService */
   @Override
   public Response deletePrincipal(
       String principalName, RealmContext realmContext, SecurityContext securityContext) {
     return delegate.deletePrincipal(principalName, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalsApiService */
   @Override
   public Response getPrincipal(
       String principalName, RealmContext realmContext, SecurityContext securityContext) {
     return delegate.getPrincipal(principalName, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalsApiService */
   @Override
   public Response updatePrincipal(
       String principalName,
@@ -69,20 +66,17 @@ public Response updatePrincipal(
     return delegate.updatePrincipal(principalName, updateRequest, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalsApiService */
   @Override
   public Response rotateCredentials(
       String principalName, RealmContext realmContext, SecurityContext securityContext) {
     return delegate.rotateCredentials(principalName, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalsApiService */
   @Override
   public Response listPrincipals(RealmContext realmContext, SecurityContext securityContext) {
     return delegate.listPrincipals(realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalsApiService */
   @Override
   public Response assignPrincipalRole(
       String principalName,
@@ -92,7 +86,6 @@ public Response assignPrincipalRole(
     return delegate.assignPrincipalRole(principalName, request, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalsApiService */
   @Override
   public Response revokePrincipalRole(
       String principalName,
@@ -103,7 +96,6 @@ public Response revokePrincipalRole(
         principalName, principalRoleName, realmContext, securityContext);
   }
 
-  /** From PolarisPrincipalsApiService */
   @Override
   public Response listPrincipalRolesAssigned(
       String principalName, RealmContext realmContext, SecurityContext securityContext) {

runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisPrincipalsServiceDefaultDelegator.java renamed to runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisPrincipalsEventServiceDelegator.java

@@ -19,22 +19,22 @@
 
 package org.apache.polaris.service.catalog.generic;
 
+import jakarta.annotation.Priority;
 import jakarta.decorator.Decorator;
 import jakarta.decorator.Delegate;
-import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Alternative;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.SecurityContext;
 import org.apache.polaris.core.context.RealmContext;
-import org.apache.polaris.service.admin.EventsServiceDelegator;
 import org.apache.polaris.service.catalog.api.PolarisCatalogGenericTableApiService;
 import org.apache.polaris.service.catalog.common.CatalogAdapter;
 import org.apache.polaris.service.types.CreateGenericTableRequest;
 
-@Default
-@EventsServiceDelegator
 @Decorator
-public class CatalogGenericTableServiceDefaultDelegator
+@Priority(1000)
+@Alternative
+public class CatalogGenericTableEventServiceDelegator
     implements PolarisCatalogGenericTableApiService, CatalogAdapter {
 
   @Inject @Delegate GenericTableCatalogAdapter delegate;