From 5067cceaf1250066ece486da5efc14b66af8de60 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 20 Jun 2016 13:18:24 +0200 Subject: [PATCH] WIP: Implemented CustomErrorHandler, that can resolve exceptions during rendering --- .../java/de/juplo/thymeproxy/Application.java | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/src/main/java/de/juplo/thymeproxy/Application.java b/src/main/java/de/juplo/thymeproxy/Application.java index 03b106f..4c1cd50 100644 --- a/src/main/java/de/juplo/thymeproxy/Application.java +++ b/src/main/java/de/juplo/thymeproxy/Application.java @@ -4,16 +4,28 @@ import de.juplo.thymeleaf.JuploDialect; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.http.HttpStatus; 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.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.web.servlet.View; 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.thymeleaf.exceptions.TemplateInputException; import org.thymeleaf.resourceresolver.IResourceResolver; import org.thymeleaf.resourceresolver.UrlResourceResolver; import org.thymeleaf.spring4.view.ThymeleafViewResolver; @@ -23,6 +35,10 @@ import org.thymeleaf.templateresolver.TemplateResolver; @SpringBootApplication public class Application extends WebMvcConfigurerAdapter { + @Autowired + private ServerProperties properties; + + @Bean public RegexUrlHandlerMapping proxiedHandlerMapping( ProxyHttpRequestHandler proxy, @@ -111,6 +127,12 @@ public class Application extends WebMvcConfigurerAdapter return resolver.resolveViewName("templates/500", Locale.getDefault()); } + @Bean + public ErrorController errorController(ErrorAttributes errorAttributes) + { + return new CustomErrorController(errorAttributes, properties.getError()); + } + @Override public void addViewControllers(ViewControllerRegistry registry) @@ -123,4 +145,51 @@ public class Application extends WebMvcConfigurerAdapter { SpringApplication.run(Application.class, args); } + + + static class CustomErrorController extends BasicErrorController + { + public final static String TEMPLATE_INPUT_EXCEPTION = + TemplateInputException.class.getCanonicalName(); + + + CustomErrorController( + ErrorAttributes errorAttributes, + ErrorProperties errorProperties + ) + { + super(errorAttributes, errorProperties); + } + + + @Override + public ModelAndView errorHtml( + HttpServletRequest request, + HttpServletResponse response + ) + { + Map model = + getErrorAttributes( + request, + isIncludeStackTrace(request, MediaType.TEXT_HTML) + ); + + String view; + + switch ((String)model.get("exception")) + { + case "org.thymeleaf.exceptions.TemplateInputException": + response.setStatus(HttpStatus.SC_NOT_FOUND); + view = "templates/404"; + break; + + default: + response.setStatus(getStatus(request).value()); + view = "templates/500"; + break; + } + + return new ModelAndView(view, model); + } + } } \ No newline at end of file -- 2.20.1