You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by be...@apache.org on 2011/04/06 23:50:18 UTC
svn commit: r1089644 - in /openwebbeans/trunk:
webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/
webbeans-impl/src/main/java/org/apache/webbeans/config/
webbeans-impl/src/main/java/org/apache/webbeans/container/
webbeans-impl/src/main/jav...
Author: bergmark
Date: Wed Apr 6 21:50:17 2011
New Revision: 1089644
URL: http://svn.apache.org/viewvc?rev=1089644&view=rev
Log:
[OWB-555] ClassUtil methods contain spelling and other errors
Submitted by: Matt Benson <mbenson at apache dot org>
Modified:
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/BeanTypeSetResolver.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorResolverRules.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.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
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/config/ClassTest.java
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=1089644&r1=1089643&r2=1089644&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 Wed Apr 6 21:50:17 2011
@@ -120,7 +120,7 @@ public final class EjbValidator
Asserts.assertNotNull(ejbClass, "ejbClass parameter can not be null");
Asserts.assertNotNull(ejbClass, "scopeType parameter can not be null");
- if(ClassUtil.isDefinitionConstainsTypeVariables(ejbClass))
+ if(ClassUtil.isDefinitionContainsTypeVariables(ejbClass))
{
if(!scopeType.equals(Dependent.class))
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeanTypeSetResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeanTypeSetResolver.java?rev=1089644&r1=1089643&r2=1089644&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeanTypeSetResolver.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeanTypeSetResolver.java Wed Apr 6 21:50:17 2011
@@ -69,7 +69,7 @@ public class BeanTypeSetResolver
private void normalClassConfiguration(Class<?> beanClass)
{
//Bean class contains TypeVariables
- if(ClassUtil.isDefinitionConstainsTypeVariables(beanClass))
+ if(ClassUtil.isDefinitionContainsTypeVariables(beanClass))
{
//TypeVariables
OwbParametrizedTypeImpl pt = new OwbParametrizedTypeImpl(beanClass.getDeclaringClass(),beanClass);
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=1089644&r1=1089643&r2=1089644&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 Wed Apr 6 21:50:17 2011
@@ -1095,7 +1095,7 @@ public final class DefinitionUtil
boolean defined = false;
for (Method beanMethod : beanMethods)
{
- if(ClassUtil.isOverriden(beanMethod, method))
+ if(ClassUtil.isOverridden(beanMethod, method))
{
defined = true;
break;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1089644&r1=1089643&r2=1089644&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Wed Apr 6 21:50:17 2011
@@ -465,7 +465,7 @@ public class BeanManagerImpl implements
*/
public void fireEvent(Object event, Annotation... bindings)
{
- if (ClassUtil.isDefinitionConstainsTypeVariables(event.getClass()))
+ if (ClassUtil.isDefinitionContainsTypeVariables(event.getClass()))
{
throw new IllegalArgumentException("Event class : " + event.getClass().getName() + " can not be defined as generic type");
}
@@ -1167,7 +1167,7 @@ public class BeanManagerImpl implements
@Override
public <T> Set<ObserverMethod<? super T>> resolveObserverMethods( T event, Annotation... qualifiers )
{
- if(ClassUtil.isDefinitionConstainsTypeVariables(event.getClass()))
+ if(ClassUtil.isDefinitionContainsTypeVariables(event.getClass()))
{
throw new IllegalArgumentException("Event type can not contain type variables. Event class is : " + event.getClass());
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorResolverRules.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorResolverRules.java?rev=1089644&r1=1089643&r2=1089644&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorResolverRules.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorResolverRules.java Wed Apr 6 21:50:17 2011
@@ -78,7 +78,7 @@ public final class DecoratorResolverRule
//Item -2 and Item-3 in 8.3.1
else if(ClassUtil.isWildCardType(delegateTypeArg))
{
- return ClassUtil.checkRequiredTypeisWildCard(beanTypeArg, delegateTypeArg);
+ return ClassUtil.checkRequiredTypeIsWildCard(beanTypeArg, delegateTypeArg);
}
//Item-4 in 8.3.1
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java?rev=1089644&r1=1089643&r2=1089644&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java Wed Apr 6 21:50:17 2011
@@ -123,7 +123,7 @@ public class EventImpl<T> implements Eve
@Override
public <U extends T> Event<U> select(Class<U> subtype, Annotation... bindings)
{
- if(ClassUtil.isDefinitionConstainsTypeVariables(subtype))
+ if(ClassUtil.isDefinitionContainsTypeVariables(subtype))
{
throw new IllegalArgumentException("Class : " + subtype + " cannot contain type variable");
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java?rev=1089644&r1=1089643&r2=1089644&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java Wed Apr 6 21:50:17 2011
@@ -52,7 +52,7 @@ public final class EventUtil
{
Asserts.assertNotNull(eventType, "eventType parameter can not be null");
- if (ClassUtil.isDefinitionConstainsTypeVariables(eventType))
+ if (ClassUtil.isDefinitionContainsTypeVariables(eventType))
{
throw new IllegalArgumentException("Event type : " + eventType.getName() + " can not be generic");
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=1089644&r1=1089643&r2=1089644&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Wed Apr 6 21:50:17 2011
@@ -295,7 +295,7 @@ public final class NotificationManager
}
else if(ClassUtil.isWildCardType(observerTypeActualArg))
{
- return ClassUtil.checkRequiredTypeisWildCard(beanClass, observerTypeActualArg);
+ return ClassUtil.checkRequiredTypeIsWildCard(beanClass, observerTypeActualArg);
}
else if(observerTypeActualArg instanceof Class)
{
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=1089644&r1=1089643&r2=1089644&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 Apr 6 21:50:17 2011
@@ -719,7 +719,7 @@ public final class InterceptorUtil
Method childInterceptorMethod = webBeansContext.getSecurityService().doPrivilegedGetDeclaredMethod(interceptorClass,
superInterceptorMethod.getName(), superInterceptorMethod.getParameterTypes());
- if (null != childInterceptorMethod && ClassUtil.isOverriden(childInterceptorMethod, superInterceptorMethod))
+ if (null != childInterceptorMethod && ClassUtil.isOverridden(childInterceptorMethod, superInterceptorMethod))
{
return superInterceptorData;
}
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=1089644&r1=1089643&r2=1089644&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 Wed Apr 6 21:50:17 2011
@@ -98,7 +98,7 @@ public final class ClassUtil
cause = e.getCause();
}
- String error = "Error is occured while creating an instance of class : " + clazz.getName();
+ String error = "Error occurred while creating an instance of class : " + clazz.getName();
logger.error(error, cause);
throw new WebBeansException(error,cause);
@@ -792,12 +792,12 @@ public final class ClassUtil
//Required type is parametrized and bean type is parametrized
if(ClassUtil.isParametrizedType(requiredTypeArg) && ClassUtil.isParametrizedType(beanTypeArg))
{
- return checkBeanAndRequiredTypeisParametrized(beanTypeArg, requiredTypeArg);
+ return checkBeanAndRequiredTypeIsParametrized(beanTypeArg, requiredTypeArg);
}
//Required type is wildcard
else if(ClassUtil.isWildCardType(requiredTypeArg))
{
- return checkRequiredTypeisWildCard(beanTypeArg, requiredTypeArg);
+ return checkRequiredTypeIsWildCard(beanTypeArg, requiredTypeArg);
}
//Required type is actual type and bean type is type variable
else if(requiredTypeArg instanceof Class && ClassUtil.isTypeVariable(beanTypeArg))
@@ -834,9 +834,24 @@ public final class ClassUtil
* @param beanTypeArg parametrized bean type
* @param requiredTypeArg parametrized required type
* @return true if types are assignables
+ * @deprecated use {@link #checkBeanAndRequiredTypeIsParametrized(Type, Type)}
*/
+ @Deprecated
public static boolean checkBeanAndRequiredTypeisParametrized(Type beanTypeArg, Type requiredTypeArg)
{
+ return checkBeanAndRequiredTypeIsParametrized(beanTypeArg, requiredTypeArg);
+ }
+
+ /**
+ * Check parametrized bean type and parametrized
+ * required types.
+ * @param beanTypeArg parametrized bean type
+ * @param requiredTypeArg parametrized required type
+ * @return true if types are assignables
+ * @since 1.1.1
+ */
+ public static boolean checkBeanAndRequiredTypeIsParametrized(Type beanTypeArg, Type requiredTypeArg)
+ {
ParameterizedType ptRequiredTypeArg = (ParameterizedType)requiredTypeArg;
ParameterizedType ptBeanTypeArg = (ParameterizedType)beanTypeArg;
@@ -867,10 +882,27 @@ public final class ClassUtil
* </p>
* @param beanTypeArg bean type
* @param requiredTypeArg required type
- * @return true if contdition satisfies
+ * @return true if condition satisfies
+ * @deprecated use {@link #checkRequiredTypeIsWildCard(Type, Type)}
*/
+ @Deprecated
public static boolean checkRequiredTypeisWildCard(Type beanTypeArg, Type requiredTypeArg)
{
+ return checkRequiredTypeIsWildCard(beanTypeArg, requiredTypeArg);
+ }
+
+ /**
+ * Check bean type and required type.
+ * <p>
+ * Required type is a wildcard type.
+ * </p>
+ * @param beanTypeArg bean type
+ * @param requiredTypeArg required type
+ * @return true if condition satisfies
+ * @since 1.1.1
+ */
+ public static boolean checkRequiredTypeIsWildCard(Type beanTypeArg, Type requiredTypeArg)
+ {
WildcardType wctRequiredTypeArg = (WildcardType)requiredTypeArg;
Type upperBoundRequiredTypeArg = wctRequiredTypeArg.getUpperBounds()[0];
Type[] lowerBoundRequiredTypeArgs = wctRequiredTypeArg.getLowerBounds();
@@ -1143,15 +1175,55 @@ public final class ClassUtil
return clazz.isArray();
}
+ /**
+ * Learn whether the specified class is defined with type parameters.
+ * @param clazz to check
+ * @return true if there are type parameters
+ * @deprecated use {@link #isDefinitionContainsTypeVariables(Class)}
+ */
+ @Deprecated
public static boolean isDefinitionConstainsTypeVariables(Class<?> clazz)
{
+ return isDefinitionContainsTypeVariables(clazz);
+ }
+
+ /**
+ * Learn whether the specified class is defined with type parameters.
+ * @param clazz to check
+ * @return true if there are type parameters
+ * @since 1.1.1
+ */
+ public static boolean isDefinitionContainsTypeVariables(Class<?> clazz)
+ {
Asserts.nullCheckForClass(clazz);
return (clazz.getTypeParameters().length > 0) ? true : false;
}
-
+
+ /**
+ * Returns declared type arguments if {@code type} is a
+ * {@link ParameterizedType} instance, else an empty array.
+ * Get the actual type arguments of a type.
+ * @param type
+ * @return array of type arguments available
+ * @deprecated use {@link #getActualTypeArguments(Type)}
+ */
+ @Deprecated
public static Type[] getActualTypeArguements(Type type)
{
+ return getActualTypeArguments(type);
+ }
+
+ /**
+ * Returns declared type arguments if {@code type} is a
+ * {@link ParameterizedType} instance, else an empty array.
+ * Get the actual type arguments of a type.
+ * @param type
+ * @return array of type arguments available
+ * @since 1.1.1
+ */
+ public static Type[] getActualTypeArguments(Type type)
+ {
Asserts.assertNotNull(type, "type parameter can not be null");
if (type instanceof ParameterizedType)
@@ -1293,8 +1365,28 @@ public final class ClassUtil
return rawType;
}
+ /**
+ * Learn whether <code>superClassMethod</code> is overridden by <code>subClassMethod</code>.
+ * @param subClassMethod potentially overriding
+ * @param superClassMethod potentially overridden
+ * @return true if overridden
+ * @deprecated use {@link #isOverridden(Method, Method)}
+ */
+ @Deprecated
public static boolean isOverriden(Method subClassMethod, Method superClassMethod)
{
+ return isOverridden(subClassMethod, superClassMethod);
+ }
+
+ /**
+ * Learn whether <code>superClassMethod</code> is overridden by <code>subClassMethod</code>.
+ * @param subClassMethod potentially overriding
+ * @param superClassMethod potentially overridden
+ * @return true if overridden
+ * @since 1.1.1
+ */
+ public static boolean isOverridden(Method subClassMethod, Method superClassMethod)
+ {
if (subClassMethod.getName().equals(superClassMethod.getName()) && Arrays.equals(subClassMethod.getParameterTypes(), superClassMethod.getParameterTypes()))
{
int modifiers = superClassMethod.getModifiers();
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=1089644&r1=1089643&r2=1089644&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 Apr 6 21:50:17 2011
@@ -230,7 +230,7 @@ public final class WebBeansUtil
Class<?> clazz = bean.getBeanClass();
- if (ClassUtil.isDefinitionConstainsTypeVariables(clazz))
+ if (ClassUtil.isDefinitionContainsTypeVariables(clazz))
{
if(!bean.getScope().equals(Dependent.class))
{
@@ -295,7 +295,7 @@ public final class WebBeansUtil
if(ClassUtil.isParametrizedType(type))
{
- Type[] actualTypes = ClassUtil.getActualTypeArguements(type);
+ Type[] actualTypes = ClassUtil.getActualTypeArguments(type);
if(actualTypes.length == 0)
{
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/config/ClassTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/config/ClassTest.java?rev=1089644&r1=1089643&r2=1089644&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/config/ClassTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/config/ClassTest.java Wed Apr 6 21:50:17 2011
@@ -41,7 +41,7 @@ public class ClassTest extends TestConte
@Test
public void testTypeVariableTest()
{
- boolean result = ClassUtil.isDefinitionConstainsTypeVariables(Map.class);
+ boolean result = ClassUtil.isDefinitionContainsTypeVariables(Map.class);
Assert.assertEquals(true, result);