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 2012/12/31 16:37:08 UTC
svn commit: r1427152 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
component/ config/ decorator/ intercept/ util/
Author: struberg
Date: Mon Dec 31 15:37:08 2012
New Revision: 1427152
URL: http://svn.apache.org/viewvc?rev=1427152&view=rev
Log:
OWB-549 get rid of lots of trivial methods in ClassUtil
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.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/util/ClassUtil.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/AbstractProducerBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java?rev=1427152&r1=1427151&r2=1427152&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 Mon Dec 31 15:37:08 2012
@@ -19,11 +19,11 @@
package org.apache.webbeans.component;
import java.io.Serializable;
+import java.lang.reflect.Modifier;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
-import org.apache.webbeans.util.ClassUtil;
import org.apache.webbeans.util.WebBeansUtil;
/**
@@ -146,7 +146,7 @@ public abstract class AbstractProducerBe
protected boolean isPassivationCapable(Class<?> returnType, Integer modifiers)
{
- if(ClassUtil.isFinal(modifiers) && !(Serializable.class.isAssignableFrom(returnType)))
+ if(Modifier.isFinal(modifiers) && !(Serializable.class.isAssignableFrom(returnType)))
{
return false;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java?rev=1427152&r1=1427151&r2=1427152&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/ManagedBeanConfigurator.java Mon Dec 31 15:37:08 2012
@@ -20,6 +20,7 @@ package org.apache.webbeans.config;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
import java.util.Set;
import javax.decorator.Decorator;
@@ -34,7 +35,6 @@ import org.apache.webbeans.exception.Web
import org.apache.webbeans.portable.creation.InjectionTargetProducer;
import org.apache.webbeans.portable.creation.ProducerBeansProducer;
import org.apache.webbeans.util.AnnotationUtil;
-import org.apache.webbeans.util.ClassUtil;
import org.apache.webbeans.util.WebBeansUtil;
/**
@@ -70,7 +70,7 @@ public final class ManagedBeanConfigurat
webBeansContext.getInterceptorUtil().checkSimpleWebBeansInterceptorConditions(clazz);
}
- if (ClassUtil.isInterface(modifier))
+ if (Modifier.isInterface(modifier))
{
throw new WebBeansConfigurationException("ManagedBean implementation class : " + clazz.getName() + " may not _defined as interface");
}
@@ -126,7 +126,7 @@ public final class ManagedBeanConfigurat
webBeansContext.getInterceptorUtil().checkSimpleWebBeansInterceptorConditions(clazz);
}
- if (ClassUtil.isInterface(modifier))
+ if (Modifier.isInterface(modifier))
{
throw new WebBeansConfigurationException("ManagedBean implementation class : " + clazz.getName() + " may not _defined as interface");
}
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=1427152&r1=1427151&r2=1427152&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 Mon Dec 31 15:37:08 2012
@@ -107,7 +107,7 @@ public final class DecoratorUtil
if (!decoratorList.isEmpty())
{
Class<?> clazz = bean.getReturnType();
- if (ClassUtil.isFinal(clazz.getModifiers()))
+ if (Modifier.isFinal(clazz.getModifiers()))
{
throw new WebBeansConfigurationException("Bean : " + bean.getReturnType().getName() + " can not be declared final, because it has one or more decorators");
}
@@ -116,7 +116,7 @@ public final class DecoratorUtil
for (Method method : methods)
{
int modifiers = method.getModifiers();
- if (!method.isSynthetic() && !method.isBridge() && !Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) && ClassUtil.isFinal(modifiers))
+ if (!method.isSynthetic() && !method.isBridge() && !Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) && Modifier.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=1427152&r1=1427151&r2=1427152&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 Mon Dec 31 15:37:08 2012
@@ -222,7 +222,7 @@ public final class InterceptorUtil
{
if (!ClassUtil.isMethodHasCheckedException(method.getJavaMember()))
{
- if (!Modifier.isStatic(method.getJavaMember().getModifiers()) && !ClassUtil.isFinal(method.getJavaMember().getModifiers()))
+ if (!Modifier.isStatic(method.getJavaMember().getModifiers()) && !Modifier.isFinal(method.getJavaMember().getModifiers()))
{
return true;
}
@@ -252,7 +252,7 @@ public final class InterceptorUtil
{
if (ClassUtil.getReturnType(method).equals(Object.class))
{
- if (!Modifier.isStatic(method.getModifiers()) && !ClassUtil.isFinal(method.getModifiers()))
+ if (!Modifier.isStatic(method.getModifiers()) && !Modifier.isFinal(method.getModifiers()))
{
return true;
}
@@ -474,7 +474,7 @@ public final class InterceptorUtil
}
//Simple webbeans
- if(ClassUtil.isFinal(clazz.getModifiers()) && hasClassInterceptors)
+ if(Modifier.isFinal(clazz.getModifiers()) && hasClassInterceptors)
{
throw new WebBeansConfigurationException("Final Simple class with name : " + clazz.getName() + " can not define any InterceptorBindings");
}
@@ -484,7 +484,7 @@ public final class InterceptorUtil
for (Method method : methods)
{
int modifiers = method.getModifiers();
- if (!method.isSynthetic() && !method.isBridge() && !Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) && ClassUtil.isFinal(modifiers))
+ if (!method.isSynthetic() && !method.isBridge() && !Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) && Modifier.isFinal(modifiers))
{
if (hasClassInterceptors)
{
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=1427152&r1=1427151&r2=1427152&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 Mon Dec 31 15:37:08 2012
@@ -78,6 +78,9 @@ public final class ClassUtil
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated having this static public method is most probably a security risk
+ */
public static Object newInstance(WebBeansContext webBeansContext, Class<?> clazz)
{
try
@@ -107,8 +110,8 @@ public final class ClassUtil
public static Class<?> getClassFromName(String name)
{
- Class<?> clazz = null;
- ClassLoader loader = null;
+ Class<?> clazz;
+ ClassLoader loader;
try
{
loader = WebBeansUtil.getCurrentClassLoader();
@@ -140,74 +143,8 @@ public final class ClassUtil
{
return null;
}
-
- }
- }
-
- }
-
- /**
- * Check final modifier.
- *
- * @param modifier modifier
- * @return true or false
- * @deprecated use Modifier.... directly
- */
- public static boolean isFinal(Integer modifier)
- {
- Asserts.nullCheckForModifier(modifier);
-
- return Modifier.isFinal(modifier);
- }
-
- /**
- * Check abstract modifier.
- *
- * @param modifier modifier
- * @return true or false
- * @deprecated use Modifier.... directly
- */
- public static boolean isAbstract(Integer modifier)
- {
- Asserts.nullCheckForModifier(modifier);
-
- return Modifier.isAbstract(modifier);
- }
-
- /**
- * Check interface modifier.
- *
- * @param modifier modifier
- * @return true or false
- * @deprecated use Modifier.... directly
- */
- public static boolean isInterface(Integer modifier)
- {
- Asserts.nullCheckForModifier(modifier);
-
- return Modifier.isInterface(modifier);
- }
-
- /**
- * Check for class that has a final method or not.
- *
- * @param clazz check methods of it
- * @return true or false
- */
- public static boolean hasFinalMethod(Class<?> clazz)
- {
- Asserts.nullCheckForClass(clazz);
-
- Method[] methods = SecurityUtil.doPrivilegedGetDeclaredMethods(clazz);
- for (Method m : methods)
- {
- if (isFinal(m.getModifiers()))
- {
- return true;
}
}
-
- return false;
}
/**
@@ -231,7 +168,7 @@ public final class ClassUtil
}
- public static Class<?> identityOrGetPrimitiveWrapper(Class<?> clazz)
+ public static Class<?> identityOrGetPrimitiveWrapper(Class<?> clazz)
{
if (clazz.isPrimitive())
{
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=1427152&r1=1427151&r2=1427152&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 Mon Dec 31 15:37:08 2012
@@ -959,7 +959,7 @@ public final class WebBeansUtil
+ method.getName() + " in class : " + clazz.getName() + " must return Object type");
}
- if (Modifier.isStatic(method.getModifiers()) || ClassUtil.isFinal(method.getModifiers()))
+ if (Modifier.isStatic(method.getModifiers()) || Modifier.isFinal(method.getModifiers()))
{
throw new WebBeansConfigurationException("@" + annot.getSimpleName() + " annotated method : "
+ method.getName() + " in class : " + clazz.getName() + " can not be static or final");
@@ -1022,7 +1022,7 @@ public final class WebBeansUtil
}
if (Modifier.isStatic(method.getJavaMember().getModifiers()) ||
- ClassUtil.isFinal(method.getJavaMember().getModifiers()))
+ Modifier.isFinal(method.getJavaMember().getModifiers()))
{
throw new WebBeansConfigurationException("@" + annot.getSimpleName() + " annotated method : "
+ method.getJavaMember().getName( )+ " in class : " + annotatedType.getJavaClass().getName()
@@ -1773,7 +1773,7 @@ public final class WebBeansUtil
if(!violationMessage.containsViolation())
{
- if (ClassUtil.isFinal(beanClass.getModifiers()))
+ if (Modifier.isFinal(beanClass.getModifiers()))
{
violationMessage.addLine(beanClass.getName(), " is a final class! CDI doesn't allow to proxy that.");
}
@@ -1782,7 +1782,7 @@ public final class WebBeansUtil
for (Method m : methods)
{
int modifiers = m.getModifiers();
- if (ClassUtil.isFinal(modifiers) && !Modifier.isPrivate(modifiers) &&
+ if (Modifier.isFinal(modifiers) && !Modifier.isPrivate(modifiers) &&
!m.isSynthetic() && !m.isBridge())
{
violationMessage.addLine(beanClass.getName(), " has final method "+ m + " CDI doesn't allow to proxy that.");
@@ -3035,7 +3035,7 @@ public final class WebBeansUtil
checkManagedWebBeansInterceptorConditions(type);
}
- if (ClassUtil.isInterface(modifier))
+ if (Modifier.isInterface(modifier))
{
throw new WebBeansConfigurationException("ManagedBean implementation class : " + type.getJavaClass().getName() + " may not defined as interface");
}
@@ -3065,7 +3065,7 @@ public final class WebBeansUtil
}
}
- if(ClassUtil.isFinal(clazz.getModifiers()) && hasClassInterceptors)
+ if(Modifier.isFinal(clazz.getModifiers()) && hasClassInterceptors)
{
throw new WebBeansConfigurationException("Final managed bean class with name : " + clazz.getName() + " can not define any InterceptorBindings");
}
@@ -3075,7 +3075,7 @@ public final class WebBeansUtil
{
Method method = methodA.getJavaMember();
int modifiers = method.getModifiers();
- if (!method.isSynthetic() && !method.isBridge() && !Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) && ClassUtil.isFinal(modifiers))
+ if (!method.isSynthetic() && !method.isBridge() && !Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) && Modifier.isFinal(modifiers))
{
if (hasClassInterceptors)
{