From 6fbfc5912c49ef1ad0dbc5aa12b35a03b0a628fd Mon Sep 17 00:00:00 2001 From: jiazhong Date: Wed, 10 Dec 2014 16:48:47 +0800 Subject: [PATCH 1/4] rm internalErrException handle in BasicController --- .../java/com/kylinolap/rest/controller/BasicController.java | 12 ++++-------- .../com/kylinolap/rest/controller/BaseControllerTest.java | 2 +- webapp/app/js/controllers/job.js | 4 ++-- webapp/app/js/controllers/projects.js | 4 ++-- webapp/app/partials/cubeDesigner/dimensions.html | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/server/src/main/java/com/kylinolap/rest/controller/BasicController.java b/server/src/main/java/com/kylinolap/rest/controller/BasicController.java index 4ff3b0f..140c297 100644 --- a/server/src/main/java/com/kylinolap/rest/controller/BasicController.java +++ b/server/src/main/java/com/kylinolap/rest/controller/BasicController.java @@ -44,18 +44,14 @@ protected MetricsService metricsService; // ~ exception handlers ~ - @ExceptionHandler(Exception.class) - void handleError(HttpServletRequest req, Exception ex) { - logger.error("Internal error (Exception) throw out of controller", ex); - } - @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) - @ExceptionHandler(InternalErrorException.class) + @ExceptionHandler(Exception.class) @ResponseBody - ErrorResponse handleInternalError(HttpServletRequest req, Exception ex) { - logger.error("Internal error (InternalErrorException) throw out of controller", ex); + ErrorResponse handleError(HttpServletRequest req, Exception ex) { + logger.error("Internal error (Exception) throw out of controller", ex); return new ErrorResponse(req.getRequestURL().toString(), ex); } + @ResponseStatus(HttpStatus.FORBIDDEN) @ExceptionHandler(ForbiddenException.class) diff --git a/server/src/test/java/com/kylinolap/rest/controller/BaseControllerTest.java b/server/src/test/java/com/kylinolap/rest/controller/BaseControllerTest.java index 898a65a..0cf0688 100644 --- a/server/src/test/java/com/kylinolap/rest/controller/BaseControllerTest.java +++ b/server/src/test/java/com/kylinolap/rest/controller/BaseControllerTest.java @@ -59,7 +59,7 @@ public void testBasics() throws IOException { Assert.assertNotNull(errorResponse); InternalErrorException internalErrorException = new InternalErrorException("error"); - errorResponse = basicController.handleInternalError(request, internalErrorException); + errorResponse = basicController.handleError(request, internalErrorException); Assert.assertNotNull(errorResponse); BadRequestException badRequestException = new BadRequestException("error"); diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js index df818cc..7bf14ce 100644 --- a/webapp/app/js/controllers/job.js +++ b/webapp/app/js/controllers/job.js @@ -117,7 +117,7 @@ KylinApp $scope.state.selectedJob = $scope.jobs[ $scope.state.selectedJob.uuid]; } // MessageService.sendMsg('Job was resumed successfully', 'success', {}); - SweetAlert.swal('Success!', 'Job was resumed successfully', 'success'); + SweetAlert.swal('Success!', 'Job has been resumed successfully!', 'success'); }); }); } @@ -137,7 +137,7 @@ KylinApp if (angular.isDefined($scope.state.selectedJob)) { $scope.state.selectedJob = $scope.jobs[ $scope.state.selectedJob.uuid]; } - SweetAlert.swal('Success!', 'Job was cancelled successfully', 'success'); + SweetAlert.swal('Success!', 'Job has been discarded successfully!', 'success'); }); }); } diff --git a/webapp/app/js/controllers/projects.js b/webapp/app/js/controllers/projects.js index 69e5308..69911e0 100644 --- a/webapp/app/js/controllers/projects.js +++ b/webapp/app/js/controllers/projects.js @@ -54,7 +54,7 @@ KylinApp type: 'warning', showCancelButton: true, confirmButtonColor: '#DD6B55', - confirmButtonText: "Yes, delete it!", + confirmButtonText: "Yes", closeOnConfirm: true }, function(isConfirm) { if(isConfirm){ @@ -63,7 +63,7 @@ KylinApp if (pIndex > -1) { $scope.projects.splice(pIndex, 1); } - SweetAlert.swal('Success!',"Project " + project.name + " deleted successfully!", 'success'); + SweetAlert.swal('Success!',"Project [" + project.name + "] has been deleted successfully!", 'success'); }); } }); diff --git a/webapp/app/partials/cubeDesigner/dimensions.html b/webapp/app/partials/cubeDesigner/dimensions.html index c4a6d0b..be5518c 100644 --- a/webapp/app/partials/cubeDesigner/dimensions.html +++ b/webapp/app/partials/cubeDesigner/dimensions.html @@ -13,7 +13,7 @@ -