You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2010/09/30 12:19:45 UTC
svn commit: r1002992 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
component/ config/ inject/ util/
Author: struberg
Date: Thu Sep 30 10:19:45 2010
New Revision: 1002992
URL: http://svn.apache.org/viewvc?rev=1002992&view=rev
Log:
fix FindBugs and PMD issues
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.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/component/EventBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java?rev=1002992&r1=1002991&r2=1002992&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java Thu Sep 30 10:19:45 2010
@@ -37,6 +37,7 @@ import org.apache.webbeans.exception.Web
*/
public class EventBean<T> extends AbstractOwbBean<Event<T>>
{
+ // TODO refactor. public static variables are uterly ugly
public static ThreadLocal<InjectionPoint> local = new ThreadLocal<InjectionPoint>();
/**
@@ -61,7 +62,7 @@ public class EventBean<T> extends Abstra
if(injectionPoint != null)
{
- Type[] eventActualTypeArgs = new Type[0];
+ Type[] eventActualTypeArgs;
Type type = injectionPoint.getType();
ParameterizedType pt = (ParameterizedType) type;
eventActualTypeArgs = pt.getActualTypeArguments();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java?rev=1002992&r1=1002991&r2=1002992&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java Thu Sep 30 10:19:45 2010
@@ -27,6 +27,7 @@ import org.apache.webbeans.annotation.De
public class InjectionPointBean extends AbstractOwbBean<InjectionPoint>
{
+ // TODO refactor. public static variables are uterly ugly
public static ThreadLocal<InjectionPoint> local = new ThreadLocal<InjectionPoint>();
public InjectionPointBean()
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java?rev=1002992&r1=1002991&r2=1002992&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java Thu Sep 30 10:19:45 2010
@@ -20,6 +20,7 @@ package org.apache.webbeans.component;
import java.lang.annotation.Annotation;
import java.lang.reflect.ParameterizedType;
+import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.Instance;
@@ -31,6 +32,7 @@ import org.apache.webbeans.inject.instan
public class InstanceBean<T> extends AbstractOwbBean<Provider<T>>
{
+ // TODO refactor. public static variables are uterly ugly
public static ThreadLocal<InjectionPoint> local = new ThreadLocal<InjectionPoint>();
@SuppressWarnings("serial")
@@ -46,8 +48,9 @@ public class InstanceBean<T> extends Abs
try
{
ParameterizedType injectedType = (ParameterizedType)local.get().getType();
+ Set<Annotation> qualifiers = local.get().getQualifiers();
Instance<T> instance = InstanceFactory.getInstance(injectedType.getActualTypeArguments()[0],
- local.get().getQualifiers().toArray(new Annotation[0]));
+ qualifiers.toArray(new Annotation[qualifiers.size()]));
return instance;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java?rev=1002992&r1=1002991&r2=1002992&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java Thu Sep 30 10:19:45 2010
@@ -38,7 +38,7 @@ import org.apache.webbeans.util.WebBeans
public class ProducerFieldBean<T> extends AbstractProducerBean<T> implements IBeanHasParent<T>
{
/** Producer field that defines the component */
- private Field producerField;
+ private Field producerField = null;
/**
* Defines the new producer field component.
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java?rev=1002992&r1=1002991&r2=1002992&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java Thu Sep 30 10:19:45 2010
@@ -954,7 +954,7 @@ public final class DefinitionUtil
continue;
}
- checkForInjectedInitializerMethod(component, clazz, method);
+ checkForInjectedInitializerMethod(clazz, method);
}
else
{
@@ -995,7 +995,7 @@ public final class DefinitionUtil
/**
* add the definitions for a @Initializer method.
*/
- private static <T> void checkForInjectedInitializerMethod(AbstractInjectionTargetBean<T> component, Class<T> clazz, Method method)
+ private static <T> void checkForInjectedInitializerMethod(Class<T> clazz, Method method)
{
TypeVariable<?>[] args = method.getTypeParameters();
if(args.length > 0)
@@ -1149,15 +1149,10 @@ public final class DefinitionUtil
public static void addImplicitComponentForInjectionPoint(InjectionPoint injectionPoint)
{
- if(WebBeansUtil.checkObtainsInjectionPointConditions(injectionPoint))
+ if(!WebBeansUtil.checkObtainsInjectionPointConditions(injectionPoint))
{
- //Do nothing
+ EventUtil.checkObservableInjectionPointConditions(injectionPoint);
}
- else if(EventUtil.checkObservableInjectionPointConditions(injectionPoint))
- {
- //Do nothing
- //WebBeansUtil.addInjectedImplicitEventComponent(injectionPoint);
- }
}
public static <X> Set<ProducerMethodBean<?>> defineProducerMethods(InjectionTargetBean<X> bean, AnnotatedType<X> annotatedType)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java?rev=1002992&r1=1002991&r2=1002992&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java Thu Sep 30 10:19:45 2010
@@ -137,7 +137,7 @@ public class InjectableMethods<T> extend
SecurityUtil.doPrivilegedSetAccessible(method, true);
}
- return (T) method.invoke(instance, list.toArray());
+ return (T) method.invoke(instance, list.toArray(new Object[list.size()]));
}
catch (Exception e)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java?rev=1002992&r1=1002991&r2=1002992&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java Thu Sep 30 10:19:45 2010
@@ -378,9 +378,8 @@ public final class AnnotationUtil
Annotation[][] parameterAnns = method.getParameterAnnotations();
List<Annotation> list = new ArrayList<Annotation>();
- Annotation[] result = null;
+ Annotation[] result;
- int index = 0;
for (Annotation[] parameters : parameterAnns)
{
boolean found = false;
@@ -406,9 +405,6 @@ public final class AnnotationUtil
result = list.toArray(result);
return result;
}
-
- index++;
-
}
result = new Annotation[0];
return result;
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=1002992&r1=1002991&r2=1002992&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 Thu Sep 30 10:19:45 2010
@@ -451,12 +451,10 @@ public final class WebBeansUtil
Constructor<T> result = null;
boolean inAnnotation = false;
- int j = 0;
/* Check for @Initializer */
for (Constructor<T> constructor : constructors)
{
- j++;
if (constructor.getAnnotation(Inject.class) != null)
{
if (inAnnotation == true)// duplicate @In
@@ -521,11 +519,8 @@ public final class WebBeansUtil
Constructor<?>[] constructors = ClassUtil.getConstructors(clazz);
- int j = 0;
-
for (Constructor<?> constructor : constructors)
{
- j++;
if (constructor.getAnnotation(Inject.class) != null)
{
return true;
@@ -2418,7 +2413,7 @@ public final class WebBeansUtil
{
if (additionalScope.getScope().equals(scopeType))
{
- isNormal = new Boolean(additionalScope.isNormal());
+ isNormal = additionalScope.isNormal() ? Boolean.TRUE : Boolean.FALSE;
isScopeTypeNormalCache.put(scopeType, isNormal);
return isNormal.booleanValue();
}