You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2025/03/12 12:32:19 UTC

(myfaces) branch main updated: Faces Spec #2028 - StateHelper: make methods generics aware

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/main by this push:
     new a58cb8c3a Faces Spec #2028 - StateHelper: make methods generics aware
a58cb8c3a is described below

commit a58cb8c3a731ff5efe9a5e7f8523aacd02eeb41b
Author: tandraschko <ta...@apache.org>
AuthorDate: Wed Mar 12 13:32:05 2025 +0100

    Faces Spec #2028 - StateHelper: make methods generics aware
---
 .../java/jakarta/faces/component/StateHelper.java  | 16 ++++-----
 .../jakarta/faces/component/_DeltaStateHelper.java | 42 +++++++++++-----------
 .../behavior/_AjaxBehaviorDeltaStateHelper.java    | 26 +++++++-------
 .../component/behavior/_DeltaStateHelper.java      | 34 +++++++++---------
 4 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/api/src/main/java/jakarta/faces/component/StateHelper.java b/api/src/main/java/jakarta/faces/component/StateHelper.java
index fbaf7d451..c9bef82ba 100644
--- a/api/src/main/java/jakarta/faces/component/StateHelper.java
+++ b/api/src/main/java/jakarta/faces/component/StateHelper.java
@@ -28,9 +28,9 @@ public interface StateHelper extends StateHolder
 {
     public void add(Serializable key, Object value);
 
-    public Object eval(Serializable key);
+    public <T> T eval(Serializable key);
 
-    public Object eval(Serializable key, Object defaultValue);
+    public <T> T eval(Serializable key, T defaultValue);
 
     /**
      * 
@@ -40,15 +40,15 @@ public interface StateHelper extends StateHolder
      * 
      * @since 4.0
      */
-    public Object eval(Serializable key, Supplier<Object> defaultValueSupplier);
+    public <T> T eval(Serializable key, Supplier<T> defaultValueSupplier);
 
-    public Object get(Serializable key);
+    public <T> T get(Serializable key);
 
-    public Object put(Serializable key, Object value);
+    public <T> T put(Serializable key, T value);
 
-    public Object put(Serializable key, String mapKey, Object value);
+    public <T> T put(Serializable key, String mapKey, T value);
 
-    public Object remove(Serializable key);
+    public <T> T remove(Serializable key);
 
-    public Object remove(Serializable key, Object valueOrKey);
+    public <T> T remove(Serializable key, T valueOrKey);
 }
diff --git a/api/src/main/java/jakarta/faces/component/_DeltaStateHelper.java b/api/src/main/java/jakarta/faces/component/_DeltaStateHelper.java
index 531700605..3d24132fc 100644
--- a/api/src/main/java/jakarta/faces/component/_DeltaStateHelper.java
+++ b/api/src/main/java/jakarta/faces/component/_DeltaStateHelper.java
@@ -180,7 +180,7 @@ public _DeltaStateHelper(UIComponent component)
     {
         super();
         this._component = component;
-        _fullState = new HashMap<Serializable, Object>();
+        _fullState = new HashMap<>();
         _deltas = null;
         _transientState = null;
         _initialFullState = null;
@@ -201,7 +201,7 @@ private boolean _createDeltas(Serializable key)
                 if (_initialState == null)
                 {
                     // Copy it directly
-                    _initialFullState = new HashMap<Serializable, Object>();
+                    _initialFullState = new HashMap<>();
                     copyMap(_component.getFacesContext(), _fullState, _initialFullState);
                 }
                 else
@@ -223,7 +223,7 @@ private boolean _createDeltas(Serializable key)
                         // contains some key already defined in initialState, this key must be
                         // overriden. It is better to do in that way, because it is possible
                         // to skip resetState() if the view cannot be recycled.
-                        _initialFullState = new HashMap<Serializable, Object>();
+                        _initialFullState = new HashMap<>();
                         copyMap(_component.getFacesContext(), _fullState, _initialFullState);
                     }
                 }
@@ -326,9 +326,9 @@ public void add(Serializable key, Object value)
     }
 
     @Override
