Error handling added

olegshan · olegshan · commit e6196277cb60 · 2016-10-22T01:33:57.000+03:00
diff --git a/src/main/java/com/olegshan/controllers/ErrorHandler.java b/src/main/java/com/olegshan/controllers/ErrorHandler.java
@@ -0,0 +1,18 @@
+package com.olegshan.controllers;
+
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+/**
+ * Created by olegshan on 20.10.2016.
+ */
+@ControllerAdvice
+public class ErrorHandler {
+
+    @ExceptionHandler(Exception.class)
+    public String exception(Exception e, Model model) {
+        model.addAttribute("errorMessage", e.getMessage());
+        return "exception";
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -2,13 +2,14 @@ spring.datasource.url = jdbc:postgresql://localhost:5432/jparser
 spring.datasource.username = postgres
 spring.datasource.password = root
 spring.jpa.show-sql = true
-spring.jpa.hibernate.ddl-auto = update
 
+spring.jpa.hibernate.ddl-auto = update
+spring.mvc.throw-exception-if-no-handler-found=true
+#spring.resources.add-mappings=false
 
 #Amazon Elastic Beanstalk database settings, used in production mode:
 
 #spring.datasource.url = jdbc:postgresql://${RDS_HOSTNAME}:${RDS_PORT}/${RDS_DB_NAME}
 #spring.datasource.username = ${RDS_USERNAME}
 #spring.datasource.password = ${RDS_PASSWORD}
-#spring.thymeleaf.encoding=UTF-8
-#spring.jpa.hibernate.ddl-auto = update
+#spring.thymeleaf.encoding=UTF-8
diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css
@@ -1,17 +1,17 @@
 .logo {
-    margin: 20px 0px 40px 10px;
+    margin: 20px 0 40px 10px;
 }
 
 .logo h1, .logo span {
     display: inline-block;
 }
 
 .logo h1 {
-    margin-bottom: 0px;
+    margin-bottom: 0;
 }
 
 .logo p {
-    margin-top: 0px;
+    margin-top: 0;
 }
 
 .logo small, .logo span, .logo p {
@@ -31,9 +31,13 @@
 }
 
 .footer {
-    margin: 40px 0px 40px 10px;
+    margin: 40px 0 40px 10px;
 }
 
 .table, .table td {
     border: hidden;
+}
+
+.error {
+    margin: 80px 0 80px 10px;
 }
diff --git a/src/main/resources/templates/Error.html b/src/main/resources/templates/Error.html
@@ -0,0 +1,12 @@
+<html layout:decorator="layout" xmlns:layout="http://www.w3.org/1999/xhtml">
+
+<div layout:fragment="content">
+    <div class="error">
+        <h1>
+            <small>Sorry, an error occured</small>
+        </h1>
+        <p data-th-text="${errorMessage}"></p>
+        <a href="/">Return to homepage</a>
+    </div>
+</div>
+</html>
diff --git a/src/main/resources/templates/exception.html b/src/main/resources/templates/exception.html
@@ -0,0 +1,12 @@
+<html layout:decorator="layout" xmlns:layout="http://www.w3.org/1999/xhtml">
+
+<div layout:fragment="content">
+    <div class="error">
+        <h1>
+            <small>Sorry, an error occured</small>
+        </h1>
+        <p data-th-text="${errorMessage}"></p>
+        <a href="/">Return to homepage</a>
+    </div>
+</div>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,17 @@`
`1`	`1`	`.logo {`
`2`		`- margin: 20px 0px 40px 10px;`
	`2`	`+ margin: 20px 0 40px 10px;`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`.logo h1, .logo span {`
`6`	`6`	`display: inline-block;`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`.logo h1 {`
`10`		`- margin-bottom: 0px;`
	`10`	`+ margin-bottom: 0;`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`.logo p {`
`14`		`- margin-top: 0px;`
	`14`	`+ margin-top: 0;`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`.logo small, .logo span, .logo p {`
`@@ -31,9 +31,13 @@`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`.footer {`
`34`		`- margin: 40px 0px 40px 10px;`
	`34`	`+ margin: 40px 0 40px 10px;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`.table, .table td {`
`38`	`38`	`border: hidden;`
	`39`	`+}`
	`40`	`+`
	`41`	`+.error {`
	`42`	`+ margin: 80px 0 80px 10px;`
`39`	`43`	`}`