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 2021/09/13 12:02:59 UTC
[myfaces] branch master updated: EL 5.0 / Java11
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new de040c6 EL 5.0 / Java11
de040c6 is described below
commit de040c630c9f76c4df396255ec466b0fc9e3f680
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Mon Sep 13 14:02:54 2021 +0200
EL 5.0 / Java11
---
.../org/apache/myfaces/el/resolver/EmptyStringToNullELResolver.java | 4 ++--
.../view/facelets/tag/composite/CompositeComponentTestCase.java | 2 +-
parent/pom.xml | 2 +-
.../org/apache/myfaces/test/el/MockCompositeValueExpression.java | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/el/resolver/EmptyStringToNullELResolver.java b/impl/src/main/java/org/apache/myfaces/el/resolver/EmptyStringToNullELResolver.java
index f6fc648..aaca4c5 100644
--- a/impl/src/main/java/org/apache/myfaces/el/resolver/EmptyStringToNullELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/resolver/EmptyStringToNullELResolver.java
@@ -32,14 +32,14 @@ public class EmptyStringToNullELResolver extends ELResolver
}
@Override
- public Object convertToType(ELContext context, Object value, Class<?> targetType)
+ public <T extends Object> T convertToType(ELContext context, Object value, Class<T> targetType)
{
if (value == null && targetType == String.class)
{
context.setPropertyResolved(true);
}
- return value;
+ return (T) value;
}
@Override
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentTestCase.java
index 1c1a1bc..fcc2bf7 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentTestCase.java
@@ -139,7 +139,7 @@ public class CompositeComponentTestCase extends FaceletTestCase
//Check default coercion
ValueExpression ve = facesContext.getApplication().getExpressionFactory().createValueExpression(
facesContext.getELContext(), "#{cc.attrs.cols}", Object.class);
- Assert.assertEquals(1, ve.getValue(facesContext.getELContext()));
+ Assert.assertEquals(1, (int) ve.getValue(facesContext.getELContext()));
text1.popComponentFromEL(facesContext);
facet1.popComponentFromEL(facesContext);
compositeComponent1.popComponentFromEL(facesContext);
diff --git a/parent/pom.xml b/parent/pom.xml
index 1004dec..dcd0a00 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -374,7 +374,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-el-api</artifactId>
- <version>10.0.0-M9</version>
+ <version>10.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/test/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java b/test/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java
index 4e9a79a..1244e0e 100644
--- a/test/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java
+++ b/test/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java
@@ -104,12 +104,12 @@ public class MockCompositeValueExpression extends MockValueExpression
{
// Well only composite strings are supported.
- StringBuilder result = new StringBuilder();
+ String result = "";
for (ValueExpression valueExpression : valueExpressionChain)
{
- result.append(valueExpression.getValue(context));
+ result += valueExpression.getValue(context);
}
- return result.toString();
+ return result;
}
else
{