openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1523424 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/component/ main/java/org/apache/webbeans/component/creation/ main/java/org/apache/webbeans/config/ main/java/org/apache/webbeans/container/ main/java/org/apa...
Date Sun, 15 Sep 2013 09:53:44 GMT
Author: struberg
Date: Sun Sep 15 09:53:43 2013
New Revision: 1523424

URL: http://svn.apache.org/r1523424
Log:
OWB-899 code cleanup

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbParametrizedTypeImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/factory/SubPackageInterceptedClass.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
Sun Sep 15 09:53:43 2013
@@ -46,7 +46,7 @@ public class AbstractProducerBean<T> ext
      * Create a new instance.
      * 
      * @param returnType bean type info
-     * @param ownerComponent owner bean
+     * @param ownerBeanClass class which contains this producer method or field
      */
     public AbstractProducerBean(Class<?> ownerBeanClass,
             WebBeansContext webBeansContext,
@@ -57,7 +57,7 @@ public class AbstractProducerBean<T> ext
     {
         super(webBeansContext, webBeansType, beanAttributes, ownerBeanClass, !returnType.isPrimitive());
         this.returnType = returnType;
-        this.producer = producerFactory.createProducer(this);
+        producer = producerFactory.createProducer(this);
     }
 
     @Override

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
Sun Sep 15 09:53:43 2013
@@ -48,7 +48,7 @@ public abstract class BuiltInOwbBean<T> 
     {
         super(webBeansContext, webBeansType, beanAttributes, returnType, nullable);
         Asserts.assertNotNull(producerFactory, "ProducerFactory may not be null");
-        this.producer = producerFactory.createProducer(this);
+        producer = producerFactory.createProducer(this);
     }
     
     @Override

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
Sun Sep 15 09:53:43 2013
@@ -80,7 +80,7 @@ public class InjectionTargetBean<T> exte
         super(webBeansContext, webBeansType, beanAttributes, beanClass, false);
         Asserts.assertNotNull(annotatedType, "AnnotatedType may not be null");
         this.annotatedType = annotatedType;
-        this.injectionTarget = factory.createInjectionTarget(this);
+        injectionTarget = factory.createInjectionTarget(this);
         setEnabled(true);
     }
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
Sun Sep 15 09:53:43 2013
@@ -86,7 +86,7 @@ public abstract class InterceptorBean<T>
             }
         }
 
-        this.aroundConstructMethod = aroundConstruct;
+        aroundConstructMethod = aroundConstruct;
         if (aroundConstructMethod != null && !aroundConstructMethod.isAccessible())
         {
             aroundConstructMethod.setAccessible(true);
@@ -231,7 +231,7 @@ public abstract class InterceptorBean<T>
             this.interceptor = interceptor;
             this.interceptionType = interceptionType;
             this.instance = instance;
-            this.currentInterceptorIdx = 0; // we start with method 0
+            currentInterceptorIdx = 0; // we start with method 0
         }
 
         public int getCurrentInterceptorIdx()

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
Sun Sep 15 09:53:43 2013
@@ -39,7 +39,7 @@ public abstract class AbstractProducerBe
         Asserts.assertNotNull(annotated, "annotated may not be null");
         Asserts.assertNotNull(beanAttributes, "beanAttributes may not be null");
         this.parent = parent;
-        this.annotatedMember = annotated;
+        annotatedMember = annotated;
         this.beanAttributes = beanAttributes;
     }
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
Sun Sep 15 09:53:43 2013
@@ -34,7 +34,7 @@ public class ExtensionBeanBuilder<T>
         Asserts.assertNotNull(webBeansContext, "webBeansContext may not be null");
         Asserts.assertNotNull(type, "type may not be null");
         this.webBeansContext = webBeansContext;
