Merge pull request #4991 from eclipse-ee4j/faces-api-issue-1570_add-support-for-SameSite

Faces 4.0: add support for custom attributes in ExternalContext#addResponseCookie()

Author: arjantijms

impl/src/main/java/com/sun/faces/context/ExternalContextImpl.java

@@ -102,7 +102,7 @@ public class ExternalContextImpl extends ExternalContext {
     private Flash flash;
     private boolean distributable;
 
-    private enum ALLOWABLE_COOKIE_PROPERTIES {
+    private enum PREDEFINED_COOKIE_PROPERTIES {
         domain, maxAge, path, secure, httpOnly
     }
 
@@ -776,7 +776,7 @@ public void addResponseCookie(String name, String value, Map<String, Object> pro
         if (properties != null && properties.size() != 0) {
             for (Map.Entry<String, Object> entry : properties.entrySet()) {
                 String key = entry.getKey();
-                ALLOWABLE_COOKIE_PROPERTIES p = ALLOWABLE_COOKIE_PROPERTIES.valueOf(key);
+                PREDEFINED_COOKIE_PROPERTIES p = PREDEFINED_COOKIE_PROPERTIES.valueOf(key);
                 Object v = entry.getValue();
                 switch (p) {
                 case domain:
@@ -795,7 +795,8 @@ public void addResponseCookie(String name, String value, Map<String, Object> pro
                     cookie.setHttpOnly((Boolean) v);
                     break;
                 default:
-                    throw new IllegalStateException(); // shouldn't happen
+                    cookie.setAttribute(key, (String) v);
+                    break;
                 }
             }
         }

impl/src/main/java/jakarta/faces/context/ExternalContext.java

@@ -118,7 +118,7 @@ public abstract class ExternalContext {
      *
      * <tr>
      *
-     * <th>Key in "values" <code>Map</code></th>
+     * <th>Key in "values" <code>Map</code> <span class="changed_added_4_0">(case sensitive)</span></th>
      *
      * <th>Expected type of value.</th>
      *
@@ -186,6 +186,16 @@ public abstract class ExternalContext {
      *
      * </tr>
      *
+     * <tr class="changed_added_4_0">
+     *
+     * <td><i>any other attribute</i> (e.g. SameSite)</td>
+     *
+     * <td>String</td>
+     *
+     * <td>setAttribute</td>
+     *
+     * </tr>
+     *
      * </table>
      *
      * <p>
@@ -202,9 +212,6 @@ public abstract class ExternalContext {
      * @param properties A <code>Map</code> containg key/value pairs to be passed as arguments to the setter methods as
      * described above.
      *
-     * @throws IllegalArgumentException if the <code>properties
-     * Map</code> is not-<code>null</code> and not empty and contains any keys that are not one of the keys listed above.
-     *
      * @since 2.0
      */