Resolving HTTP-status-codes explicitly to specialized error-pages

[maven-thymeleaf-skin] / src / main / java / de / juplo / thymeproxy / Application.java

diff --git a/src/main/java/de/juplo/thymeproxy/Application.java b/src/main/java/de/juplo/thymeproxy/Application.java
index 0840e95..6a3d7da 100644 (file)
--- a/src/main/java/de/juplo/thymeproxy/Application.java
+++ b/src/main/java/de/juplo/thymeproxy/Application.java
@@ -3,25 +3,23 @@ package de.juplo.thymeproxy;
 import de.juplo.thymeleaf.JuploDialect;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Properties;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.web.BasicErrorController;
 import org.springframework.boot.autoconfigure.web.ErrorAttributes;
 import org.springframework.boot.autoconfigure.web.ErrorController;
-import org.springframework.boot.autoconfigure.web.ErrorProperties;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
-import org.springframework.http.MediaType;
-import org.springframework.web.servlet.ModelAndView;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.servlet.mvc.UrlFilenameViewController;
+import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
+import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.resourceresolver.IResourceResolver;
 import org.thymeleaf.resourceresolver.UrlResourceResolver;
 import org.thymeleaf.templateresolver.TemplateResolver;
@@ -37,13 +35,12 @@ public class Application extends WebMvcConfigurerAdapter
   @Bean
   public RegexUrlHandlerMapping proxiedHandlerMapping(
       ProxyHttpRequestHandler proxy,
-      UrlFilenameViewController views
+      UrlThymeleafViewController views
       )
   {
     RegexUrlHandlerMapping mapping = new RegexUrlHandlerMapping();
     mapping.setOrder(Ordered.HIGHEST_PRECEDENCE);
     Map<String, Object> mappings = new HashMap<>();
-    mappings.put("/thymeleaf/.*\\.html", proxy);
     mappings.put("/img/.+", proxy);
     mappings.put("/css/.+", proxy);
     mappings.put("/js/.+", proxy);
@@ -67,9 +64,11 @@ public class Application extends WebMvcConfigurerAdapter
   }
 
   @Bean
-  public UrlFilenameViewController urlFilenameViewController()
+  public UrlThymeleafViewController urlThymeleafViewController(
+      TemplateEngine engine
+      )
   {
-    return new UrlFilenameViewController();
+    return new UrlThymeleafViewController(engine);
   }
 
   @Bean
@@ -117,9 +116,35 @@ public class Application extends WebMvcConfigurerAdapter
   }
 
   @Bean
-  public ErrorController errorController(ErrorAttributes errorAttributes)
+  public SimpleMappingExceptionResolver simpleMappingExceptionResolver()
   {
-    return new CustomErrorController(errorAttributes, properties.getError());
+    SimpleMappingExceptionResolver resolver =
+        new SimpleMappingExceptionResolver();
+
+    Properties mappings = new Properties();
+    mappings.setProperty("TemplateInputException", "templates/404");
+
+    resolver.setExceptionMappings(mappings);
+    resolver.setDefaultErrorView("templates/error");
+    resolver.setWarnLogCategory("exception");
+    return resolver;
+  }
+
+  @Bean
+  public ErrorController errorController(
+      ApplicationContext context,
+      ErrorAttributes errorAttributes
+      )
+  {
+    ExceptionResolverErrorController controller =
+        new ExceptionResolverErrorController(
+            context,
+            errorAttributes,
+            properties.getError()
+            );
+    controller.addErrorMapping(HttpStatus.NOT_FOUND, "templates/404");
+    controller.setDefaultErrorView("templates/error");
+    return controller;
   }
 
 
@@ -134,29 +159,4 @@ public class Application extends WebMvcConfigurerAdapter
   {
     SpringApplication.run(Application.class, args);
   }
-
-
-  static class CustomErrorController extends BasicErrorController
-  {
-    CustomErrorController(
-        ErrorAttributes errorAttributes,
-        ErrorProperties errorProperties
-        )
-    {
-      super(errorAttributes, errorProperties);
-    }
-
-
-    @Override
-    public ModelAndView errorHtml(HttpServletRequest request, HttpServletResponse response)
-    {
-      response.setStatus(getStatus(request).value());
-      Map<String, Object> model =
-          getErrorAttributes(
-              request,
-              isIncludeStackTrace(request, MediaType.TEXT_HTML)
-              );
-      return new ModelAndView("templates/error", model);
-    }
-  }
 }
\ No newline at end of file