Author: struberg
Date: Tue Mar 15 09:26:09 2011
New Revision: 1081691
URL: http://svn.apache.org/viewvc?rev=1081691&view=rev
Log:
OWB-503 reduce usage of 1-line static methods
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.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/WebBeansAnnotatedTypeUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java?rev=1081691&r1=1081690&r2=1081691&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
(original)
+++
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
Tue Mar 15 09:26:09 2011
@@ -41,6 +41,8 @@ import org.apache.webbeans.util.ClassUti
*/
public abstract class BaseEjbBean<T> extends AbstractInjectionTargetBean<T>
implements EnterpriseBeanMarker
{
+ public static final Object[] OBJECT_EMPTY = new Object[0];
+
/**Session bean type*/
protected final SessionBeanType ejbType;
@@ -152,14 +154,14 @@ public abstract class BaseEjbBean<T> ext
Method removeMeth = null;
for (Method m : getRemoveMethods())
{
- // FIXME: This needs to call an API from the EJB
+ // TODO FIXME: This needs to call an API from the EJB
// container to remove the EJB instance directly,
// not via a remove method. For now, just call 1
// remove method directly on the EJB
try
{
removeMeth = proxyInstance.getClass().getMethod(m.getName(),
m.getParameterTypes());
- ClassUtil.callInstanceMethod(removeMeth, proxyInstance,
ClassUtil.OBJECT_EMPTY);
+ ClassUtil.callInstanceMethod(removeMeth, proxyInstance,
OBJECT_EMPTY);
}
catch (NoSuchMethodException e)
{
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java?rev=1081691&r1=1081690&r2=1081691&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
(original)
+++
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
Tue Mar 15 09:26:09 2011
@@ -20,6 +20,7 @@ package org.apache.webbeans.ejb.common.u
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -50,7 +51,6 @@ import org.apache.webbeans.portable.even
import org.apache.webbeans.portable.events.ProcessProducerImpl;
import org.apache.webbeans.portable.events.ProcessSessionBeanImpl;
import org.apache.webbeans.portable.events.generics.GProcessSessionBean;
-import org.apache.webbeans.util.ClassUtil;
import org.apache.webbeans.util.WebBeansUtil;
@SuppressWarnings("unchecked")
@@ -189,7 +189,7 @@ public final class EjbUtility
for(ProducerMethodBean<?> producerMethodBean : producerMethodBeans)
{
Method producerMethod = producerMethodBean.getCreatorMethod();
- if(!ClassUtil.isStatic(producerMethod.getModifiers()))
+ if(!Modifier.isStatic(producerMethod.getModifiers()))
{
if(!isBusinessMethod(producerMethod, bean))
{
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java?rev=1081691&r1=1081690&r2=1081691&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
(original)
+++
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
Tue Mar 15 09:26:09 2011
@@ -20,6 +20,7 @@ package org.apache.webbeans.ejb.common.u
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -156,7 +157,7 @@ public final class EjbValidator
if(!found)
{
- if(!ClassUtil.isStatic(method.getModifiers()))
+ if(!Modifier.isStatic(method.getModifiers()))
{
throw new WebBeansConfigurationException("Observer
method : " + method.getName() + " in session bean class : " +
bean.getBeanClass() + " must be business
method");
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=1081691&r1=1081690&r2=1081691&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
Tue Mar 15 09:26:09 2011
@@ -759,7 +759,7 @@ public final class DefinitionUtil
if (AnnotationUtil.hasMethodAnnotation(declaredMethod,
Specializes.class))
{
- if (ClassUtil.isStatic(declaredMethod.getModifiers()))
+ if (Modifier.isStatic(declaredMethod.getModifiers()))
{
throw new WebBeansConfigurationException("Specializing
producer method : " + declaredMethod.getName() + " in class : " +
clazz.getName()
+ " can not be
static");
@@ -824,7 +824,7 @@ public final class DefinitionUtil
{
//Check for valid resource annotation
//WebBeansUtil.checkForValidResources(field.getDeclaringClass(),
field.getType(), field.getName(), field.getDeclaredAnnotations());
- if(!ClassUtil.isStatic(field.getModifiers()))
+ if(!Modifier.isStatic(field.getModifiers()))
{
ResourceReference<T,Annotation> resourceRef = new
ResourceReference<T, Annotation>(field.getDeclaringClass(),
field.getName(),returnType, resourceAnnotation);
@@ -986,7 +986,7 @@ public final class DefinitionUtil
for (Field field : fields)
{
//Check for public fields
- if(ClassUtil.isPublic(field.getModifiers()) &&
!ClassUtil.isStatic(field.getModifiers()))
+ if(ClassUtil.isPublic(field.getModifiers()) &&
!Modifier.isStatic(field.getModifiers()))
{
if(webBeansContext.getBeanManagerImpl().isNormalScope(component.getScope()))
{
@@ -1077,7 +1077,7 @@ public final class DefinitionUtil
if (isInitializer)
{
//Do not support static
- if(ClassUtil.isStatic(method.getModifiers()))
+ if(Modifier.isStatic(method.getModifiers()))
{
continue;
}
@@ -1329,7 +1329,7 @@ public final class DefinitionUtil
if (AnnotationUtil.hasAnnotation(anns, Specializes.class))
{
- if
(ClassUtil.isStatic(annotatedMethod.getJavaMember().getModifiers()))
+ if
(Modifier.isStatic(annotatedMethod.getJavaMember().getModifiers()))
{
throw new WebBeansConfigurationException("Specializing
producer method : " + annotatedMethod.getJavaMember().getName() + " in class :
" + clazz.getName()
+ " can not be
static");
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java?rev=1081691&r1=1081690&r2=1081691&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
Tue Mar 15 09:26:09 2011
@@ -20,6 +20,7 @@ package org.apache.webbeans.decorator;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Iterator;
@@ -114,7 +115,7 @@ public final class DecoratorUtil
for (Method method : methods)
{
int modifiers = method.getModifiers();
- if (!ClassUtil.isStatic(modifiers) &&
!ClassUtil.isPrivate(modifiers) && ClassUtil.isFinal(modifiers))
+ if (!Modifier.isStatic(modifiers) &&
!Modifier.isPrivate(modifiers) && ClassUtil.isFinal(modifiers))
{
// Check decorator implements this
Iterator<Decorator<?>> itDecorator =
decoratorList.iterator();
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=1081691&r1=1081690&r2=1081691&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
Tue Mar 15 09:26:09 2011
@@ -183,7 +183,7 @@ public final class InterceptorUtil
{
if
(!ClassUtil.isMethodHasCheckedException(method.getJavaMember()))
{
- if
(!ClassUtil.isStatic(method.getJavaMember().getModifiers()) &&
!ClassUtil.isFinal(method.getJavaMember().getModifiers()))
+ if
(!Modifier.isStatic(method.getJavaMember().getModifiers()) &&
!ClassUtil.isFinal(method.getJavaMember().getModifiers()))
{
return true;
}
@@ -215,7 +215,7 @@ public final class InterceptorUtil
{
if (ClassUtil.isMethodHasException(method))
{
- if (!ClassUtil.isStatic(method.getModifiers())
&& !ClassUtil.isFinal(method.getModifiers()))
+ if (!Modifier.isStatic(method.getModifiers())
&& !ClassUtil.isFinal(method.getModifiers()))
{
return true;
}
@@ -250,7 +250,7 @@ public final class InterceptorUtil
{
if (!ClassUtil.isMethodHasCheckedException(method))
{
- if (!ClassUtil.isStatic(method.getModifiers()))
+ if (!Modifier.isStatic(method.getModifiers()))
{
return true;
}
@@ -293,7 +293,7 @@ public final class InterceptorUtil
{
if
(!ClassUtil.isMethodHasCheckedException(method.getJavaMember()))
{
- if
(!ClassUtil.isStatic(method.getJavaMember().getModifiers()))
+ if
(!Modifier.isStatic(method.getJavaMember().getModifiers()))
{
return true;
}
@@ -438,7 +438,7 @@ public final class InterceptorUtil
for (Method method : methods)
{
int modifiers = method.getModifiers();
- if (!ClassUtil.isStatic(modifiers) &&
!ClassUtil.isPrivate(modifiers) && ClassUtil.isFinal(modifiers))
+ if (!Modifier.isStatic(modifiers) &&
!Modifier.isPrivate(modifiers) && ClassUtil.isFinal(modifiers))
{
if (hasClassInterceptors)
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java?rev=1081691&r1=1081690&r2=1081691&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
Tue Mar 15 09:26:09 2011
@@ -22,6 +22,7 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import javax.enterprise.inject.spi.AnnotatedConstructor;
@@ -31,7 +32,6 @@ import javax.enterprise.inject.spi.Annot
import javax.enterprise.inject.spi.AnnotatedType;
import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.util.ClassUtil;
/**
* Implementation of {@link AnnotatedMember} interface.
@@ -116,7 +116,7 @@ abstract class AbstractAnnotatedMember<X
@Override
public boolean isStatic()
{
- return ClassUtil.isStatic(this.javaMember.getModifiers());
+ return Modifier.isStatic(this.javaMember.getModifiers());
}
public String toString()
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=1081691&r1=1081690&r2=1081691&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
Tue Mar 15 09:26:09 2011
@@ -66,8 +66,6 @@ public final class ClassUtil
public static final Map<Class<?>, Class<?>> PRIMITIVE_TO_WRAPPERS_MAP =
new HashMap<Class<?>, Class<?>>();
- public static final Object[] OBJECT_EMPTY = new Object[0];
-
private static final WebBeansLogger logger =
WebBeansLogger.getLogger(ClassUtil.class);
static
@@ -91,50 +89,6 @@ public final class ClassUtil
throw new UnsupportedOperationException();
}
- /**
- * Check the parametrized type actual arguments equals with the class type
- * variables at the injection point.
- *
- * @param variables type variable
- * @param types type
- * @return
- */
- public static boolean checkEqual(TypeVariable<?>[] variables, Type[] types)
- {
- Asserts.assertNotNull(variables, "variables parameter can not be
null");
- Asserts.assertNotNull(types, "types parameter can not be null");
-
- for (TypeVariable<?> variable : variables)
- {
- for (Type type : types)
- {
- if (type instanceof TypeVariable)
- {
- TypeVariable<?> t = ((TypeVariable<?>) type);
- if
(t.getGenericDeclaration().equals(variable.getGenericDeclaration()))
- {
- if (t.getName().equals(variable.getName()))
- {
- continue;
- }
- else
- {
- return false;
- }
-
- }
- else
- {
- return false;
- }
- }
- }
- }
-
- return true;
-
- }
-
public static Object newInstance(Class<?> clazz)
{
try
@@ -278,45 +232,6 @@ public final class ClassUtil
return clazz.isMemberClass();
}
- /**
- * Check the modifier contains static keyword.
- *
- * @param modifier modifier
- * @return true or false
- */
- public static boolean isStatic(Integer modifier)
- {
- Asserts.nullCheckForModifier(modifier);
-
- return Modifier.isStatic(modifier);
- }
-
- /**
- * Check the modifier contains static keyword.
- *
- * @param modifier modifier
- * @return true or false
- */
- public static boolean isPublic(Integer modifier)
- {
- Asserts.nullCheckForModifier(modifier);
-
- return Modifier.isPublic(modifier);
- }
-
- /**
- * Check the modifier contains static keyword.
- *
- * @param modifier modifier
- * @return true or false
- */
- public static boolean isPrivate(Integer modifier)
- {
- Asserts.nullCheckForModifier(modifier);
-
- return Modifier.isPrivate(modifier);
- }
-
public static Class<?> getPrimitiveWrapper(Class<?> clazz)
{
Asserts.nullCheckForClass(clazz);
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=1081691&r1=1081690&r2=1081691&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
Tue Mar 15 09:26:09 2011
@@ -415,7 +415,7 @@ public final class WebBeansAnnotatedType
{
//Check for valid resource annotation
//WebBeansUtil.checkForValidResources(annotatedField.getDeclaringType().getJavaClass(),
field.getType(), field.getName(), anns);
- if(!ClassUtil.isStatic(field.getModifiers()))
+ if(!Modifier.isStatic(field.getModifiers()))
{
ResourceReference<X,Annotation> resourceRef = new
ResourceReference<X, Annotation>(bean.getBeanClass(), field.getName(),
(Class<X>)field.getType(), resourceAnnotation);
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=1081691&r1=1081690&r2=1081691&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
Tue Mar 15 09:26:09 2011
@@ -341,7 +341,7 @@ public final class WebBeansUtil
int modifier = clazz.getModifiers();
- if (!ClassUtil.isStatic(modifier) && ClassUtil.isInnerClazz(clazz))
+ if (!Modifier.isStatic(modifier) && ClassUtil.isInnerClazz(clazz))
{
throw new WebBeansConfigurationException("Bean implementation
class : "
+ clazz.getName() + " can
not be non-static inner class");
@@ -918,7 +918,7 @@ public final class WebBeansUtil
+ " can not throw any checked exception");
}
- if (ClassUtil.isStatic(method.getModifiers()))
+ if (Modifier.isStatic(method.getModifiers()))
{
throw new WebBeansConfigurationException("@" +
commonAnnotation.getSimpleName()
+ " annotated method : " + method.getName() + " in
class : "
@@ -1002,7 +1002,7 @@ public final class WebBeansUtil
+ " can not throw any checked exception");
}
- if (ClassUtil.isStatic(method.getModifiers()))
+ if (Modifier.isStatic(method.getModifiers()))
{
throw new WebBeansConfigurationException("@" +
commonAnnotation.getSimpleName()
+ " annotated method : " + method.getName() + " in
class : " + clazz.getName()
@@ -1075,7 +1075,7 @@ public final class WebBeansUtil
+ method.getName() + " in class : " +
clazz.getName() + " must throw Exception");
}
- if (ClassUtil.isStatic(method.getModifiers()) ||
ClassUtil.isFinal(method.getModifiers()))
+ if (Modifier.isStatic(method.getModifiers()) ||
ClassUtil.isFinal(method.getModifiers()))
{
throw new WebBeansConfigurationException("@" +
annot.getSimpleName() + " annotated method : "
+ method.getName() + " in class : " +
clazz.getName() + " can not be static or final");
@@ -1144,7 +1144,7 @@ public final class WebBeansUtil
+ " must throw Exception");
}
- if (ClassUtil.isStatic(method.getJavaMember().getModifiers())
||
+ if (Modifier.isStatic(method.getJavaMember().getModifiers()) ||
ClassUtil.isFinal(method.getJavaMember().getModifiers()))
{
throw new WebBeansConfigurationException("@" +
annot.getSimpleName() + " annotated method : "
@@ -1959,7 +1959,7 @@ public final class WebBeansUtil
violationMessage.addLine(beanClass.getName(), "
has no explicit no-arg constructor!",
"A public or protected constructor without
args is required!");
}
- else if (ClassUtil.isPrivate(cons.getModifiers()))
+ else if (Modifier.isPrivate(cons.getModifiers()))
{
violationMessage.addLine(beanClass.getName(), "
has a >private< no-arg constructor! CDI doesn't allow that.");
}
@@ -3329,7 +3329,7 @@ public final class WebBeansUtil
{
Method method = methodA.getJavaMember();
int modifiers = method.getModifiers();
- if (!ClassUtil.isStatic(modifiers) &&
!ClassUtil.isPrivate(modifiers) && ClassUtil.isFinal(modifiers))
+ if (!Modifier.isStatic(modifiers) &&
!Modifier.isPrivate(modifiers) && ClassUtil.isFinal(modifiers))
{
if (hasClassInterceptors)
{
