Return-Path: Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: (qmail 16094 invoked from network); 9 Jun 2010 09:49:59 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Jun 2010 09:49:59 -0000 Received: (qmail 84694 invoked by uid 500); 9 Jun 2010 09:49:58 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 84657 invoked by uid 500); 9 Jun 2010 09:49:57 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 84649 invoked by uid 99); 9 Jun 2010 09:49:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Jun 2010 09:49:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Jun 2010 09:49:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4F33B2388906; Wed, 9 Jun 2010 09:49:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r952931 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: decorator/ deployment/ inject/ inject/impl/ intercept/ util/ Date: Wed, 09 Jun 2010 09:49:09 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100609094909.4F33B2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: struberg Date: Wed Jun 9 09:49:08 2010 New Revision: 952931 URL: http://svn.apache.org/viewvc?rev=952931&view=rev Log: OWB-275 code cleanup Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorRuntimeSupport.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java?rev=952931&r1=952930&r2=952931&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java Wed Jun 9 09:49:08 2010 @@ -68,11 +68,17 @@ public class DecoratorsManager } if (srcIndex == targetIndex) + { return 0; + } else if (srcIndex < targetIndex) + { return -1; + } else + { return 1; + } } public boolean isDecoratorEnabled(Class decoratorClazz) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java?rev=952931&r1=952930&r2=952931&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java Wed Jun 9 09:49:08 2010 @@ -237,7 +237,9 @@ public class XMLStereoTypeModel implemen } if (!(obj instanceof XMLStereoTypeModel)) + { return false; + } XMLStereoTypeModel model = (XMLStereoTypeModel) obj; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java?rev=952931&r1=952930&r2=952931&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java Wed Jun 9 09:49:08 2010 @@ -27,12 +27,11 @@ import javax.enterprise.inject.spi.Annot import javax.enterprise.inject.spi.InjectionPoint; import org.apache.webbeans.component.AbstractOwbBean; -import org.apache.webbeans.component.ManagedBean; import org.apache.webbeans.exception.WebBeansException; import org.apache.webbeans.util.SecurityUtil; /** - * Injects the parameters of the {@link ManagedBean} constructor and returns + * Injects the parameters of the {@link org.apache.webbeans.component.ManagedBean} constructor and returns * the created instance. * * @author Gurkan Erdogdu Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java?rev=952931&r1=952930&r2=952931&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java Wed Jun 9 09:49:08 2010 @@ -154,7 +154,8 @@ public final class OWBInjector implement Field field = (Field)injectionPoint.getMember(); ClassUtil.setField(javaEeComponentInstance, field, object); } - }finally + } + finally { if(injectionPointBeanSet) { @@ -167,7 +168,8 @@ public final class OWBInjector implement } - }catch(Exception e) + } + catch(Exception e) { throw e; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java?rev=952931&r1=952930&r2=952931&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java Wed Jun 9 09:49:08 2010 @@ -219,7 +219,8 @@ public class InjectionPointFactory //@Observes is not injection point type for method parameters if(parameter.getAnnotation(Observes.class) == null) { - point = getGenericInjectionPoint(owner, parameter.getAnnotations().toArray(new Annotation[parameter.getAnnotations().size()]), parameter.getBaseType(), member , parameter); + point = getGenericInjectionPoint(owner, parameter.getAnnotations().toArray(new Annotation[parameter.getAnnotations().size()]), + parameter.getBaseType(), member , parameter); lists.add(point); } } @@ -243,7 +244,8 @@ public class InjectionPointFactory //@Observes is not injection point type for method parameters if(parameter.getAnnotation(Observes.class) == null) { - point = getGenericInjectionPoint(owner, parameter.getAnnotations().toArray(new Annotation[parameter.getAnnotations().size()]), parameter.getBaseType(), method.getJavaMember() , parameter); + point = getGenericInjectionPoint(owner, parameter.getAnnotations().toArray(new Annotation[parameter.getAnnotations().size()]), + parameter.getBaseType(), method.getJavaMember() , parameter); lists.add(point); } } @@ -294,7 +296,8 @@ public class InjectionPointFactory for(AnnotatedParameter parameter : parameters) { - point = getGenericInjectionPoint(owner, parameter.getAnnotations().toArray(new Annotation[parameter.getAnnotations().size()]), parameter.getBaseType(), constructor.getJavaMember() , parameter); + point = getGenericInjectionPoint(owner, parameter.getAnnotations().toArray(new Annotation[parameter.getAnnotations().size()]), + parameter.getBaseType(), constructor.getJavaMember() , parameter); lists.add(point); } @@ -318,7 +321,8 @@ public class InjectionPointFactory for(AnnotatedParameter parameter : parameters) { - point = getGenericInjectionPoint(owner, parameter.getAnnotations().toArray(new Annotation[parameter.getAnnotations().size()]), parameter.getBaseType(), member , parameter); + point = getGenericInjectionPoint(owner, parameter.getAnnotations().toArray(new Annotation[parameter.getAnnotations().size()]), + parameter.getBaseType(), member , parameter); lists.add(point); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorRuntimeSupport.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorRuntimeSupport.java?rev=952931&r1=952930&r2=952931&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorRuntimeSupport.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorRuntimeSupport.java Wed Jun 9 09:49:08 2010 @@ -36,7 +36,8 @@ import org.apache.webbeans.component.Owb * override intercepted functions to first delegate to all * registered {@link InterceptorHandler}s.

