You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by vo...@apache.org on 2023/12/01 20:41:46 UTC

(myfaces) 02/02: MYFACES-4644 (5.0): Enable extensionless requests for programmatic views

This is an automated email from the ASF dual-hosted git repository.

volosied pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git

commit 3939bd763b362a6eb274edfab83100d239ada591
Author: Volodymyr Siedlecki <vo...@gmail.com>
AuthorDate: Tue Nov 28 16:09:04 2023 -0500

     MYFACES-4644 (5.0): Enable extensionless requests for programmatic views
---
 .../main/java/jakarta/faces/annotation/View.java   |  2 --
 .../myfaces/application/ResourceHandlerImpl.java   | 34 ++++++++++++++++++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/api/src/main/java/jakarta/faces/annotation/View.java b/api/src/main/java/jakarta/faces/annotation/View.java
index a21f867eb..0475cba20 100644
--- a/api/src/main/java/jakarta/faces/annotation/View.java
+++ b/api/src/main/java/jakarta/faces/annotation/View.java
@@ -26,7 +26,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 import jakarta.enterprise.util.AnnotationLiteral;
-import jakarta.enterprise.util.Nonbinding;
 import jakarta.inject.Qualifier;
 
 /**
@@ -60,7 +59,6 @@ public @interface View
      *
      * @return the Faces View Id pattern
      */
-    @Nonbinding
     String value() default "";
 
     /**
diff --git a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
index 19d82e94c..6f6c39a1b 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
@@ -31,6 +31,10 @@ import org.apache.myfaces.util.ExternalContextUtils;
 import org.apache.myfaces.util.lang.StringUtils;
 import org.apache.myfaces.util.WebConfigParamUtils;
 
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.faces.annotation.View;
 import jakarta.faces.application.Resource;
 import jakarta.faces.application.ResourceHandler;
 import jakarta.faces.application.ResourceWrapper;
@@ -40,6 +44,8 @@ import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -61,6 +67,7 @@ import jakarta.faces.application.ResourceVisitOption;
 import jakarta.faces.application.ViewHandler;
 import jakarta.faces.view.ViewDeclarationLanguage;
 
+import org.apache.myfaces.cdi.util.CDIUtils;
 import org.apache.myfaces.config.webparameters.MyfacesConfig;
 import org.apache.myfaces.core.api.shared.lang.Assert;
 import org.apache.myfaces.core.api.shared.lang.LocaleUtils;
@@ -1697,8 +1704,31 @@ public class ResourceHandlerImpl extends ResourceHandler
         Iterator it = new FilterInvalidSuffixViewResourceIterator(new ViewResourceIterator(facesContext, 
                     getResourceHandlerSupport(), localePrefix, contracts,
                     contractPreferred, path, maxDepth, options), facesContext, _viewSuffixes);
- 
-        return StreamSupport.stream(Spliterators.spliteratorUnknownSize(it,Spliterator.DISTINCT), false);
+
+        return Stream.concat(StreamSupport.stream(Spliterators.spliteratorUnknownSize(it,Spliterator.DISTINCT),
+                                                    false), getProgrammaticViewIds(facesContext));
+    }
+
+    private Stream<String> getProgrammaticViewIds(FacesContext facesContext)
+    {
+        ArrayList<String> views = new ArrayList<String>();
+        BeanManager beanManager = CDIUtils.getBeanManager(facesContext);
+        if(beanManager != null)
+        {
+            for(Bean<?> bean : beanManager.getBeans(Object.class, Any.Literal.INSTANCE))
+            {
+                for(Annotation anno :bean.getBeanClass().getAnnotations())
+                {   
+                    // ensure it is of type view (avoid cast errors such as jdk.proxy4.$Proxy17)
+                    if(anno instanceof View) 
+                    {
+                        View view = (View) anno;
+                        views.add(view.value());
+                    }
+                }
+            }
+        }
+        return views.stream();
     }
     
     private Set<String> loadSuffixes(ExternalContext context)