From 2c9fa6a01010e34e2b0e3c89b4e470ab4f2b87f6 Mon Sep 17 00:00:00 2001 From: eugenp Date: Sun, 9 Nov 2014 20:11:47 +0200 Subject: [PATCH] formatting cleanup --- ...SimpleUrlAuthenticationSuccessHandler.java | 8 +++--- .../java/org/baeldung/spring/MvcConfig.java | 28 ++++++++----------- .../baeldung/spring/SecSecurityConfig.java | 2 +- .../web/controller/HomeController.java | 13 ++++----- 4 files changed, 22 insertions(+), 29 deletions(-) diff --git a/handling-spring-static-resources/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java b/handling-spring-static-resources/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java index 45ce91adc8..730def5adf 100644 --- a/handling-spring-static-resources/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java +++ b/handling-spring-static-resources/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java @@ -18,7 +18,7 @@ public class MySimpleUrlAuthenticationSuccessHandler implements AuthenticationSu private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy(); @Override - public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException { + public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException { handle(request, response, authentication); HttpSession session = request.getSession(false); if (session != null) { @@ -39,9 +39,9 @@ public class MySimpleUrlAuthenticationSuccessHandler implements AuthenticationSu } protected String determineTargetUrl(Authentication authentication) { - - return "/home.html"; - + + return "/home.html"; + } protected void clearAuthenticationAttributes(HttpServletRequest request) { diff --git a/handling-spring-static-resources/src/main/java/org/baeldung/spring/MvcConfig.java b/handling-spring-static-resources/src/main/java/org/baeldung/spring/MvcConfig.java index bd874a6e67..4a198cf195 100644 --- a/handling-spring-static-resources/src/main/java/org/baeldung/spring/MvcConfig.java +++ b/handling-spring-static-resources/src/main/java/org/baeldung/spring/MvcConfig.java @@ -1,9 +1,7 @@ package org.baeldung.spring; - import java.util.Locale; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; @@ -42,9 +40,9 @@ public class MvcConfig extends WebMvcConfigurerAdapter { @Override public void addViewControllers(final ViewControllerRegistry registry) { super.addViewControllers(registry); - registry.addViewController("/login.html"); + registry.addViewController("/login.html"); registry.addViewController("/home.html"); - + } @Bean @@ -55,23 +53,21 @@ public class MvcConfig extends WebMvcConfigurerAdapter { bean.setSuffix(".jsp"); return bean; } - + @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - //For examples using Spring 4.1.0 - if((env.getProperty("resource.handler.conf")).equals("4.1.0")){ + public void addResourceHandlers(ResourceHandlerRegistry registry) { + // For examples using Spring 4.1.0 + if ((env.getProperty("resource.handler.conf")).equals("4.1.0")) { registry.addResourceHandler("/js/**").addResourceLocations("/js/").setCachePeriod(3600).resourceChain(true).addResolver(new GzipResourceResolver()).addResolver(new PathResourceResolver()); registry.addResourceHandler("/resources/**").addResourceLocations("/resources/", "classpath:/other-resources/").setCachePeriod(3600).resourceChain(true).addResolver(new PathResourceResolver()); registry.addResourceHandler("/files/**").addResourceLocations("file:/Users/Elena/").setCachePeriod(3600).resourceChain(true).addResolver(new PathResourceResolver()); - registry.addResourceHandler("/other-files/**").addResourceLocations("file:/Users/Elena/"). - setCachePeriod(3600).resourceChain(true).addResolver(new GzipResourceResolver()); - } - //For examples using Spring 4.0.7 - else if ((env.getProperty("resource.handler.conf")).equals("4.0.7")){ + registry.addResourceHandler("/other-files/**").addResourceLocations("file:/Users/Elena/").setCachePeriod(3600).resourceChain(true).addResolver(new GzipResourceResolver()); + } + // For examples using Spring 4.0.7 + else if ((env.getProperty("resource.handler.conf")).equals("4.0.7")) { registry.addResourceHandler("/resources/**").addResourceLocations("/", "/resources/", "classpath:/other-resources/"); - registry.addResourceHandler("/files/**") - .addResourceLocations("file:/Users/Elena/"); - + registry.addResourceHandler("/files/**").addResourceLocations("file:/Users/Elena/"); + } } diff --git a/handling-spring-static-resources/src/main/java/org/baeldung/spring/SecSecurityConfig.java b/handling-spring-static-resources/src/main/java/org/baeldung/spring/SecSecurityConfig.java index d51d0e9a50..4da114c78b 100644 --- a/handling-spring-static-resources/src/main/java/org/baeldung/spring/SecSecurityConfig.java +++ b/handling-spring-static-resources/src/main/java/org/baeldung/spring/SecSecurityConfig.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.ImportResource; @ImportResource({ "classpath:webSecurityConfig.xml" }) public class SecSecurityConfig { - public SecSecurityConfig() { + public SecSecurityConfig() { super(); } diff --git a/handling-spring-static-resources/src/main/java/org/baeldung/web/controller/HomeController.java b/handling-spring-static-resources/src/main/java/org/baeldung/web/controller/HomeController.java index aa2b9f63fc..44645a1471 100644 --- a/handling-spring-static-resources/src/main/java/org/baeldung/web/controller/HomeController.java +++ b/handling-spring-static-resources/src/main/java/org/baeldung/web/controller/HomeController.java @@ -14,22 +14,19 @@ import org.springframework.web.context.request.WebRequest; @Controller public class HomeController { - - - + @Autowired Environment env; - @RequestMapping(value = "/home", method = RequestMethod.GET) public String showHome(WebRequest request, Model model, Locale locale) throws IOException { - + Date date = new Date(); DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, locale); - + String formattedDate = dateFormat.format(date); - model.addAttribute("serverTime", formattedDate ); + model.addAttribute("serverTime", formattedDate); return "home"; } - + }