-        this.annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(type);
+        annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(type);
     }
 
     public AnnotatedType<T> getAnnotatedType()

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbParametrizedTypeImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbParametrizedTypeImpl.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbParametrizedTypeImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbParametrizedTypeImpl.java
Sun Sep 15 09:53:43 2013
@@ -46,7 +46,7 @@ public class OwbParametrizedTypeImpl imp
     public OwbParametrizedTypeImpl(Type owner, Type raw, Type... types)
     {
         this.owner = owner;
-        this.rawType = raw;
+        rawType = raw;
         this.types = types;
     }
     

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
Sun Sep 15 09:53:43 2013
@@ -46,17 +46,17 @@ public final class BeanCacheKey
         final int length = qualifiers != null ? qualifiers.length : 0;
         if (length == 0)
         {
-            this.qualifier = null;
+            qualifier = null;
             this.qualifiers = null;
         }
         else if (length == 1)
         {
-            this.qualifier = qualifiers[0];
+            qualifier = qualifiers[0];
             this.qualifiers = null;
         }
         else
         {
-            this.qualifier = null;
+            qualifier = null;
             // to save array creations, we only create an array, if we have more than one
annotation
             this.qualifiers = new Annotation[length];
             System.arraycopy(qualifiers, 0, this.qualifiers, 0, length);

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java
Sun Sep 15 09:53:43 2013
@@ -72,7 +72,7 @@ public class InjectableBeanManager exten
 
     public InjectableBeanManager(BeanManagerImpl beanManager)
     {
-        this.bm = beanManager;
+        bm = beanManager;
     }
 
     @Override

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
Sun Sep 15 09:53:43 2013
@@ -85,7 +85,7 @@ public class CreationalContextImpl<T> im
     {
         if (contextual instanceof Bean)
         {
-            this.bean = (Bean<T>)contextual;
+            bean = (Bean<T>)contextual;
         }
         this.contextual = contextual;
         this.webBeansContext = webBeansContext;
@@ -98,7 +98,7 @@ public class CreationalContextImpl<T> im
 
     public T getDelegate()
     {
-        return this.delegate;
+        return delegate;
     }
 
     /**

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
Sun Sep 15 09:53:43 2013
@@ -269,6 +269,6 @@ public class ConversationManager
     
     public Map<Conversation, ConversationContext> getAllConversationContexts()
     {
-        return this.conversations;
+        return conversations;
     }
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java
Sun Sep 15 09:53:43 2013
@@ -75,8 +75,8 @@ public class InjectableMethod<T> extends
     {
         super(owner,creationalContext);
         method = m;
-        this.ownerInstance = instance;
-        this.injectionPoints = ips;
+        ownerInstance = instance;
+        injectionPoints = ips;
     }
 
     /*

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
Sun Sep 15 09:53:43 2013
@@ -89,12 +89,12 @@ class InjectionPointImpl implements Inje
         Asserts.assertNotNull(annotated, "annotated may not be null");
         Asserts.assertNotNull(member, "member may not be null");
         this.ownerBean = ownerBean;
-        this.injectionType = type;
-        this.qualifierAnnotations = Collections.unmodifiableSet(new HashSet<Annotation>(qualifiers));
+        injectionType = type;
+        qualifierAnnotations = Collections.unmodifiableSet(new HashSet<Annotation>(qualifiers));
         this.annotated = annotated;
-        this.injectionMember = member;
+        injectionMember = member;
         this.delegate = delegate;
-        this.transientt = isTransient;
+        transientt = isTransient;
         if(!WebBeansUtil.checkObtainsInjectionPointConditions(this))
         {
             EventUtil.checkObservableInjectionPointConditions(this);

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
Sun Sep 15 09:53:43 2013
@@ -84,7 +84,7 @@ public class InstanceImpl<T> implements 
     {
         this.injectionClazz = injectionClazz;
         this.injectionPoint = injectionPoint;
-        this.parentCreationalContext = creationalContext;
+        parentCreationalContext = creationalContext;
 
         for (Annotation ann : annotations)
         {
@@ -154,15 +154,14 @@ public class InstanceImpl<T> implements 
 
         InjectionResolver injectionResolver = webBeansContext.getBeanManagerImpl().getInjectionResolver();
 
-        InjectionResolver resolver = injectionResolver;
         Bean<?> injectionPointBean = injectionPoint.getBean();
         Class<?> injectionPointClass = null;
         if (injectionPointBean != null)
         {
             injectionPointClass = injectionPointBean.getBeanClass();
         }
-        Set<Bean<?>> beans = resolver.implResolveByType(false, injectionClazz,
injectionPointClass, anns);
-        return resolver.resolveAll(beans);
+        Set<Bean<?>> beans = injectionResolver.implResolveByType(false, injectionClazz,
injectionPointClass, anns);
+        return injectionResolver.resolveAll(beans);
     }
     
     /**
@@ -194,9 +193,7 @@ public class InstanceImpl<T> implements 
     public Instance<T> select(Annotation... qualifiers)
     {
         Annotation[] newQualifiersArray = getAdditionalQualifiers(qualifiers);
-        InstanceImpl<T> newInstance = new InstanceImpl<T>(injectionClazz, injectionPoint,
webBeansContext, parentCreationalContext, newQualifiersArray);
-
-        return newInstance;
+        return new InstanceImpl<T>(injectionClazz, injectionPoint, webBeansContext,
parentCreationalContext, newQualifiersArray);
     }
 
     /**
@@ -246,9 +243,7 @@ public class InstanceImpl<T> implements 
         
         Annotation[] newQualifiers = getAdditionalQualifiers(qualifiers);
         
-        InstanceImpl<U> newInstance = new InstanceImpl<U>(sub, injectionPoint,
webBeansContext, parentCreationalContext, newQualifiers);
-                    
-        return newInstance;
+        return new InstanceImpl<U>(sub, injectionPoint, webBeansContext, parentCreationalContext,
newQualifiers);
     }
 
     /**

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java
Sun Sep 15 09:53:43 2013
@@ -62,7 +62,7 @@ public class DecoratorHandler implements
     public DecoratorHandler(BeanInterceptorInfo interceptorInfo, Map<Decorator<?>,
?> instances, int index, Object target, String passivationId)
     {
         this.interceptorInfo = interceptorInfo;
-        this.decorators = interceptorInfo.getDecorators();
+        decorators = interceptorInfo.getDecorators();
         this.instances = instances;
         this.index = index;
         this.target = target;

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
Sun Sep 15 09:53:43 2013
@@ -31,7 +31,7 @@ public class InterceptorComparator<T> im
 
     public InterceptorComparator(WebBeansContext webBeansContext)
     {
-        this.interceptorsManager = webBeansContext.getInterceptorsManager();
+        interceptorsManager = webBeansContext.getInterceptorsManager();
     }
 
     @Override

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
Sun Sep 15 09:53:43 2013
@@ -119,8 +119,8 @@ public class NormalScopedBeanInterceptor
     protected Object readResolve() throws ObjectStreamException
     {
         WebBeansContext webBeansContext = WebBeansContext.getInstance();
-        this.beanManager = webBeansContext.getBeanManagerImpl();
-        this.bean = beanManager.getPassivationCapableBean(beanPassivationId);
+        beanManager = webBeansContext.getBeanManagerImpl();
+        bean = beanManager.getPassivationCapableBean(beanPassivationId);
 
         return webBeansContext.getNormalScopeProxyFactory().createNormalScopeProxy(bean);
     }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
Sun Sep 15 09:53:43 2013
@@ -53,9 +53,6 @@ public abstract class AbstractLifeCycle 
     /**Deploy discovered beans*/
     private final BeansDeployer deployer;
 
-    /**XML discovery. */
-    private final WebBeansXMLConfigurator xmlDeployer;
-    
     /**Using for lookup operations*/
     private final JNDIService jndiService;
     
@@ -79,8 +76,10 @@ public abstract class AbstractLifeCycle 
 
         this.webBeansContext = webBeansContext;
         beanManager = this.webBeansContext.getBeanManagerImpl();
-        xmlDeployer = new WebBeansXMLConfigurator();
+
+        WebBeansXMLConfigurator xmlDeployer = new WebBeansXMLConfigurator();
         deployer = new BeansDeployer(xmlDeployer, this.webBeansContext);
+
         jndiService = this.webBeansContext.getService(JNDIService.class);
         beanManager.setXMLConfigurator(xmlDeployer);
         scannerService = this.webBeansContext.getScannerService();

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java
Sun Sep 15 09:53:43 2013
@@ -43,7 +43,7 @@ public class AbstractDecoratorInjectionT
     protected AnnotatedConstructor<T> createConstructor()
     {
         // create proxy subclass
-        ClassLoader classLoader = this.getClass().getClassLoader();
+        ClassLoader classLoader = getClass().getClassLoader();
         Class<T> classToProxy = annotatedType.getJavaClass();
 
         proxySubClass = webBeansContext.getSubclassProxyFactory().createImplementedSubclass(classLoader,
classToProxy);

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
Sun Sep 15 09:53:43 2013
@@ -149,17 +149,17 @@ public class InjectionTargetImpl<T> exte
         this.webBeansContext = webBeansContext;
         this.postConstructMethods = postConstructMethods;
         this.preDestroyMethods = preDestroyMethods;
-        this.noProxy = false;
+        noProxy = false;
     }
 
     public InjectionTargetImpl(final InjectionTargetImpl<T> delegate)
     {
         super(delegate.getInjectionPoints());
-        this.noProxy = true;
-        this.annotatedType = delegate.annotatedType;
-        this.webBeansContext = delegate.webBeansContext;
-        this.postConstructMethods = delegate.postConstructMethods;
-        this.preDestroyMethods = delegate.preDestroyMethods;
+        noProxy = true;
+        annotatedType = delegate.annotatedType;
+        webBeansContext = delegate.webBeansContext;
+        postConstructMethods = delegate.postConstructMethods;
+        preDestroyMethods = delegate.preDestroyMethods;
     }
 
     public BeanInterceptorInfo getInterceptorInfo()
@@ -176,7 +176,7 @@ public class InjectionTargetImpl<T> exte
         this.methodInterceptors = methodInterceptors;
         this.postConstructInterceptors = postConstructInterceptors;
         this.preDestroyInterceptors = preDestroyInterceptors;
-        this.aroundConstructInterceptors = aroundConstruct;
+        aroundConstructInterceptors = aroundConstruct;
         this.beanPassivationId = beanPassivationId;
     }
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java
Sun Sep 15 09:53:43 2013
@@ -74,7 +74,7 @@ public class InstanceProducer<T> extends
             else
             {
                 qualifiers = this.qualifiers;
-                type = this.returnType;
+                type = returnType;
             }
 
             Instance<T> instance = new InstanceImpl<T>(type, injectionPoint,
webBeansContext, creationalContextImpl, qualifiers.toArray(new Annotation[qualifiers.size()]));

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java
Sun Sep 15 09:53:43 2013
@@ -48,7 +48,7 @@ public class ProducerFieldProducer<T, P>
         Asserts.assertNotNull(producerField, "field may not be null");
         Asserts.assertNotNull(context, "WebBeansContext may not be null");
         this.owner = owner;
-        this.webBeansContext = context;
+        webBeansContext = context;
         this.producerField = producerField;
     }
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java
Sun Sep 15 09:53:43 2013
@@ -70,7 +70,7 @@ public class ProducerMethodProducer<T, P
             this.producerMethod = ejbPlugin.resolveViewMethod(owner, producerMethod.getJavaMember());
             if (disposerMethod != null)
             {
-                this.disposalMethod = ejbPlugin.resolveViewMethod(owner, disposerMethod.getJavaMember());
+                disposalMethod = ejbPlugin.resolveViewMethod(owner, disposerMethod.getJavaMember());
             }
         }
         else
