X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fthymeproxy%2FApplication.java;h=03b106f600e695f69975d4f1a90c767a8cf516c5;hb=91aa988e329618f6233b2b2f6394d4948622f4cc;hp=2adafb2ab14ce5f459ad5cbfeeaca6fcc2b949c3;hpb=2e1827336be89956cf176b047ebbfa4f30c51b32;p=maven-thymeleaf-skin diff --git a/src/main/java/de/juplo/thymeproxy/Application.java b/src/main/java/de/juplo/thymeproxy/Application.java index 2adafb2..03b106f 100644 --- a/src/main/java/de/juplo/thymeproxy/Application.java +++ b/src/main/java/de/juplo/thymeproxy/Application.java @@ -2,20 +2,20 @@ package de.juplo.thymeproxy; import de.juplo.thymeleaf.JuploDialect; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import org.apache.http.impl.client.CloseableHttpClient; -import org.springframework.beans.BeanUtils; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.core.Ordered; import org.springframework.core.env.Environment; +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.resourceresolver.IResourceResolver; import org.thymeleaf.resourceresolver.UrlResourceResolver; -import org.thymeleaf.spring4.view.ThymeleafView; import org.thymeleaf.spring4.view.ThymeleafViewResolver; import org.thymeleaf.templateresolver.TemplateResolver; @@ -106,13 +106,12 @@ public class Application extends WebMvcConfigurerAdapter } @Bean - public ThymeleafView error() + public View error(ThymeleafViewResolver resolver) throws Exception { - ThymeleafView view = BeanUtils.instantiateClass(ThymeleafView.class); - view.setTemplateName("/thymeleaf/error.html"); - return view; + return resolver.resolveViewName("templates/500", Locale.getDefault()); } + @Override public void addViewControllers(ViewControllerRegistry registry) {