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/03/28 10:04:04 UTC
(myfaces) branch main updated: MYFACES-4585 - fix the issue
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 a03c09da5 MYFACES-4585 - fix the issue
a03c09da5 is described below
commit a03c09da5bf617826bab4a74c4d92dd41bdb92f1
Author: tandraschko <ta...@apache.org>
AuthorDate: Sat Mar 28 11:03:53 2026 +0100
MYFACES-4585 - fix the issue
---
.../view/facelets/AbstractFaceletContext.java | 16 +++++++++++++++
.../view/facelets/impl/DefaultFaceletContext.java | 15 ++++++++++++++
.../taghandler/DelegatingVariableMapper.java | 24 +++++++++++++++++-----
.../facelets/taghandler/TagAttributeHandler.java | 2 +-
.../Myfaces4585FaceletsIntegrationTestCase.java | 6 +-----
5 files changed, 52 insertions(+), 11 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java b/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java
index fbc69c89f..4bae625a9 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java
@@ -22,6 +22,7 @@
import java.util.Iterator;
import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.application.Resource;
import jakarta.faces.component.UIComponent;
@@ -206,6 +207,21 @@ public TemplateContext getTemplateContext()
return null;
}
+ /**
+ * If there is a Facelets template context below the current top of the stack, return the value
+ * expression bound for {@code name} as a taglib / {@code ui:param} parameter on that enclosing
+ * context; otherwise {@code null}. OmniFaces-style {@code o:tagAttribute} compares inner vs
+ * outer bindings; resolving {@code @name} only through the EL {@link jakarta.el.VariableMapper}
+ * can collapse to the same {@link ValueExpression} as the inner tag (MYFACES-4585).
+ *
+ * @param name taglib attribute / template parameter name
+ * @return parameter from the enclosing template layer, or {@code null}
+ */
+ public ValueExpression resolveTemplateParameterInEnclosingContext(String name)
+ {
+ return null;
+ }
+
/**
* Push the passed page context instance onto the stack.
*
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
index 78546e86a..7131e7d3c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
@@ -505,6 +505,21 @@ public TemplateContext getTemplateContext()
return _isolatedTemplateContext.get(_currentTemplateContext);
}
+ @Override
+ public ValueExpression resolveTemplateParameterInEnclosingContext(String name)
+ {
+ if (name == null || _currentTemplateContext <= 0)
+ {
+ return null;
+ }
+ TemplateContext enclosing = _isolatedTemplateContext.get(_currentTemplateContext - 1);
+ if (enclosing.containsParameter(name))
+ {
+ return enclosing.getParameter(name);
+ }
+ return null;
+ }
+
@Override
public boolean includeCompositeComponentDefinition(UIComponent parent, String name)
throws IOException, FaceletException, FacesException, ELException
diff --git a/impl/src/test/java/org/apache/myfaces/test/facelets/taghandler/DelegatingVariableMapper.java b/impl/src/test/java/org/apache/myfaces/test/facelets/taghandler/DelegatingVariableMapper.java
index 879fdc535..5a69a878b 100644
--- a/impl/src/test/java/org/apache/myfaces/test/facelets/taghandler/DelegatingVariableMapper.java
+++ b/impl/src/test/java/org/apache/myfaces/test/facelets/taghandler/DelegatingVariableMapper.java
@@ -20,10 +20,12 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.Objects;
import jakarta.el.ValueExpression;
import jakarta.el.VariableMapper;
+import jakarta.faces.view.facelets.FaceletContext;
+
+import org.apache.myfaces.view.facelets.AbstractFaceletContext;
/**
* VariableMapper wrapper used by {@link TagAttributeHandler} (MYFACES-4589 tests).
@@ -60,20 +62,32 @@ public ValueExpression resolveVariable(String name)
/**
* Resolve wrapped variable of given name.
+ *
+ * @param faceletContext used to read the enclosing Facelets template parameter layer; required so the
+ * parent binding is not confused with the inner one when nested
+ * {@link jakarta.el.VariableMapper} delegates strip {@code @name} (MYFACES-4585).
*/
- public ValueExpression resolveWrappedVariable(String name)
+ public ValueExpression resolveWrappedVariable(String name, FaceletContext faceletContext)
{
ValueExpression wrappedVariable = wrapped.resolveVariable(name);
ValueExpression globalVariable = variables.get(name);
- if (Objects.equals(wrappedVariable, globalVariable))
+ // Reference equality only: ValueExpression.equals() is often implemented as expression-string equality,
+ // so two distinct VEs for the same EL (e.g. #{autoCompleteDepartmentConverter}) compare equal. That
+ // falsely matched the "parent alias" / "unset" case and made o:tagAttribute / t:tagAttribute apply the
+ // default (MYFACES-4585: converter became "" and EL called suggest() on String).
+ if (wrappedVariable == globalVariable)
{
return null;
}
- ValueExpression parentVariable = wrapped.resolveVariable("@" + name);
+ ValueExpression parentVariable = null;
+ if (faceletContext instanceof AbstractFaceletContext actx)
+ {
+ parentVariable = actx.resolveTemplateParameterInEnclosingContext(name);
+ }
- if (Objects.equals(wrappedVariable, parentVariable))
+ if (wrappedVariable == parentVariable)
{
return null;
}
diff --git a/impl/src/test/java/org/apache/myfaces/test/facelets/taghandler/TagAttributeHandler.java b/impl/src/test/java/org/apache/myfaces/test/facelets/taghandler/TagAttributeHandler.java
index 1abaa2c25..eb30fb36b 100644
--- a/impl/src/test/java/org/apache/myfaces/test/facelets/taghandler/TagAttributeHandler.java
+++ b/impl/src/test/java/org/apache/myfaces/test/facelets/taghandler/TagAttributeHandler.java
@@ -55,7 +55,7 @@ public TagAttributeHandler(TagConfig config)
public void apply(FaceletContext context, UIComponent parent) throws IOException
{
DelegatingVariableMapper variableMapper = getDelegatingVariableMapper(context);
- ValueExpression valueExpression = variableMapper.resolveWrappedVariable(name);
+ ValueExpression valueExpression = variableMapper.resolveWrappedVariable(name, context);
if (valueExpression == null)
{
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/Myfaces4585FaceletsIntegrationTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/Myfaces4585FaceletsIntegrationTestCase.java
index ec4d515a3..baec3b4fb 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/Myfaces4585FaceletsIntegrationTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/Myfaces4585FaceletsIntegrationTestCase.java
@@ -37,7 +37,6 @@
import org.apache.myfaces.view.facelets.AbstractFaceletTestCase;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
@@ -59,12 +58,9 @@
* names there).
* </p>
* <p>
- * The test currently <strong>fails</strong> during render with {@code MethodNotFoundException} on {@code String}
- * (e.g. {@code String.suggest(String)}) until MYFACES-4585 is fixed; it is {@code @Disabled} so the suite stays green,
- * same as {@link Myfaces4589FaceletsIntegrationTestCase}.
+ * Regression test for MYFACES-4585 (must stay enabled once fixed).
* </p>
*/
-@Disabled("MYFACES-4585: fails until UserTagHandler taglib bindings resolve converter for EL outside TemplateContext")
public class Myfaces4585FaceletsIntegrationTestCase extends AbstractFaceletTestCase
{