@@ -78,7 +78,7 @@ public class ProducerMethodProducer<T, P
             this.producerMethod = producerMethod.getJavaMember();
             if (disposerMethod != null)
             {
-                this.disposalMethod = disposerMethod.getJavaMember();
+                disposalMethod = disposerMethod.getJavaMember();
             }
         }
     }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java
Sun Sep 15 09:53:43 2013
@@ -41,7 +41,7 @@ public class ProviderBasedProducerFactor
         Asserts.assertNotNull(context);
         this.provider = provider;
         this.providerType = providerType;
-        this.webBeansContext = context;
+        webBeansContext = context;
         this.proxy = proxy;
     }
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
Sun Sep 15 09:53:43 2013
@@ -603,7 +603,7 @@ public abstract class AbstractProxyFacto
 
         this.unsafe = unsafe;
 
-        this.unsafeAllocateInstance = AccessController.doPrivileged(new PrivilegedAction<Method>()
+        unsafeAllocateInstance = AccessController.doPrivileged(new PrivilegedAction<Method>()
         {
             @Override
             public Method run()

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
Sun Sep 15 09:53:43 2013
@@ -851,7 +851,7 @@ public final class ClassUtil
         Class<?> clazz = ClassUtil.getClass(type);
         Asserts.nullCheckForClass(clazz);
         
-        return (clazz.getTypeParameters().length > 0) ? true : false;
+        return clazz.getTypeParameters().length > 0;
     }
 
     /**

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java
Sun Sep 15 09:53:43 2013
@@ -522,7 +522,7 @@ public final class GenericsUtil
 
         private TypeVariableResolver(List<TypeVariableDeclaration> implementation)
         {
-            this.declarations = implementation;
+            declarations = implementation;
         }
 
         public TypeVariableResolver(Class<?> subclass, Class<?> declaringClass)

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/factory/SubPackageInterceptedClass.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/factory/SubPackageInterceptedClass.java?rev=1523424&r1=1523423&r2=1523424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/factory/SubPackageInterceptedClass.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/factory/SubPackageInterceptedClass.java
Sun Sep 15 09:53:43 2013
@@ -34,7 +34,6 @@ import org.apache.webbeans.test.componen
 @RequestScoped
 public class SubPackageInterceptedClass extends SomeBaseClass
 {
-    private boolean defaultCtInvoked = false;
 
     private int meaningOfLife;
     private float f;
@@ -42,7 +41,6 @@ public class SubPackageInterceptedClass 
 
     public SubPackageInterceptedClass()
     {
-        defaultCtInvoked = true;
     }
 
     @PostConstruct



Mime
View raw message