Revert handling NotePathAlreadyExistsException in RestApi layer

Author: tbonelee

zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java

@@ -46,11 +46,9 @@
 import org.apache.zeppelin.notebook.Notebook;
 import org.apache.zeppelin.notebook.Paragraph;
 import org.apache.zeppelin.notebook.AuthorizationService;
-import org.apache.zeppelin.notebook.exception.NotePathAlreadyExistsException;
 import org.apache.zeppelin.notebook.repo.NotebookRepoWithVersionControl;
 import org.apache.zeppelin.notebook.scheduler.SchedulerService;
 import org.apache.zeppelin.rest.exception.BadRequestException;
-import org.apache.zeppelin.rest.exception.ConflictException;
 import org.apache.zeppelin.rest.exception.ForbiddenException;
 import org.apache.zeppelin.rest.exception.NoteNotFoundException;
 import org.apache.zeppelin.rest.exception.ParagraphNotFoundException;
@@ -488,15 +486,7 @@ public Response exportNote(@PathParam("noteId") String noteId) throws IOExceptio
   @ZeppelinApi
   public Response importNote(@QueryParam("notePath") String notePath, String noteJson) throws IOException {
     String noteId = notebookService.importNote(notePath, noteJson, getServiceContext(),
-            new RestServiceCallback<>() {
-              @Override
-              public void onFailure(Exception ex, ServiceContext context) throws IOException {
-                if (ex instanceof NotePathAlreadyExistsException) {
-                  ex = new ConflictException(ex.getMessage());
-                }
-                super.onFailure(ex, context);
-              }
-            });
+              new RestServiceCallback<>());
     return new JsonResponse<>(Status.OK, "", noteId).build();
   }
 
@@ -522,15 +512,7 @@ public Response createNote(String message) throws IOException {
             defaultInterpreterGroup,
             request.getAddingEmptyParagraph(),
             getServiceContext(),
-            new RestServiceCallback<>() {
-              @Override
-              public void onFailure(Exception ex, ServiceContext context) throws IOException {
-                if (ex instanceof NotePathAlreadyExistsException) {
-                  ex = new ConflictException(ex.getMessage());
-                }
-                super.onFailure(ex, context);
-              }
-            });
+            new RestServiceCallback<>());
     return notebook.processNote(noteId,
       note -> {
         AuthenticationInfo subject = new AuthenticationInfo(authenticationService.getPrincipal());
@@ -631,13 +613,6 @@ public void onSuccess(Note note, ServiceContext context) throws IOException {
                 notebookServer.broadcastNote(note);
                 notebookServer.broadcastNoteList(context.getAutheInfo(), context.getUserAndRoles());
               }
-              @Override
-              public void onFailure(Exception ex, ServiceContext context) throws IOException {
-                if (ex instanceof NotePathAlreadyExistsException) {
-                  ex = new ConflictException(ex.getMessage());
-                }
-                super.onFailure(ex, context);
-              }
             });
     return new JsonResponse<>(Status.OK, "").build();
   }

zeppelin-server/src/main/java/org/apache/zeppelin/rest/exception/WebApplicationExceptionMapper.java

@@ -22,6 +22,8 @@
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
 
+import org.apache.zeppelin.notebook.exception.NotePathAlreadyExistsException;
+import org.apache.zeppelin.utils.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,6 +36,8 @@ public class WebApplicationExceptionMapper implements ExceptionMapper<Throwable>
   public Response toResponse(Throwable exception) {
     if (exception instanceof WebApplicationException) {
       return ((WebApplicationException) exception).getResponse();
+    } else if (exception instanceof NotePathAlreadyExistsException) {
+      return ExceptionUtils.jsonResponseContent(Response.Status.CONFLICT, exception.getMessage());
     } else {
       LOGGER.error("Error response", exception);
       // Return generic error message to prevent information disclosure