bbende commented on a change in pull request #230: NIFIREG-321 Integrate revision concept into UI, REST API, and service… URL: https://github.com/apache/nifi-registry/pull/230#discussion_r334492294
########## File path: nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/InvalidRevisionExceptionMapper.java ########## @@ -0,0 +1,48 @@ +/* + * 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.nifi.registry.web.mapper; + +import org.apache.commons.lang3.StringUtils; +import org.apache.nifi.registry.revision.api.InvalidRevisionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +/** + * Maps invalid revision exceptions into client responses. + */ +@Provider +public class InvalidRevisionExceptionMapper implements ExceptionMapper<InvalidRevisionException> { + + private static final Logger logger = LoggerFactory.getLogger(InvalidRevisionExceptionMapper.class); + + @Override + public Response toResponse(InvalidRevisionException exception) { + // log the error + logger.info(String.format("%s. Returning %s response.", exception, Response.Status.BAD_REQUEST)); + + if (logger.isDebugEnabled()) { + logger.debug(StringUtils.EMPTY, exception); + } + + return Response.status(Response.Status.BAD_REQUEST).entity(exception.getMessage()).type("text/plain").build(); Review comment: 1) I don't mind changing it to 409 if you think that is more appropriate. I think I just brought over the same `InvalidRevisionExceptionMapper` that NiFi has which uses 400. 2) I agree that the error message is not really helpful for the end user. I think something like what you said in the general comments probably makes sense for a more friendly message. 3) `ExpiredRevisionClaimException` is a sub-class of `InvalidRevisionException` so it is getting handled by that exception mapper. I will be honest and say that I am not sure why `ExpiredRevisionClaimException ` even exists. It was only used during a delete in the` NaiveRevisionManager`, and its the same check that is done in update where we use `InvalidRevisionException`, and as far as I can tell NiFi doesn't have any specific logic to handle it differently, in fact there are two places where it catches it and converts it to `InvalidRevisionExcpetion `. So long story short, I left it in place for consistency, but I think the error handling is primarily based on `InvalidRevisionException`. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
