dimas-b commented on code in PR #4793: URL: https://github.com/apache/polaris/pull/4793#discussion_r3548179385
########## runtime/service/src/main/java/org/apache/polaris/service/admin/DropEntityExceptionMapper.java: ########## @@ -0,0 +1,60 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.polaris.service.admin; + +import org.apache.iceberg.exceptions.BadRequestException; +import org.apache.iceberg.exceptions.NotFoundException; +import org.apache.polaris.core.persistence.dao.entity.DropEntityResult; +import org.jspecify.annotations.Nullable; + +/** Maps {@link DropEntityResult} failures from admin delete operations to REST exceptions. */ +final class DropEntityExceptionMapper { Review Comment: nit: the `ExceptionMapper` suffix is usually associated with something that extends `jakarta.ws.rs.ext.ExceptionMapper` 🤔 ########## runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java: ########## @@ -803,18 +803,10 @@ public void deleteCatalog(String name) { metaStoreManager.dropEntityIfExists( getCurrentPolarisContext(), null, entity, Map.of(), cleanup); - // at least some handling of error - if (!dropEntityResult.isSuccess()) { - if (dropEntityResult.failedBecauseNotEmpty()) { - throw new BadRequestException( - "Catalog '%s' cannot be dropped, it is not empty", entity.getName()); - } else { - throw new BadRequestException( - "Catalog '%s' cannot be dropped, concurrent modification detected. Please try " - + "again", - entity.getName()); - } - } + DropEntityExceptionMapper.throwIfFailed( + dropEntityResult, + new DropEntityExceptionMapper.DropFailureContext( + String.format("Catalog '%s'", entity.getName()), null)); Review Comment: The old code evaluated message templates only on failure. New code evaluates them all the time, even when they are not used 🤔 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
