Merge branch 'JAVA-1164' into JAVA-1192

spring-security-modules/spring-security-mvc/src/main/java/com/baeldung/session/web/config/MainWebAppInitializer.java

@@ -0,0 +1,16 @@
+package com.baeldung.session.web.config;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+import org.springframework.web.WebApplicationInitializer;
+
+public class MainWebAppInitializer implements WebApplicationInitializer {
+
+    @Override
+    public void onStartup(ServletContext sc) throws ServletException {
+        sc.getSessionCookieConfig().setHttpOnly(true);        
+        sc.getSessionCookieConfig().setSecure(true);
+    }
+
+}

spring-security-modules/spring-security-rest-custom/src/main/java/com/baeldung/web/controller/SecurityController.java

@@ -18,7 +18,7 @@ public class SecurityController {
 
     @RequestMapping(value = "/username2", method = RequestMethod.GET)
     @ResponseBody
-    public String currentUserNameSimple(final Principal principal) {
+    public String currentUserName(final Principal principal) {
         return principal.getName();
     }