Add caching, improve model params.

Author: Victor Santiago Martinez Picardo

.gitignore

@@ -3,6 +3,7 @@ target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/
+src/main/resources/devices.json
 
 ### STS ###
 .apt_generated

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.em7</groupId>
 	<artifactId>wol</artifactId>
-	<version>0.1.0</version>
+	<version>0.1.1</version>
 	<packaging>jar</packaging>
 	<name>wol</name>
 	<description>Wake on Lan</description>

src/main/java/com/em7/wol/config/WebConfig.java

@@ -62,21 +62,21 @@ public ThymeleafViewResolver thymeleafViewResolver() {
     }
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/js/**").addResourceLocations("classpath:/static/js/").resourceChain(false)
+        registry.addResourceHandler("/js/**").addResourceLocations("classpath:/static/js/").resourceChain(true)
                 .addResolver(new VersionResourceResolver().addContentVersionStrategy("/**"));
-        registry.addResourceHandler("/css/**").addResourceLocations("classpath:/static/css/").resourceChain(false)
+        registry.addResourceHandler("/css/**").addResourceLocations("classpath:/static/css/").resourceChain(true)
                 .addResolver(new VersionResourceResolver().addContentVersionStrategy("/**"));
-        registry.addResourceHandler("/images/**").addResourceLocations("classpath:/static/images/").resourceChain(false)
+        registry.addResourceHandler("/images/**").addResourceLocations("classpath:/static/images/").resourceChain(true)
                 .addResolver(new VersionResourceResolver().addContentVersionStrategy("/**"));
-        registry.addResourceHandler("/fonts/**").addResourceLocations("classpath:/static/fonts/").resourceChain(false)
+        registry.addResourceHandler("/fonts/**").addResourceLocations("classpath:/static/fonts/").resourceChain(true)
                 .addResolver(new VersionResourceResolver().addContentVersionStrategy("/**"));
-        registry.addResourceHandler("/webfonts/**").addResourceLocations("classpath:/static/webfonts/").resourceChain(false)
+        registry.addResourceHandler("/webfonts/**").addResourceLocations("classpath:/static/webfonts/").resourceChain(true)
                 .addResolver(new VersionResourceResolver().addContentVersionStrategy("/**"));
-        registry.addResourceHandler("css/fonts/material-icons/**").addResourceLocations("classpath:/static/css/fonts/material-icons/").resourceChain(false)
+        registry.addResourceHandler("css/fonts/material-icons/**").addResourceLocations("classpath:/static/css/fonts/material-icons/").resourceChain(true)
                 .addResolver(new VersionResourceResolver().addContentVersionStrategy("/**"));
-        registry.addResourceHandler("/**").addResourceLocations("classpath:/static/").resourceChain(false)
+        registry.addResourceHandler("/**").addResourceLocations("classpath:/static/").resourceChain(true)
                 .addResolver(new VersionResourceResolver().addContentVersionStrategy("/**"));
-        registry.addResourceHandler("/json/**").addResourceLocations("classpath:/static/json/").resourceChain(false)
+        registry.addResourceHandler("/json/**").addResourceLocations("classpath:/static/json/").resourceChain(true)
                 .addResolver(new VersionResourceResolver().addContentVersionStrategy("/**"));
     }
 

src/main/java/com/em7/wol/controller/HomeController.java

@@ -22,9 +22,10 @@ public String showHome(Model model, HttpServletRequest request) {
         if(username != null && !username.isEmpty()) {
             model.addAttribute("username", username);
 			model.addAttribute("WoLVersion", version);
+            model.asMap().clear(); // Remove model parameters from URL
             return "redirect:/devices/list";
         }else{
-            return "redirect:/"; // Para que deje la URL bien
+            return "redirect:/";
         }
     }
 }

src/main/java/com/em7/wol/controller/LoginController.java

@@ -31,7 +31,6 @@ public class LoginController {
             , consumes = "application/json")
     @ResponseBody
     public SalidaLoginDTO login(@RequestBody EntradaLoginDTO loginDTO, HttpServletRequest request) {
-        String nombreMetodo = new Object() {}.getClass().getEnclosingMethod().getName();
         try {
             SalidaLoginDTO respuestaDTO = new SalidaLoginDTO();
             respuestaDTO.setResult("OK");
@@ -46,6 +45,7 @@ public SalidaLoginDTO login(@RequestBody EntradaLoginDTO loginDTO, HttpServletRe
             }
             return respuestaDTO;
         } catch (Exception e) {
+            String nombreMetodo = new Object() {}.getClass().getEnclosingMethod().getName();
             String mensajeError = "Error en " + nombreMetodo + " - " + e.toString();
             log.error(mensajeError);
             SalidaLoginDTO respuestaDTO = new SalidaLoginDTO();

src/main/resources/application.properties

@@ -1,4 +1,4 @@
-version=0.1.0
+version=0.1.1
 spring.profiles.active=default
 
 wol.user=admin
@@ -7,7 +7,7 @@ server.port=7800
 shutdown.port=7801
 security.require-ssl=false
 server.ssl.enabled=false
-spring.thymeleaf.cache=false
+spring.thymeleaf.cache=true
 server.http.interface=0.0.0.0
 
 #server.ssl.key-store-type=PKCS12