*/ -public class InterceptorRuntimeSupport { +public class InterceptorRuntimeSupport +{ /** *

Create a interceptor/decorator subclass for the given bean.

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java?rev=952931&r1=952930&r2=952931&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java Wed Jun 9 09:49:08 2010 @@ -404,7 +404,8 @@ public final class InterceptorUtil if (hasClassInterceptors) { throw new WebBeansConfigurationException("Simple web bean class : " + clazz.getName() - + " can not define non-static, non-private final methods. Because it is annotated with at least one @InterceptorBinding"); + + " can not define non-static, non-private final methods. " + + "Because it is annotated with at least one @InterceptorBinding"); } else { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java?rev=952931&r1=952930&r2=952931&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java Wed Jun 9 09:49:08 2010 @@ -49,7 +49,6 @@ import javax.enterprise.inject.spi.Annot import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; import javax.enterprise.inject.spi.ObserverMethod; -import javax.enterprise.inject.spi.ProcessInjectionTarget; import javax.inject.Inject; import javax.inject.Named; import javax.interceptor.Interceptor; @@ -65,7 +64,6 @@ import org.apache.webbeans.component.Pro import org.apache.webbeans.component.ResourceBean; import org.apache.webbeans.component.WebBeansType; import org.apache.webbeans.component.creation.AnnotatedTypeBeanCreatorImpl; -import org.apache.webbeans.component.creation.ManagedBeanCreatorImpl; import org.apache.webbeans.config.DefinitionUtil; import org.apache.webbeans.config.OWBLogConst; import org.apache.webbeans.config.OpenWebBeansConfiguration; @@ -259,9 +257,11 @@ public final class WebBeansAnnotatedType Annotation[] annot = AnnotationUtil.getAnnotatedMethodFirstParameterQualifierWithGivenAnnotation(annotatedMethod, Disposes.class); Set> set = InjectionResolver.getInstance().implResolveByType(type, annot); - if (set.isEmpty()) { + if (set.isEmpty()) + { throw new UnsatisfiedResolutionException("Producer method component of the disposal method : " + declaredMethod.getName() + - " in class : " + declaredMethod.getDeclaringClass().getName() + ". Cannot find bean " + type + " with qualifier " + Arrays.toString(annot)); + " in class : " + declaredMethod.getDeclaringClass().getName() + ". Cannot find bean " + type + " with qualifier " + + Arrays.toString(annot)); } Bean foundBean = set.iterator().next(); @@ -426,7 +426,8 @@ public final class WebBeansAnnotatedType //WebBeansUtil.checkForValidResources(annotatedField.getDeclaringType().getJavaClass(), field.getType(), field.getName(), anns); if(!ClassUtil.isStatic(field.getModifiers())) { - ResourceReference resourceRef = new ResourceReference(bean.getBeanClass(), field.getName(), (Class)field.getType(), resourceAnnotation); + ResourceReference resourceRef = new ResourceReference(bean.getBeanClass(), field.getName(), + (Class)field.getType(), resourceAnnotation); //Can not define EL name if(annotatedField.isAnnotationPresent(Named.class)) @@ -649,8 +650,6 @@ public final class WebBeansAnnotatedType throw new WebBeansConfigurationException("Error in definining disposal method of annotated method : " + annotatedMethod + ". Multiple disposes annotation."); } - else - found = true; } } @@ -793,7 +792,8 @@ public final class WebBeansAnnotatedType managedBeanCreator.defineStereoTypes(); //Scope type - managedBeanCreator.defineScopeType(logger.getTokenString(OWBLogConst.TEXT_MB_IMPL) + clazz.getName() + logger.getTokenString(OWBLogConst.TEXT_SAME_SCOPE)); + managedBeanCreator.defineScopeType(logger.getTokenString(OWBLogConst.TEXT_MB_IMPL) + clazz.getName() + + logger.getTokenString(OWBLogConst.TEXT_SAME_SCOPE)); //Check for Enabled via Alternative WebBeansUtil.setInjectionTargetBeanEnableFlag(managedBean); managedBeanCreator.defineApiType(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java?rev=952931&r1=952930&r2=952931&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java Wed Jun 9 09:49:08 2010 @@ -18,7 +18,6 @@ */ package org.apache.webbeans.util; -import javax.enterprise.inject.spi.BeanManager; /** * Web beans related constants. @@ -120,7 +119,7 @@ public final class WebBeansConstants public static final String WEB_BEANS_XML_ARRAY_ELEMENT = "Array"; - /**JNDI name of the {@link BeanManager} instance*/ + /**JNDI name of the {@link javax.enterprise.inject.spi.BeanManager} instance*/ public static final String WEB_BEANS_MANAGER_JNDI_NAME = "java:comp/BeanManager"; } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=952931&r1=952930&r2=952931&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Wed Jun 9 09:49:08 2010 @@ -1143,10 +1143,12 @@ public final class WebBeansUtil Class[] params = clazzParameters.toArray(new Class[0]); if (params.length != 1 || !params[0].equals(InvocationContext.class)) + { throw new WebBeansConfigurationException("@" + annot.getSimpleName() + " annotated method : " + method.getJavaMember().getName() + " in class : " + annotatedType.getJavaClass().getName() + " can not take any formal arguments other than InvocationContext"); - + } + if (!ClassUtil.getReturnType(method.getJavaMember()).equals(Object.class)) { throw new WebBeansConfigurationException("@" + annot.getSimpleName() + " annotated method : " @@ -1406,7 +1408,6 @@ public final class WebBeansUtil /** * Returns true if array contains the StereoType meta annotation * - * @param anns annotation array * @return true if array contains the StereoType meta annotation */ public static boolean isComponentHasStereoType(OwbBean component) @@ -1647,10 +1648,10 @@ public final class WebBeansUtil Bean superBean = null; Bean specialized = null; - Set> resolvers = null; + Set> resolvers = isConfiguredWebBeans(specializedClass, true); AlternativesManager altManager = AlternativesManager.getInstance(); - if ((resolvers = isConfiguredWebBeans(specializedClass, true)) != null) + if (resolvers != null) { if(resolvers.isEmpty()) { @@ -1769,7 +1770,11 @@ public final class WebBeansUtil */ protected static void configSpecializedProducerMethodBeans(List sortedProducerBeans) { - if (sortedProducerBeans.isEmpty()) return; + if (sortedProducerBeans.isEmpty()) + { + return; + } + AlternativesManager altManager = AlternativesManager.getInstance(); Method superMethod = sortedProducerBeans.get(0).getCreatorMethod(); @@ -1814,7 +1819,9 @@ public final class WebBeansUtil public static void configureProducerMethodSpecializations() { Method method; - ProducerMethodBean pbean, pLeft, pRight; + ProducerMethodBean pbean; + ProducerMethodBean pLeft; + ProducerMethodBean pRight; logger.debug("configure Specialized producer beans has started."); @@ -1865,7 +1872,10 @@ public final class WebBeansUtil break; } } - if (pbean == null) break; + if (pbean == null) + { + break; + } pLeft = pRight = pbean; boolean pLeftContinue = true; @@ -1879,7 +1889,7 @@ public final class WebBeansUtil { //left if (pLeft!= null && - pLeft.getBeanClass().getSuperclass().equals(pb.getBeanClass())) + pLeft.getBeanClass().getSuperclass().equals(pb.getBeanClass())) { Method superMethod = ClassUtil.getClassMethodWithTypes(pb.getBeanClass(), method.getName(), Arrays.asList(method.getParameterTypes())); @@ -1894,7 +1904,10 @@ public final class WebBeansUtil { pLeft = null; } - if (pLeft != null) pLeftContinue = true; + if (pLeft != null) + { + pLeftContinue = true; + } } //right if (pRight != null && @@ -2505,7 +2518,7 @@ public final class WebBeansUtil /** * Returns ProcessAnnotatedType event. * @param bean type - * @param clazz bean class + * @param annotatedType bean class * @return event */ public static GProcessAnnotatedType fireProcessAnnotatedTypeEvent(AnnotatedType annotatedType) @@ -2541,7 +2554,6 @@ public final class WebBeansUtil /** * Returns ProcessInjectionTarget event. * @param bean type - * @param bean bean instance * @return event */ public static GProcessInjectionTarget fireProcessInjectionTargetEventForJavaEeComponents(Class componentClass)