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 2026/07/02 15:47:46 UTC
(myfaces) branch main updated: [perf] set collection size for StateHelper
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 541dd0212 [perf] set collection size for StateHelper
541dd0212 is described below
commit 541dd02120e50e8cdcb87ab626a1944e3b64fffb
Author: tandraschko <ta...@apache.org>
AuthorDate: Thu Jul 2 17:47:36 2026 +0200
[perf] set collection size for StateHelper
---
.../jakarta/faces/component/_DeltaStateHelper.java | 8 +-
.../behavior/_AjaxBehaviorDeltaStateHelper.java | 692 ---------------------
.../component/behavior/_DeltaStateHelper.java | 6 +-
3 files changed, 7 insertions(+), 699 deletions(-)
diff --git a/api/src/main/java/jakarta/faces/component/_DeltaStateHelper.java b/api/src/main/java/jakarta/faces/component/_DeltaStateHelper.java
index 8cdc77ec4..aeaddeba0 100644
--- a/api/src/main/java/jakarta/faces/component/_DeltaStateHelper.java
+++ b/api/src/main/java/jakarta/faces/component/_DeltaStateHelper.java
@@ -193,7 +193,7 @@ private Map<Serializable, Object> _ensureFullState()
{
if (_fullState == null)
{
- _fullState = new HashMap<>();
+ _fullState = new HashMap<>(8, 1f);
}
return _fullState;
}
@@ -247,7 +247,7 @@ private boolean _createDeltas(Serializable key)
}
if (_deltas == null)
{
- _deltas = new HashMap<>();
+ _deltas = new HashMap<>(4, 1f);
}
return true;
}
@@ -433,7 +433,7 @@ public <T> T put(Serializable key, String mapKey, T value)
Map<String, Object> mapValues = (Map<String, Object>) _deltas.get(key);
if (mapValues == null)
{
- mapValues = new InternalMap<>();
+ mapValues = new InternalMap<>(4, 1f);
_deltas.put(key, mapValues);
}
@@ -452,7 +452,7 @@ public <T> T put(Serializable key, String mapKey, T value)
Map<String, Object> mapValues = _fullState != null ? (Map<String, Object>) _fullState.get(key) : null;
if (mapValues == null)
{
- mapValues = new InternalMap<>();
+ mapValues = new InternalMap<>(4, 1f);
_ensureFullState().put(key, mapValues);
}
diff --git a/api/src/main/java/jakarta/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java b/api/src/main/java/jakarta/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
deleted file mode 100644
index 5d7f74964..000000000
--- a/api/src/main/java/jakarta/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
+++ /dev/null
@@ -1,692 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package jakarta.faces.component.behavior;
-
-import jakarta.el.ValueExpression;
-import jakarta.faces.component.StateHelper;
-import jakarta.faces.component.StateHolder;
-import jakarta.faces.component.UIComponentBase;
-import jakarta.faces.context.FacesContext;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-
-/**
- * Delta state helper to deal with the ajax
- * behavior delta states, cross ported
- * from our generic delta state, due to limitations
- * in the spec (sorry for the somewhat dirty code here maybe
- * we can unify both implementations by isolating a common protected interface)
- *
- * @since 2.0
- */
-class _AjaxBehaviorDeltaStateHelper<A extends AjaxBehavior> implements StateHelper
-{
- /**
- * We need to hold a component instance because:
- * <p/>
- * - The component is the one who knows if we are on initial or delta mode
- * - eval assume calls to component.ValueExpression
- */
- private A _target;
-
- /**
- * This map holds the full current state
- */
- private Map<Serializable, Object> _fullState;
-
- /**
- * This map only keep track of delta changes to be saved
- */
- private Map<Serializable, Object> _deltas;
-
- private boolean _transient = false;
-
- public _AjaxBehaviorDeltaStateHelper(A component)
- {
- super();
- this._target = component;
- this._deltas = null;
- }
-
- private Map<Serializable, Object> _ensureFullState()
- {
- if (_fullState == null)
- {
- _fullState = new HashMap<>();
- }
- return _fullState;
- }
-
- /**
- * Used to create delta map on demand
- *
- * @return
- */
- private boolean _createDeltas()
- {
- if (isInitialStateMarked())
- {
- if (_deltas == null)
- {
- _deltas = new HashMap<>(2, 1f);
- }
- return true;
- }
-
- return false;
- }
-
- protected boolean isInitialStateMarked()
- {
- return _target.initialStateMarked();
- }
-
- @Override
- public void add(Serializable key, Object value)
- {
- if (_createDeltas())
- {
- //Track delta case
- Map<Object, Boolean> deltaListMapValues = (Map<Object, Boolean>) _deltas.get(key);
- if (deltaListMapValues == null)
- {
- deltaListMapValues = new InternalDeltaListMap<>(3, 1f);
- _deltas.put(key, deltaListMapValues);
- }
-
- deltaListMapValues.put(value, Boolean.TRUE);
- }
-
- //Handle change on full map
- List<Object> fullListValues = _fullState != null ? (List<Object>) _fullState.get(key) : null;
- if (fullListValues == null)
- {
- fullListValues = new InternalList<>(3);
- _ensureFullState().put(key, fullListValues);
- }
-
- fullListValues.add(value);
- }
-
- @Override
- public <T> T eval(Serializable key)
- {
- if (_fullState == null)
- {
- return null;
- }
- T returnValue = (T) _fullState.get(key);
- if (returnValue != null)
- {
- return returnValue;
- }
- ValueExpression expression = _target.getValueExpression(key.toString());
- if (expression != null)
- {
- return expression.getValue(FacesContext.getCurrentInstance().getELContext());
- }
- return null;
- }
-
- @Override
- public <T> T eval(Serializable key, T defaultValue)
- {
- if (_fullState == null)
- {
- return defaultValue;
- }
- T returnValue = (T) _fullState.get(key);
- if (returnValue == null)
- {
- ValueExpression expression = _target.getValueExpression(key.toString());
- if (expression != null)
- {
- returnValue = expression.getValue(_target.getFacesContext().getELContext());
- }
- }
- return returnValue != null ? returnValue : defaultValue;
- }
-
- @Override
- public <T> T eval(Serializable key, Supplier<T> defaultValueSupplier)
- {
- if (_fullState == null)
- {
- return defaultValueSupplier != null ? defaultValueSupplier.get() : null;
- }
- T returnValue = (T) _fullState.get(key);
- if (returnValue == null)
- {
- ValueExpression expression = _target.getValueExpression(key.toString());
- if (expression != null)
- {
- returnValue = expression.getValue(_target.getFacesContext().getELContext());
- }
- }
- if (returnValue == null && defaultValueSupplier != null)
- {
- returnValue = defaultValueSupplier.get();
- }
- return returnValue;
- }
-
- @Override
- public <T> T get(Serializable key)
- {
- return _fullState != null ? (T) _fullState.get(key) : null;
- }
-
- @Override
- public <T> T put(Serializable key, T value)
- {
- T returnValue = null;
- if (_createDeltas())
- {
- if (_deltas.containsKey(key))
- {
- returnValue = (T) _deltas.put(key, value);
- _ensureFullState().put(key, value);
- }
- else
- {
- _deltas.put(key, value);
- returnValue = (T) _ensureFullState().put(key, value);
- }
- }
- else
- {
- returnValue = (T) _ensureFullState().put(key, value);
- }
- return returnValue;
- }
-
- @Override
- public Object put(Serializable key, String mapKey, Object value)
- {
- boolean returnSet = false;
- Object returnValue = null;
- if (_createDeltas())
- {
- //Track delta case
- Map<String, Object> mapValues = (Map<String, Object>) _deltas.get(key);
- if (mapValues == null)
- {
- mapValues = new InternalMap<>(8, 1f);
- _deltas.put(key, mapValues);
- }
-
- if (mapValues.containsKey(mapKey))
- {
- returnValue = mapValues.put(mapKey, value);
- returnSet = true;
- }
- else
- {
- mapValues.put(mapKey, value);
- }
- }
-
- //Handle change on full map
- Map<String, Object> mapValues = _fullState != null ? (Map<String, Object>) _fullState.get(key) : null;
- if (mapValues == null)
- {
- mapValues = new InternalMap<>(8, 1f);
- _ensureFullState().put(key, mapValues);
- }
-
- if (returnSet)
- {
- mapValues.put(mapKey, value);
- }
- else
- {
- returnValue = mapValues.put(mapKey, value);
- }
- return returnValue;
- }
-
- @Override
- public Object remove(Serializable key)
- {
- Object returnValue = null;
- if (_createDeltas())
- {
- if (_deltas.containsKey(key))
- {
- // Keep track of the removed values using key/null pair on the delta map
- returnValue = _deltas.put(key, null);
- if (_fullState != null)
- {
- _fullState.remove(key);
- }
- }
- else
- {
- // Keep track of the removed values using key/null pair on the delta map
- _deltas.put(key, null);
- returnValue = _fullState != null ? _fullState.remove(key) : null;
- }
- }
- else
- {
- returnValue = _fullState != null ? _fullState.remove(key) : null;
- }
- return returnValue;
- }
-
- @Override
- public Object remove(Serializable key, Object valueOrKey)
- {
- // Comment by lu4242 : The spec javadoc says if it is a Collection
- // or Map deal with it. But the intention of this method is work
- // with add(?,?) and put(?,?,?), this ones return instances of
- // InternalMap and InternalList to prevent mixing, so to be
- // consistent we'll cast to those classes here.
-
- Object collectionOrMap = _fullState != null ? _fullState.get(key) : null;
- Object returnValue = null;
- if (collectionOrMap instanceof InternalMap)
- {
- if (_createDeltas())
- {
- returnValue = _removeValueOrKeyFromMap(_deltas, key, valueOrKey, true);
- _removeValueOrKeyFromMap(_fullState, key, valueOrKey, false);
- }
- else
- {
- returnValue = _removeValueOrKeyFromMap(_fullState, key, valueOrKey, false);
- }
- }
- else if (collectionOrMap instanceof InternalList)
- {
- if (_createDeltas())
- {
- returnValue = _removeValueOrKeyFromCollectionDelta(_deltas, key, valueOrKey);
- _removeValueOrKeyFromCollection(_fullState, key, valueOrKey);
- }
- else
- {
- returnValue = _removeValueOrKeyFromCollection(_fullState, key, valueOrKey);
- }
- }
- return returnValue;
- }
-
- private static Object _removeValueOrKeyFromCollectionDelta(
- Map<Serializable, Object> stateMap, Serializable key, Object valueOrKey)
- {
- Object returnValue = null;
- Map<Object, Boolean> c = (Map<Object, Boolean>) stateMap.get(key);
- if (c != null)
- {
- if (c.containsKey(valueOrKey))
- {
- returnValue = valueOrKey;
- }
- c.put(valueOrKey, Boolean.FALSE);
- }
- return returnValue;
- }
-
- private static Object _removeValueOrKeyFromCollection(
- Map<Serializable, Object> stateMap, Serializable key, Object valueOrKey)
- {
- Object returnValue = null;
- Collection c = (Collection) stateMap.get(key);
- if (c != null)
- {
- if (c.remove(valueOrKey))
- {
- returnValue = valueOrKey;
- }
- if (c.isEmpty())
- {
- stateMap.remove(key);
- }
- }
- return returnValue;
- }
-
- private static Object _removeValueOrKeyFromMap(
- Map<Serializable, Object> stateMap, Serializable key, Object valueOrKey, boolean delta)
- {
- if (valueOrKey == null)
- {
- return null;
- }
-
- Object returnValue = null;
- Map<String, Object> map = (Map<String, Object>) stateMap.get(key);
- if (map != null)
- {
- if (delta)
- {
- // Keep track of the removed values using key/null pair on the delta map
- returnValue = map.put((String) valueOrKey, null);
- }
- else
- {
- returnValue = map.remove((String) valueOrKey);
- }
-
- if (map.isEmpty())
- {
- stateMap.put(key, null);
- }
- }
- return returnValue;
- }
-
- @Override
- public boolean isTransient()
- {
- return _transient;
- }
-
- /**
- * Serializing cod
- * the serialized data structure consists of key value pairs unless the value itself is an internal array
- * or a map in case of an internal array or map the value itself is another array with its initial value
- * myfaces.InternalArray, myfaces.internalMap
- * <p/>
- * the internal Array is then mapped to another array
- * <p/>
- * the internal Map again is then mapped to a map with key value pairs
- */
- @Override
- public Object saveState(FacesContext context)
- {
- Map serializableMap = (isInitialStateMarked()) ? _deltas : _fullState;
-
- if (serializableMap == null || serializableMap.isEmpty())
- {
- return null;
- }
-
- Map.Entry<Serializable, Object> entry;
- Object[] retArr = new Object[serializableMap.entrySet().size() * 2];
-
- Iterator<Map.Entry<Serializable, Object>> it = serializableMap.entrySet().iterator();
- int cnt = 0;
- while (it.hasNext())
- {
- entry = it.next();
- retArr[cnt] = entry.getKey();
-
- Object value = entry.getValue();
-
- // The condition in which the call to saveAttachedState
- // is to handle List, StateHolder or non Serializable instances.
- // we check it here, to prevent unnecessary calls.
- if (value instanceof StateHolder ||
- value instanceof List ||
- !(value instanceof Serializable))
- {
- Object savedValue = UIComponentBase.saveAttachedState(context, value);
- retArr[cnt + 1] = savedValue;
- }
- else
- {
- retArr[cnt + 1] = value;
- }
- cnt += 2;
- }
-
- return retArr;
- }
-
- @Override
- public void restoreState(FacesContext context, Object state)
- {
- if (state == null)
- {
- return;
- }
-
- Object[] serializedState = (Object[]) state;
-
- for (int cnt = 0; cnt < serializedState.length; cnt += 2)
- {
- Serializable key = (Serializable) serializedState[cnt];
-
- Object savedValue = UIComponentBase.restoreAttachedState(context, serializedState[cnt + 1]);
-
- if (isInitialStateMarked())
- {
- if (savedValue instanceof InternalDeltaListMap)
- {
- for (Map.Entry<Object, Boolean> mapEntry : ((Map<Object, Boolean>) savedValue).entrySet())
- {
- boolean addOrRemove = mapEntry.getValue();
- if (addOrRemove)
- {
- //add
- this.add(key, mapEntry.getKey());
- }
- else
- {
- //remove
- this.remove(key, mapEntry.getKey());
- }
- }
- }
- else if (savedValue instanceof InternalMap)
- {
- for (Map.Entry<String, Object> mapEntry : ((Map<String, Object>) savedValue)
- .entrySet())
- {
- this.put(key, mapEntry.getKey(), mapEntry.getValue());
- }
- }
- /*
- else if (savedValue instanceof _AttachedDeltaWrapper)
- {
- _AttachedStateWrapper wrapper = (_AttachedStateWrapper) savedValue;
- //Restore delta state
- ((PartialStateHolder)_fullState.get(key)).restoreState(context, wrapper.getWrappedStateObject());
- //Add this key as StateHolder key
- _stateHolderKeys.add(key);
- }
- */
- else
- {
- put(key, savedValue);
- }
- }
- else
- {
- put(key, savedValue);
- }
- }
- }
-
- @Override
- public void setTransient(boolean transientValue)
- {
- _transient = transientValue;
- }
-
- //We use our own data structures just to make sure
- //nothing gets mixed up internally
- static class InternalMap<K, V> extends HashMap<K, V> implements StateHolder
- {
- public InternalMap()
- {
- super();
- }
-
- public InternalMap(int initialCapacity, float loadFactor)
- {
- super(initialCapacity, loadFactor);
- }
-
- public InternalMap(Map<? extends K, ? extends V> m)
- {
- super(m);
- }
-
- public InternalMap(int initialSize)
- {
- super(initialSize);
- }
-
- @Override
- public boolean isTransient()
- {
- return false;
- }
-
- @Override
- public void setTransient(boolean newTransientValue)
- {
- // No op
- }
-
- @Override
- public void restoreState(FacesContext context, Object state)
- {
- Object[] listAsMap = (Object[]) state;
- for (int cnt = 0; cnt < listAsMap.length; cnt += 2)
- {
- this.put((K) listAsMap[cnt], (V) UIComponentBase.restoreAttachedState(context, listAsMap[cnt + 1]));
- }
- }
-
- @Override
- public Object saveState(FacesContext context)
- {
- int cnt = 0;
- Object[] mapArr = new Object[this.size() * 2];
- for (Map.Entry<K, V> entry : this.entrySet())
- {
- mapArr[cnt] = entry.getKey();
- Object value = entry.getValue();
-
- if (value instanceof StateHolder ||
- value instanceof List ||
- !(value instanceof Serializable))
- {
- mapArr[cnt + 1] = UIComponentBase.saveAttachedState(context, value);
- }
- else
- {
- mapArr[cnt + 1] = value;
- }
- cnt += 2;
- }
- return mapArr;
- }
- }
-
- /**
- * Map used to keep track of list changes
- */
- static class InternalDeltaListMap<K, V> extends InternalMap<K, V>
- {
-
- public InternalDeltaListMap()
- {
- super();
- }
-
- public InternalDeltaListMap(int initialCapacity, float loadFactor)
- {
- super(initialCapacity, loadFactor);
- }
-
- public InternalDeltaListMap(int initialSize)
- {
- super(initialSize);
- }
-
- public InternalDeltaListMap(Map<? extends K, ? extends V> m)
- {
- super(m);
- }
- }
-
- static class InternalList<T> extends ArrayList<T> implements StateHolder
- {
- public InternalList()
- {
- super();
- }
-
- public InternalList(Collection<? extends T> c)
- {
- super(c);
- }
-
- public InternalList(int initialSize)
- {
- super(initialSize);
- }
-
- @Override
- public boolean isTransient()
- {
- return false;
- }
-
- @Override
- public void setTransient(boolean newTransientValue)
- {
- }
-
- @Override
- public void restoreState(FacesContext context, Object state)
- {
- Object[] listAsArr = (Object[]) state;
- //since all other options would mean dual iteration
- //we have to do it the hard way
- for (Object elem : listAsArr)
- {
- add((T) UIComponentBase.restoreAttachedState(context, elem));
- }
- }
-
- @Override
- public Object saveState(FacesContext context)
- {
- Object[] values = new Object[size()];
- for (int i = 0; i < size(); i++)
- {
- Object value = get(i);
-
- if (value instanceof StateHolder ||
- value instanceof List ||
- !(value instanceof Serializable))
- {
- values[i] = UIComponentBase.saveAttachedState(context, value);
- }
- else
- {
- values[i] = value;
- }
- }
- return values;
- }
- }
-}
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 2958b5eb4..0d9d1a43c 100644
--- a/api/src/main/java/jakarta/faces/component/behavior/_DeltaStateHelper.java
+++ b/api/src/main/java/jakarta/faces/component/behavior/_DeltaStateHelper.java
@@ -170,7 +170,7 @@ private Map<Serializable, Object> _ensureFullState()
{
if (_fullState == null)
{
- _fullState = new HashMap<>();
+ _fullState = new HashMap<>(8, 1f);
}
return _fullState;
}
@@ -335,7 +335,7 @@ public <T> T put(Serializable key, String mapKey, T value)
Map<String, Object> mapValues = (Map<String, Object>) _deltas.get(key);
if (mapValues == null)
{
- mapValues = new InternalMap<>();
+ mapValues = new InternalMap<>(4, 1f);
_deltas.put(key, mapValues);
}
@@ -354,7 +354,7 @@ public <T> T put(Serializable key, String mapKey, T value)
Map<String, Object> mapValues = _fullState != null ? (Map<String, Object>) _fullState.get(key) : null;
if (mapValues == null)
{
- mapValues = new InternalMap<>();
+ mapValues = new InternalMap<>(4, 1f);
_ensureFullState().put(key, mapValues);
}