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 2015/09/30 13:30:54 UTC
svn commit: r1706001 - in /myfaces/core/trunk/impl/src/main:
java/org/apache/myfaces/config/annotation/ resources/META-INF/services/
Author: tandraschko
Date: Wed Sep 30 11:30:53 2015
New Revision: 1706001
URL: http://svn.apache.org/viewvc?rev=1706001&view=rev
Log:
MYFACES-4015 [perf] provide annotation scanning via CDI extension
Added:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/CdiAnnotationProviderExtension.java
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
myfaces/core/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
Added: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/CdiAnnotationProviderExtension.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/CdiAnnotationProviderExtension.java?rev=1706001&view=auto
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/CdiAnnotationProviderExtension.java (added)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/CdiAnnotationProviderExtension.java Wed Sep 30 11:30:53 2015
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.config.annotation;
+
+import java.lang.annotation.Annotation;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.faces.bean.ManagedBean;
+import javax.faces.component.FacesComponent;
+import javax.faces.component.behavior.FacesBehavior;
+import javax.faces.convert.FacesConverter;
+import javax.faces.render.FacesBehaviorRenderer;
+import javax.faces.render.FacesRenderer;
+import javax.faces.validator.FacesValidator;
+import javax.faces.view.facelets.FaceletsResourceResolver;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
+import org.apache.myfaces.config.element.NamedEvent;
+
+public class CdiAnnotationProviderExtension implements Extension
+{
+ /**
+ * Defines if CDI should be used for annotation scanning to improve the startup performance.
+ */
+ @JSFWebConfigParam(since="2.2.9")
+ public static final String USE_CDI_FOR_ANNOTATION_SCANNING
+ = "org.apache.myfaces.annotation.USE_CDI_FOR_ANNOTATION_SCANNING";
+
+ private final Map<Class<? extends Annotation>, Set<Class<?>>> map;
+ private final Class<? extends Annotation>[] annotationsToScan;
+
+ public CdiAnnotationProviderExtension()
+ {
+ map = new HashMap<Class<? extends Annotation>, Set<Class<?>>>();
+ annotationsToScan = new Class[] {
+ FacesComponent.class,
+ FacesBehavior.class,
+ FacesConverter.class,
+ FacesValidator.class,
+ FacesRenderer.class,
+ ManagedBean.class,
+ NamedEvent.class,
+ FacesBehaviorRenderer.class,
+ FaceletsResourceResolver.class
+ };
+ }
+
+ <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat)
+ {
+ AnnotatedType<T> type = pat.getAnnotatedType();
+
+ for (Class<? extends Annotation> annotation : annotationsToScan)
+ {
+ if (type.isAnnotationPresent(annotation))
+ {
+ Set<Class<?>> set = map.get(annotation);
+ if (set == null)
+ {
+ set = new HashSet<Class<?>>();
+ map.put(annotation, set);
+ }
+
+ set.add(type.getJavaClass());
+ }
+ }
+ }
+
+ public Map<Class<? extends Annotation>, Set<Class<?>>> getMap()
+ {
+ return map;
+ }
+}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java?rev=1706001&r1=1706000&r2=1706001&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java Wed Sep 30 11:30:53 2015
@@ -37,6 +37,7 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.enterprise.inject.spi.BeanManager;
import javax.faces.FacesException;
import javax.faces.bean.ManagedBean;
@@ -51,6 +52,8 @@ import javax.faces.validator.FacesValida
import javax.faces.view.facelets.FaceletsResourceResolver;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
+import org.apache.myfaces.cdi.util.BeanProvider;
+import org.apache.myfaces.cdi.util.CDIUtils;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.AnnotationProvider;
@@ -151,6 +154,16 @@ public class DefaultAnnotationProvider e
@Override
public Map<Class<? extends Annotation>, Set<Class<?>>> getAnnotatedClasses(ExternalContext ctx)
{
+ String useCdiForAnnotationScanning =
+ ctx.getInitParameter(CdiAnnotationProviderExtension.USE_CDI_FOR_ANNOTATION_SCANNING);
+ if (useCdiForAnnotationScanning != null && "true".equalsIgnoreCase(useCdiForAnnotationScanning.trim()))
+ {
+ BeanManager beanManager = CDIUtils.getBeanManager(ctx);
+ CdiAnnotationProviderExtension extension =
+ BeanProvider.getContextualReference(beanManager, CdiAnnotationProviderExtension.class, false);
+ return extension.getMap();
+ }
+
Map<Class<? extends Annotation>,Set<Class<?>>> map = new HashMap<Class<? extends Annotation>, Set<Class<?>>>();
Collection<Class<?>> classes = null;
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=1706001&r1=1706000&r2=1706001&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Wed Sep 30 11:30:53 2015
@@ -2,3 +2,4 @@ org.apache.myfaces.cdi.view.ViewScopeCon
org.apache.myfaces.flow.cdi.FlowBuilderCDIExtension
org.apache.myfaces.flow.cdi.FlowScopeCDIExtension
org.apache.myfaces.cdi.dependent.DependentBeanExtension
+org.apache.myfaces.config.annotation.CdiAnnotationProviderExtension