-    public Object eval(Serializable key)
+    public <T> T eval(Serializable key)
     {
-        Object returnValue = _fullState.get(key);
+        T returnValue = (T) _fullState.get(key);
         if (returnValue != null)
         {
             return returnValue;
@@ -342,9 +342,9 @@ public Object eval(Serializable key)
     }
 
     @Override
-    public Object eval(Serializable key, Object defaultValue)
+    public <T> T eval(Serializable key, T defaultValue)
     {
-        Object returnValue = _fullState.get(key);
+        T returnValue = (T) _fullState.get(key);
 
         if (returnValue == null)
         {
@@ -373,9 +373,9 @@ public Object eval(Serializable key, Object defaultValue)
      * @since 4.0
      */
     @Override
-    public Object eval(Serializable key, Supplier<Object> defaultValueSupplier)
+    public <T> T eval(Serializable key, Supplier<T> defaultValueSupplier)
     {
-        Object returnValue = _fullState.get(key);
+        T returnValue = (T) _fullState.get(key);
         
         if (returnValue == null) {
             ValueExpression expression = _component.getValueExpression(key.toString());
@@ -394,20 +394,20 @@ public Object eval(Serializable key, Supplier<Object> defaultValueSupplier)
     }
 
     @Override
-    public Object get(Serializable key)
+    public <T> T get(Serializable key)
     {
-        return _fullState.get(key);
+        return (T) _fullState.get(key);
     }
 
     @Override
-    public Object put(Serializable key, Object value)
+    public <T> T put(Serializable key, T value)
     {
-        Object returnValue = null;
+        T returnValue = null;
         if (_createDeltas(key))
         {
             if (_deltas.containsKey(key))
             {
-                returnValue = _deltas.put(key, value);
+                returnValue = (T) _deltas.put(key, value);
                 _fullState.put(key, value);
             }
             else if (value == null && !_fullState.containsKey(key))
@@ -417,21 +417,21 @@ else if (value == null && !_fullState.containsKey(key))
             else
             {
                 _deltas.put(key, value);
-                returnValue = _fullState.put(key, value);
+                returnValue = (T) _fullState.put(key, value);
             }
         }
         else
         {
-            returnValue = _fullState.put(key, value);
+            returnValue = (T) _fullState.put(key, value);
         }
         return returnValue;
     }
 
     @Override
-    public Object put(Serializable key, String mapKey, Object value)
+    public <T> T put(Serializable key, String mapKey, T value)
     {
         boolean returnSet = false;
-        Object returnValue = null;
+        T returnValue = null;
         if (_createDeltas(key))
         {
             //Track delta case
@@ -444,7 +444,7 @@ public Object put(Serializable key, String mapKey, Object value)
 
             if (mapValues.containsKey(mapKey))
             {
-                returnValue = mapValues.put(mapKey, value);
+                returnValue = (T) mapValues.put(mapKey, value);
                 returnSet = true;
             }
             else
@@ -467,7 +467,7 @@ public Object put(Serializable key, String mapKey, Object value)
         }
         else
         {
-            returnValue = mapValues.put(mapKey, value);
+            returnValue = (T) mapValues.put(mapKey, value);
         }
         return returnValue;
     }
@@ -1012,7 +1012,7 @@ public Object putTransient(Object key, Object value)
     {
         if (_transientState == null)
         {
-            _transientState = new HashMap<Object, Object>();
+            _transientState = new HashMap<>();
         }
         return _transientState.put(key, value);
     }
diff --git a/api/src/main/java/jakarta/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java b/api/src/main/java/jakarta/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
index 8fc179fb1..913be3af6 100644
--- a/api/src/main/java/jakarta/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
+++ b/api/src/main/java/jakarta/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
@@ -123,9 +123,9 @@ public void add(Serializable key, Object value)
     }
 
     @Override
-    public Object eval(Serializable key)
+    public <T> T eval(Serializable key)
     {
-        Object returnValue = _fullState.get(key);
+        T returnValue = (T) _fullState.get(key);
         if (returnValue != null)
         {
             return returnValue;
@@ -139,9 +139,9 @@ public Object eval(Serializable key)
     }
 
     @Override
-    public Object eval(Serializable key, Object defaultValue)
+    public <T> T eval(Serializable key, T defaultValue)
     {
-        Object returnValue = _fullState.get(key);
+        T returnValue = (T) _fullState.get(key);
 
         if (returnValue == null)
         {
@@ -161,9 +161,9 @@ public Object eval(Serializable key, Object defaultValue)
     }
 
     @Override
-    public Object eval(Serializable key, Supplier<Object> defaultValueSupplier)
+    public <T> T eval(Serializable key, Supplier<T> defaultValueSupplier)
     {
-        Object returnValue = _fullState.get(key);
+        T returnValue = (T) _fullState.get(key);
         
         if (returnValue == null)
         {
@@ -183,31 +183,31 @@ public Object eval(Serializable key, Supplier<Object> defaultValueSupplier)
     }
 
     @Override
-    public Object get(Serializable key)
+    public <T> T get(Serializable key)
     {
-        return _fullState.get(key);
+        return (T) _fullState.get(key);
     }
 
     @Override
-    public Object put(Serializable key, Object value)
+    public <T> T put(Serializable key, T value)
     {
-        Object returnValue = null;
+        T returnValue = null;
         if (_createDeltas())
         {
             if (_deltas.containsKey(key))
             {
-                returnValue = _deltas.put(key, value);
+                returnValue = (T) _deltas.put(key, value);
                 _fullState.put(key, value);
             }
             else
             {
                 _deltas.put(key, value);
-                returnValue = _fullState.put(key, value);
+                returnValue = (T) _fullState.put(key, value);
             }
         }
         else
         {
-            returnValue = _fullState.put(key, value);
+            returnValue = (T) _fullState.put(key, value);
         }
         return returnValue;
     }
diff --git a/api/src/main/java/jakarta/faces/component/behavior/_DeltaStateHelper.java b/api/src/main/java/jakarta/faces/component/behavior/_DeltaStateHelper.java
index b326cfbb6..2e356612e 100644
--- a/api/src/main/java/jakarta/faces/component/behavior/_DeltaStateHelper.java
+++ b/api/src/main/java/jakarta/faces/component/behavior/_DeltaStateHelper.java
@@ -219,9 +219,9 @@ public void add(Serializable key, Object value)
     }
 
     @Override
-    public Object eval(Serializable key)
+    public <T> T eval(Serializable key)
     {
-        Object returnValue = _fullState.get(key);
+        T returnValue = (T) _fullState.get(key);
         if (returnValue != null)
         {
             return returnValue;
@@ -235,9 +235,9 @@ public Object eval(Serializable key)
     }
 
     @Override
-    public Object eval(Serializable key, Object defaultValue)
+    public <T> T eval(Serializable key, T defaultValue)
     {
-        Object returnValue = _fullState.get(key);
+        T returnValue = (T) _fullState.get(key);
 
         if (returnValue == null)
         {
@@ -265,9 +265,9 @@ public Object eval(Serializable key, Object defaultValue)
      * @since 4.0
      */
     @Override
-    public Object eval(Serializable key, Supplier<Object> defaultValueSupplier)
+    public <T> T eval(Serializable key, Supplier<T> defaultValueSupplier)
     {
-        Object returnValue = _fullState.get(key);
+        T returnValue = (T) _fullState.get(key);
         
         if (returnValue == null)
         {
@@ -287,20 +287,20 @@ public Object eval(Serializable key, Supplier<Object> defaultValueSupplier)
     }
 
     @Override
-    public Object get(Serializable key)
+    public <T> T get(Serializable key)
     {
-        return _fullState.get(key);
+        return (T) _fullState.get(key);
     }
 
     @Override
-    public Object put(Serializable key, Object value)
+    public <T> T put(Serializable key, T value)
     {
-        Object returnValue = null;
+        T returnValue = null;
         if (_createDeltas())
         {
             if (_deltas.containsKey(key))
             {
-                returnValue = _deltas.put(key, value);
+                returnValue = (T) _deltas.put(key, value);
                 _fullState.put(key, value);
             }
             else if (value == null && !_fullState.containsKey(key))
@@ -310,20 +310,20 @@ else if (value == null && !_fullState.containsKey(key))
             else
             {
                 _deltas.put(key, value);
-                returnValue = _fullState.put(key, value);
+                returnValue = (T) _fullState.put(key, value);
             }
         }
         else
         {
-            returnValue = _fullState.put(key, value);
+            returnValue = (T) _fullState.put(key, value);
         }
         return returnValue;
     }
 
-    public Object put(Serializable key, String mapKey, Object value)
+    public <T> T put(Serializable key, String mapKey, T value)
     {
         boolean returnSet = false;
-        Object returnValue = null;
+        T returnValue = null;
         if (_createDeltas())
         {
             //Track delta case
@@ -336,7 +336,7 @@ public Object put(Serializable key, String mapKey, Object value)
 
             if (mapValues.containsKey(mapKey))
             {
-                returnValue = mapValues.put(mapKey, value);
+                returnValue = (T) mapValues.put(mapKey, value);
                 returnSet = true;
             }
             else
@@ -359,7 +359,7 @@ public Object put(Serializable key, String mapKey, Object value)
         }
         else
         {
-            returnValue = mapValues.put(mapKey, value);
+            returnValue = (T) mapValues.put(mapKey, value);
         }
         return returnValue;
     }