better catch

apache · Sep 6, 2024 · b4cf091 · b4cf091
1 parent 51195b0
commit b4cf091
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java b/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java
@@ -21,6 +21,8 @@
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.SecurityContext;
 import java.util.List;
+import java.util.Locale;
+
 import org.apache.iceberg.catalog.Namespace;
 import org.apache.iceberg.catalog.TableIdentifier;
 import org.apache.iceberg.exceptions.AlreadyExistsException;
@@ -363,7 +365,11 @@ public Response assignPrincipalRole(
     try {
       adminService.assignPrincipalRole(principalName, request.getPrincipalRole().getName());
     } catch (IllegalStateException e) {
-      throw new AlreadyExistsException("Grant already exists or resolution failed");
+      if (e.toString().toLowerCase(Locale.ROOT).contains("duplicate key")) {
+        throw new AlreadyExistsException("Grant already exists or resolution failed");
+      } else {
+        throw e;
+      }
     }
     return Response.status(Response.Status.CREATED).build();
   }
@@ -410,7 +416,11 @@ public Response assignCatalogRoleToPrincipalRole(
       adminService.assignCatalogRoleToPrincipalRole(
           principalRoleName, catalogName, request.getCatalogRole().getName());
     } catch (IllegalStateException e) {
-      throw new AlreadyExistsException("Grant already exists or resolution failed");
+      if (e.toString().toLowerCase(Locale.ROOT).contains("duplicate key")) {
+        throw new AlreadyExistsException("Grant already exists or resolution failed");
+      } else {
+        throw e;
+      }
     }
     return Response.status(Response.Status.CREATED).build();
   }
@@ -531,7 +541,11 @@ public Response addGrantToCatalogRole(
           return Response.status(Response.Status.BAD_REQUEST).build();
       }
     } catch (IllegalStateException e) {
-      throw new AlreadyExistsException("Grant already exists or resolution failed");
+      if (e.toString().toLowerCase(Locale.ROOT).contains("duplicate key")) {
+        throw new AlreadyExistsException("Grant already exists or resolution failed");
+      } else {
+        throw e;
+      }
     }
     return Response.status(Response.Status.CREATED).build();
   }