Revision based on comments from @adutra

Author: adnanhemani

runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/CatalogPolicyEventServiceDelegator.java

@@ -54,7 +54,7 @@ public Response createPolicy(
       CreatePolicyRequest createPolicyRequest,
       RealmContext realmContext,
       SecurityContext securityContext) {
-    String catalogName = getCatalogFromPrefix(prefix, realmContext);
+    String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
     polarisEventListener.onBeforeCreatePolicy(
         new CatalogPolicyServiceEvents.BeforeCreatePolicyEvent(
             catalogName, namespace, createPolicyRequest));
@@ -76,7 +76,7 @@ public Response listPolicies(
       String policyType,
       RealmContext realmContext,
       SecurityContext securityContext) {
-    String catalogName = getCatalogFromPrefix(prefix, realmContext);
+    String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
     polarisEventListener.onBeforeListPolicies(
         new CatalogPolicyServiceEvents.BeforeListPoliciesEvent(catalogName, namespace, policyType));
     Response resp =
@@ -94,7 +94,7 @@ public Response loadPolicy(
       String policyName,
       RealmContext realmContext,
       SecurityContext securityContext) {
-    String catalogName = getCatalogFromPrefix(prefix, realmContext);
+    String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
     polarisEventListener.onBeforeLoadPolicy(
         new CatalogPolicyServiceEvents.BeforeLoadPolicyEvent(catalogName, namespace, policyName));
     Response resp =
@@ -113,7 +113,7 @@ public Response updatePolicy(
       UpdatePolicyRequest updatePolicyRequest,
       RealmContext realmContext,
       SecurityContext securityContext) {
-    String catalogName = getCatalogFromPrefix(prefix, realmContext);
+    String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
     polarisEventListener.onBeforeUpdatePolicy(
         new CatalogPolicyServiceEvents.BeforeUpdatePolicyEvent(
             catalogName, namespace, policyName, updatePolicyRequest));
@@ -134,7 +134,7 @@ public Response dropPolicy(
       Boolean detachAll,
       RealmContext realmContext,
       SecurityContext securityContext) {
-    String catalogName = getCatalogFromPrefix(prefix, realmContext);
+    String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
     polarisEventListener.onBeforeDropPolicy(
         new CatalogPolicyServiceEvents.BeforeDropPolicyEvent(
             catalogName, namespace, policyName, detachAll));
@@ -155,7 +155,7 @@ public Response attachPolicy(
       AttachPolicyRequest attachPolicyRequest,
       RealmContext realmContext,
       SecurityContext securityContext) {
-    String catalogName = getCatalogFromPrefix(prefix, realmContext);
+    String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
     polarisEventListener.onBeforeAttachPolicy(
         new CatalogPolicyServiceEvents.BeforeAttachPolicyEvent(
             catalogName, namespace, policyName, attachPolicyRequest));
@@ -176,7 +176,7 @@ public Response detachPolicy(
       DetachPolicyRequest detachPolicyRequest,
       RealmContext realmContext,
       SecurityContext securityContext) {
-    String catalogName = getCatalogFromPrefix(prefix, realmContext);
+    String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
     polarisEventListener.onBeforeDetachPolicy(
         new CatalogPolicyServiceEvents.BeforeDetachPolicyEvent(
             catalogName, namespace, policyName, detachPolicyRequest));
@@ -199,7 +199,7 @@ public Response getApplicablePolicies(
       String policyType,
       RealmContext realmContext,
       SecurityContext securityContext) {
-    String catalogName = getCatalogFromPrefix(prefix, realmContext);
+    String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
     polarisEventListener.onBeforeGetApplicablePolicies(
         new CatalogPolicyServiceEvents.BeforeGetApplicablePoliciesEvent(
             catalogName, namespace, targetName, policyType));
@@ -222,8 +222,4 @@ public Response getApplicablePolicies(
             (GetApplicablePoliciesResponse) resp.getEntity()));
     return resp;
   }
-
-  private String getCatalogFromPrefix(String prefix, RealmContext realmContext) {
-    return prefixParser.prefixToCatalogName(realmContext, prefix);
-  }
 }