Spring boot run in Heroku

syedabdullahrahman · syedabdullahrahman · commit 4a60bbdabd08 · 2022-02-12T03:29:22.000+06:00
diff --git a/pom.xml b/pom.xml
@@ -141,17 +141,6 @@
 			<artifactId>spring-boot-starter-log4j2</artifactId>
 		</dependency>
 
-		<!-- asynchronous loggers -->
-		<dependency>
-			<groupId>com.lmax</groupId>
-			<artifactId>disruptor</artifactId>
-			<version>3.4.2</version>
-		</dependency>
-<!--		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-commons</artifactId>
-		</dependency>-->
-
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/abdullah/todomanagement/controller/TodoController.java b/src/main/java/abdullah/todomanagement/controller/TodoController.java
@@ -7,6 +7,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import abdullah.todomanagement.config.TokenException;
 import abdullah.todomanagement.config.TokenManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
@@ -96,7 +97,7 @@ public String addTodo(ModelMap model,HttpServletRequest request
 		}
 
 		if (!TokenManager.isTokenValid(request)) {
-			return "redirect:/list-todos";
+            throw new TokenException("Wrong synchronizer token passed. Please refresh page before operation");
 		}
 
 		todo.setUserName(getLoggedInUserName(model));
diff --git a/src/main/java/abdullah/todomanagement/exception/GlobalExceptionHandler.java b/src/main/java/abdullah/todomanagement/exception/GlobalExceptionHandler.java
@@ -3,13 +3,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 @ControllerAdvice
 public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
@@ -18,7 +20,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
 	private final Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
 	
 	@ExceptionHandler(value = Exception.class)
-	public ModelAndView defaultErrorHandler(HttpServletRequest req, Exception e) throws Exception {
+	public ModelAndView defaultErrorHandler(HttpServletRequest req, HttpServletResponse res, Exception e) throws Exception {
 		
 		logger.error("[URL] : {}", req.getRequestURL(), e);
 		
@@ -34,6 +36,7 @@ public ModelAndView defaultErrorHandler(HttpServletRequest req, Exception e) thr
 		mav.addObject("exception", e);
 		mav.addObject("url", req.getRequestURL());
 		mav.setViewName(DEFAULT_ERROR_VIEW);
+		res.sendError(HttpStatus.NOT_ACCEPTABLE.value(), e.getLocalizedMessage());
 		return mav;
 	}
 	
diff --git a/src/main/webapp/WEB-INF/jsp/error.jsp b/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -1,6 +1,29 @@
+<%@ page session="false"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+
+<!DOCTYPE html>
+<html lang="en">
+
 <%@ include file="common/header.jspf"%>
 <%@ include file="common/navigation.jspf"%>
-<div class="container">
-An exception occurred! Please contact Support!
-</div>
-<%@ include file="common/footer.jspf"%>
+
+<body>
+
+	<div class="container">
+
+		<h1>Error Page</h1>
+
+		<p>${exception.message}</p>
+		<!-- Exception: ${exception.message}.
+		  	<c:forEach items="${exception.stackTrace}" var="stackTrace"> 
+				${stackTrace} 
+			</c:forEach>
+	  	-->
+
+	</div>
+
+	<%@ include file="common/footer.jspf"%>
+
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import javax.servlet.http.HttpServletResponse;`
`8`	`8`	`import javax.validation.Valid;`
`9`	`9`
	`10`	`+import abdullah.todomanagement.config.TokenException;`
`10`	`11`	`import abdullah.todomanagement.config.TokenManager;`
`11`	`12`	`import org.springframework.beans.factory.annotation.Autowired;`
`12`	`13`	`import org.springframework.beans.propertyeditors.CustomDateEditor;`
`@@ -96,7 +97,7 @@ public String addTodo(ModelMap model,HttpServletRequest request`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`if (!TokenManager.isTokenValid(request)) {`
`99`		`- return "redirect:/list-todos";`
	`100`	`+ throw new TokenException("Wrong synchronizer token passed. Please refresh page before operation");`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`todo.setUserName(getLoggedInUserName(model));`