Fixes #3635 - Consolidate tests for HttpSession and related APIs (#3636)

piranhacloud · Jan 21, 2024 · 10319d2 · 10319d2
1 parent baae8e0
commit 10319d2
Show file tree

Hide file tree

Showing 10 changed files with 1,376 additions and 1,510 deletions.
diff --git a/core/impl/src/main/java/cloud/piranha/core/impl/DefaultWebApplicationBuilder.java b/core/impl/src/main/java/cloud/piranha/core/impl/DefaultWebApplicationBuilder.java
@@ -33,10 +33,12 @@
 import jakarta.servlet.FilterRegistration;
 import jakarta.servlet.Servlet;
 import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.SessionTrackingMode;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * The DefaultWebApplication builder.
@@ -79,6 +81,11 @@ public class DefaultWebApplicationBuilder {
      * Stores the servlets.
      */
     private final Map<String, Object> servlets = new HashMap<>();
+
+    /**
+     * Stores the session tracking modes.
+     */
+    private Set<SessionTrackingMode> sessionTrackingModes = null;
 
     /**
      * Constructor.
@@ -150,6 +157,9 @@ public DefaultWebApplication build() {
             String mapping = mappingEntry.getValue();
             webApplication.addServletMapping(servletName, mapping);
         }
+        if (sessionTrackingModes != null) {
+            webApplication.setSessionTrackingModes(sessionTrackingModes);
+        }
         return webApplication;
     }
 
@@ -295,4 +305,15 @@ public DefaultWebApplicationBuilder servletMapping(String servletName, String ma
         servletMappings.put(servletName, mapping);
         return this;
     }
+
+    /**
+     * Set the session tracking modes.
+     * 
+     * @param sessionTrackingModes the session tracking modes.
+     * @return the web application builder.
+     */
+    public DefaultWebApplicationBuilder sessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) {
+        this.sessionTrackingModes = sessionTrackingModes;
+        return this;
+    }
 }