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 2022/12/08 09:03:53 UTC
[myfaces] branch main updated: MYFACES-4463
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 4a361eeba MYFACES-4463
4a361eeba is described below
commit 4a361eebaff1d126f57be70e5174b7b6a8870f6a
Author: tandraschko <ta...@apache.org>
AuthorDate: Thu Dec 8 10:03:47 2022 +0100
MYFACES-4463
---
.../myfaces/cdi/config/FacesConfigBeanHolder.java | 10 ++++-----
.../myfaces/cdi/config/FacesConfigExtension.java | 16 +++-----------
.../myfaces/el/DefaultELResolverBuilder.java | 3 ++-
.../org/apache/myfaces/el/ELResolverBuilder.java | 25 ++++------------------
4 files changed, 14 insertions(+), 40 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigBeanHolder.java b/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigBeanHolder.java
index ef2b69762..f5e0fd0b4 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigBeanHolder.java
@@ -25,15 +25,15 @@ import jakarta.faces.annotation.FacesConfig;
@ApplicationScoped
public class FacesConfigBeanHolder
{
- private FacesConfig.Version facesConfigVersion = null;
+ private FacesConfig facesConfig = null;
- public FacesConfig.Version getFacesConfigVersion()
+ public FacesConfig getFacesConfig()
{
- return facesConfigVersion;
+ return facesConfig;
}
- public void setFacesConfigVersion(FacesConfig.Version facesConfigVersion)
+ public void setFacesConfig(FacesConfig facesConfig)
{
- this.facesConfigVersion = facesConfigVersion;
+ this.facesConfig = facesConfig;
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigExtension.java
index c7d3c5c8e..7c16d426f 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigExtension.java
@@ -32,7 +32,7 @@ import org.apache.myfaces.cdi.util.CDIUtils;
public class FacesConfigExtension implements Extension
{
- private FacesConfig.Version facesConfigVersion;
+ private FacesConfig facesConfig;
void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager)
{
@@ -46,17 +46,7 @@ public class FacesConfigExtension implements Extension
{
Annotated annotated = event.getAnnotatedBeanClass();
- FacesConfig config = (FacesConfig) annotated.getAnnotation(FacesConfig.class);
-
- if (facesConfigVersion != null)
- {
- facesConfigVersion = facesConfigVersion.ordinal() < config.version().ordinal() ?
- config.version() : facesConfigVersion;
- }
- else
- {
- facesConfigVersion = config.version();
- }
+ facesConfig = (FacesConfig) annotated.getAnnotation(FacesConfig.class);
}
}
@@ -64,7 +54,7 @@ public class FacesConfigExtension implements Extension
{
FacesConfigBeanHolder holder = CDIUtils.get(beanManager, FacesConfigBeanHolder.class);
- holder.setFacesConfigVersion(facesConfigVersion);
+ holder.setFacesConfig(facesConfig);
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/el/DefaultELResolverBuilder.java b/impl/src/main/java/org/apache/myfaces/el/DefaultELResolverBuilder.java
index 3c4d1a360..7ff46b519 100644
--- a/impl/src/main/java/org/apache/myfaces/el/DefaultELResolverBuilder.java
+++ b/impl/src/main/java/org/apache/myfaces/el/DefaultELResolverBuilder.java
@@ -93,7 +93,8 @@ public class DefaultELResolverBuilder extends ELResolverBuilder
// add the ELResolvers to a List first to be able to sort them
List<ELResolver> list = new ArrayList<>();
- // Add CDI ELResolver for Faces 2.3
+ // Since Faces 4.0 CDI is a required dependency
+ // but our mocked tests doesnt run in a CDI container
if (isReplaceImplicitObjectResolverWithCDIResolver(facesContext))
{
list.add(ImplicitObjectResolver.makeResolverForCDI());
diff --git a/impl/src/main/java/org/apache/myfaces/el/ELResolverBuilder.java b/impl/src/main/java/org/apache/myfaces/el/ELResolverBuilder.java
index 0c2783f15..635879374 100644
--- a/impl/src/main/java/org/apache/myfaces/el/ELResolverBuilder.java
+++ b/impl/src/main/java/org/apache/myfaces/el/ELResolverBuilder.java
@@ -26,11 +26,9 @@ import java.util.logging.Logger;
import jakarta.el.CompositeELResolver;
import jakarta.el.ELResolver;
import jakarta.enterprise.inject.spi.BeanManager;
-import jakarta.faces.annotation.FacesConfig;
import jakarta.faces.application.ProjectStage;
import jakarta.faces.context.FacesContext;
import java.util.stream.Collectors;
-import org.apache.myfaces.cdi.config.FacesConfigBeanHolder;
import org.apache.myfaces.cdi.util.CDIUtils;
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.config.webparameters.MyfacesConfig;
@@ -157,27 +155,12 @@ public class ELResolverBuilder
}
BeanManager beanManager = CDIUtils.getBeanManager(facesContext);
- if (beanManager != null)
+ if (beanManager == null)
{
- FacesConfigBeanHolder holder = CDIUtils.get(beanManager, FacesConfigBeanHolder.class);
- if (holder != null)
- {
- FacesConfig.Version version = holder.getFacesConfigVersion();
- if (version == null)
- {
- return false;
- }
- else if (version.ordinal() >= FacesConfig.Version.JSF_2_3.ordinal())
- {
- return true;
- }
- else
- {
- return false;
- }
- }
+ return false;
}
- return false;
+
+ return true;
}