Use persistent servlet session with DevTools

philwebb · philwebb · commit d2133687b044 · 2015-07-16T17:29:20.000-07:00
Set `server.session.persistent=true` when running DevTools to ensure persistent sessions are used. Fixes gh-3530
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsPropertyDefaultsPostProcessor.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsPropertyDefaultsPostProcessor.java
@@ -46,6 +46,7 @@ class DevToolsPropertyDefaultsPostProcessor implements BeanFactoryPostProcessor,
 		properties.put("spring.groovy.template.cache", "false");
 		properties.put("spring.velocity.cache", "false");
 		properties.put("spring.mustache.cache", "false");
+		properties.put("server.session.persistent", "true");
 		PROPERTIES = Collections.unmodifiableMap(properties);
 	}
 
diff --git a/spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/MyController.java b/spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/MyController.java
@@ -16,6 +16,10 @@
 
 package sample.devtools;
 
+import java.util.Date;
+
+import javax.servlet.http.HttpSession;
+
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,10 +29,15 @@
 public class MyController {
 
 	@RequestMapping("/")
-	public ModelAndView get() {
-		ModelMap model = new ModelMap("message", Message.MESSAGE);
+	public ModelAndView get(HttpSession session) {
+		Object sessionVar = session.getAttribute("var");
+		if (sessionVar == null) {
+			sessionVar = new Date();
+			session.setAttribute("var", sessionVar);
+		}
+		ModelMap model = new ModelMap("message", Message.MESSAGE).addAttribute(
+				"sessionVar", sessionVar);
 		return new ModelAndView("hello", model);
-
 	}
 
 }
diff --git a/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/hello.html b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/hello.html
@@ -7,7 +7,9 @@
 </head>
 <body>
 	<h1 layout:fragment="header" th:text="${message}">Header</h1>
-	<div layout:fragment="content">Lorem ipsum dolor sit amet,
+	<div layout:fragment="content">
+		<h2 th:text="${sessionVar}">Session Var</h2>
+		Lorem ipsum dolor sit amet,
 		consectetur adipiscing elit. Cras ut fringilla augue, quis dictum
 		turpis. Sed tincidunt mi vel euismod viverra. Nulla facilisi.
 		Suspendisse mauris dolor, egestas ac leo at, porttitor ullamcorper

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ class DevToolsPropertyDefaultsPostProcessor implements BeanFactoryPostProcessor,`
`46`	`46`	`properties.put("spring.groovy.template.cache", "false");`
`47`	`47`	`properties.put("spring.velocity.cache", "false");`
`48`	`48`	`properties.put("spring.mustache.cache", "false");`
	`49`	`+ properties.put("server.session.persistent", "true");`
`49`	`50`	`PROPERTIES = Collections.unmodifiableMap(properties);`
`50`	`51`	`}`
`51`	`52`