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 2020/04/07 12:48:32 UTC

[myfaces] branch master updated: MYFACES-4327 added config

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 dae9c72  MYFACES-4327 added config
dae9c72 is described below

commit dae9c72cec518a288c6803ee6a246ec84eb3ac26
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Tue Apr 7 14:48:23 2020 +0200

    MYFACES-4327 added config
---
 .../org/apache/myfaces/config/MyfacesConfig.java   | 24 ++++++++++++++++++++--
 .../myfaces/el/ELResolverBuilderForFaces.java      |  2 +-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java b/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java
index 5b72d9c..8841cb1 100755
--- a/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java
@@ -788,12 +788,12 @@ public class MyfacesConfig
     
     /**
      * Defines if the clientbehavior scripts are passed as string or function to the jsf.util.chain.
-     * "As string" is actually the default behavior of both MyFaces (until 3.0) and Mojarra.
+     * "As string" is actually the default behavior of both MyFaces (until 2.3-next) and Mojarra.
      * "As function" is quite usefull for CSP as no string needs to be evaluated as function.
      * 
      * Our jsf.util.chain supports both of course.
      */
-    @JSFWebConfigParam(name="org.apache.myfaces.RENDER_CLIENTBEHAVIOR_SCRIPTS_AS_STRING", since="3.0", defaultValue = "false")
+    @JSFWebConfigParam(name="org.apache.myfaces.RENDER_CLIENTBEHAVIOR_SCRIPTS_AS_STRING", since="2.3-next", defaultValue = "false")
     public static final String RENDER_CLIENTBEHAVIOR_SCRIPTS_AS_STRING = "org.apache.myfaces.RENDER_CLIENTBEHAVIOR_SCRIPTS_AS_STRING";
     public static final boolean RENDER_CLIENTBEHAVIOR_SCRIPTS_AS_STRING_DEFAULT = false;
     
@@ -809,6 +809,17 @@ public class MyfacesConfig
             "org.apache.myfaces.ALWAYS_FORCE_SESSION_CREATION";
     public final static boolean ALWAYS_FORCE_SESSION_CREATION_DEFAULT = false;
     
+    /**
+     * Defines if our own BeanELResolver will be used for better performance.
+     * It uses MethodHandles and LambdaMetafactory for getter/setter calls instead of reflection.
+     */
+    @JSFWebConfigParam(since="2.3-next", defaultValue="true", expectedValues="true,false",
+            group="EL", tags="performance")
+    protected static final String USE_METHOD_HANDLE_BEAN_EL_RESOLVER = 
+            "org.apache.myfaces.USE_METHOD_HANDLE_BEAN_EL_RESOLVER";
+    public final static boolean USE_METHOD_HANDLE_BEAN_EL_RESOLVER_DEFAULT = true;
+    
+    
     // we need it, applicationImpl not ready probably
     private ProjectStage projectStage = ProjectStage.Production;
     private boolean strictJsf2AllowSlashLibraryName;
@@ -888,6 +899,7 @@ public class MyfacesConfig
     private int websocketMaxConnections = WEBSOCKET_MAX_CONNECTIONS_DEFAULT;
     private boolean renderClientBehaviorScriptsAsString = RENDER_CLIENTBEHAVIOR_SCRIPTS_AS_STRING_DEFAULT;
     private boolean alwaysForceSessionCreation = ALWAYS_FORCE_SESSION_CREATION_DEFAULT;
+    private boolean useMethodHandleBeanElResolver = USE_METHOD_HANDLE_BEAN_EL_RESOLVER_DEFAULT;
     
     private static final boolean MYFACES_IMPL_AVAILABLE;
     private static final boolean RI_IMPL_AVAILABLE;
@@ -1303,6 +1315,9 @@ public class MyfacesConfig
         cfg.alwaysForceSessionCreation = getBoolean(extCtx, ALWAYS_FORCE_SESSION_CREATION,
                 ALWAYS_FORCE_SESSION_CREATION_DEFAULT);
 
+        cfg.useMethodHandleBeanElResolver = getBoolean(extCtx, USE_METHOD_HANDLE_BEAN_EL_RESOLVER,
+                USE_METHOD_HANDLE_BEAN_EL_RESOLVER_DEFAULT);
+
         return cfg;
     }
 
@@ -1762,5 +1777,10 @@ public class MyfacesConfig
     {
         return alwaysForceSessionCreation;
     }
+
+    public boolean isUseMethodHandleBeanElResolver()
+    {
+        return useMethodHandleBeanElResolver;
+    }
 }
 
diff --git a/impl/src/main/java/org/apache/myfaces/el/ELResolverBuilderForFaces.java b/impl/src/main/java/org/apache/myfaces/el/ELResolverBuilderForFaces.java
index 8bb9dd8..7a392ae 100644
--- a/impl/src/main/java/org/apache/myfaces/el/ELResolverBuilderForFaces.java
+++ b/impl/src/main/java/org/apache/myfaces/el/ELResolverBuilderForFaces.java
@@ -140,7 +140,7 @@ public class ELResolverBuilderForFaces extends ELResolverBuilder
         list.add(new MapELResolver());
         list.add(new ListELResolver());
         list.add(new ArrayELResolver());
-        if (MethodHandleBeanELResolver.isSupported())
+        if (myfacesConfig.isUseMethodHandleBeanElResolver() && MethodHandleBeanELResolver.isSupported())
         {
             list.add(new MethodHandleBeanELResolver());
         }