Author: struberg
Date: Tue Mar 15 14:43:37 2011
New Revision: 1081804
URL: http://svn.apache.org/viewvc?rev=1081804&view=rev
Log:
OWB-461 further code cleanup
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.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/DelegateHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.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/SecurityUtil.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
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/literals/InstanceTypeLiteralBean.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java?rev=1081804&r1=1081803&r2=1081804&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
Tue Mar 15 14:43:37 2011
@@ -86,12 +86,7 @@ public final class AnnotationManager
{
Asserts.nullCheckForClass(clazz);
- if (clazz.isAnnotationPresent(InterceptorBinding.class))
- {
- return true;
- }
-
- return false;
+ return clazz.isAnnotationPresent(InterceptorBinding.class);
}
/**
@@ -397,12 +392,7 @@ public final class AnnotationManager
{
Asserts.nullCheckForClass(clazz);
- if (clazz.isAnnotationPresent(Stereotype.class))
- {
- return true;
- }
-
- return false;
+ return clazz.isAnnotationPresent(Stereotype.class);
}
public boolean hasStereoTypeMetaAnnotation(Annotation[] anns)
@@ -468,12 +458,7 @@ public final class AnnotationManager
Set<Annotation> set = component.getOwbStereotypes();
Annotation[] anns = new Annotation[set.size()];
anns = set.toArray(anns);
- if (hasStereoTypeMetaAnnotation(anns))
- {
- return true;
- }
-
- return false;
+ return hasStereoTypeMetaAnnotation(anns);
}
/**
@@ -542,7 +527,7 @@ public final class AnnotationManager
if (annotType.isAnnotationPresent(NormalScope.class) ||
annotType.isAnnotationPresent(Scope.class))
{
- if (scopeTypeFound == true)
+ if (scopeTypeFound)
{
throw new WebBeansConfigurationException("@StereoType
annotation can not contain more " +
"than one @Scope/@NormalScope annotation");
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=1081804&r1=1081803&r2=1081804&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
Tue Mar 15 14:43:37 2011
@@ -172,7 +172,7 @@ public abstract class AbstractProducerBe
return false;
}
- if(ClassUtil.isPrimitive(returnType) ||
Serializable.class.isAssignableFrom(returnType))
+ if(returnType.isPrimitive() ||
Serializable.class.isAssignableFrom(returnType))
{
return true;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java?rev=1081804&r1=1081803&r2=1081804&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
Tue Mar 15 14:43:37 2011
@@ -192,12 +192,7 @@ public class AbstractBeanCreator<T> impl
*/
protected boolean isDefaultMetaDataProvider()
{
- if(this.metadataProvider.equals(MetaDataProvider.DEFAULT))
- {
- return true;
- }
-
- return false;
+ return this.metadataProvider.equals(MetaDataProvider.DEFAULT);
}
/**
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=1081804&r1=1081803&r2=1081804&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 14:43:37 2011
@@ -242,11 +242,7 @@ public final class DefinitionUtil
}
}
- if (find == false)
- {
- find = true;
- }
-
+ find = true;
component.addQualifier(annotation);
}
}
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=1081804&r1=1081803&r2=1081804&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
Tue Mar 15 14:43:37 2011
@@ -1034,12 +1034,7 @@ public class BeanManagerImpl implements
}
}
-
if(AnnotationUtil.hasAnnotation(annotationType.getDeclaredAnnotations(),
NormalScope.class))
- {
- return true;
- }
-
- return false;
+ return
AnnotationUtil.hasAnnotation(annotationType.getDeclaredAnnotations(),
NormalScope.class);
}
@Override
@@ -1066,12 +1061,7 @@ public class BeanManagerImpl implements
@Override
public boolean isStereotype(Class<? extends Annotation> annotationType)
{
-
if(AnnotationUtil.hasAnnotation(annotationType.getDeclaredAnnotations(),
Stereotype.class))
- {
- return true;
- }
-
- return false;
+ return
AnnotationUtil.hasAnnotation(annotationType.getDeclaredAnnotations(),
Stereotype.class);
}
@Override
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java?rev=1081804&r1=1081803&r2=1081804&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java
Tue Mar 15 14:43:37 2011
@@ -177,7 +177,7 @@ public class DelegateHandler implements
* @return True if the method exists in any of the interfaces of the
* Decorator
*/
- private boolean checkForMethodInInterfaces(Class<? extends Object> class1,
Method m)
+ private boolean checkForMethodInInterfaces(Class<?> class1, Method m)
{
Class<?>[] interfaces = class1.getInterfaces();
for (int i = 0; i < interfaces.length; i++)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java?rev=1081804&r1=1081803&r2=1081804&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java
Tue Mar 15 14:43:37 2011
@@ -116,12 +116,7 @@ public class AlternativesManager
public boolean isStereoAlternative(Class<? extends Annotation> stereo)
{
- if(this.stereoAlternatives.contains(stereo))
- {
- return true;
- }
-
- return false;
+ return this.stereoAlternatives.contains(stereo);
}
public boolean isBeanHasAlternative(Bean<?> bean)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java?rev=1081804&r1=1081803&r2=1081804&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java
Tue Mar 15 14:43:37 2011
@@ -71,7 +71,7 @@ public final class ArrayUtil
Object o2 = arr2[i2];
// if they are equal and not found already
- if (o1.equals(o2) && found2[i2] == false)
+ if (o1.equals(o2) && !found2[i2])
{
// mark the entries in both arrays as found
found1[i1] = true;
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=1081804&r1=1081803&r2=1081804&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 14:43:37 2011
@@ -267,13 +267,7 @@ public final class ClassUtil
{
Asserts.nullCheckForMethod(method);
- Class<?>[] types = method.getParameterTypes();
- if (types.length != 0)
- {
- return true;
- }
-
- return false;
+ return method.getParameterTypes().length > 0;
}
/**
@@ -426,21 +420,16 @@ public final class ClassUtil
Asserts.nullCheckForClass(clazz);
Method[] methods = SecurityUtil.doPrivilegedGetDeclaredMethods(clazz);
- int i = 0;
+ int methodCount = 0;
for (Method m : methods)
{
if (m.getName().equals(methodName))
{
- i++;
+ methodCount++;
}
}
- if (i > 1)
- {
- return true;
- }
-
- return false;
+ return methodCount > 1;
}
@@ -486,12 +475,7 @@ public final class ClassUtil
{
Asserts.assertNotNull(type, "type parameter can not be null");
- if (type instanceof WildcardType)
- {
- return true;
- }
-
- return false;
+ return type instanceof WildcardType;
}
public static boolean isUnboundedTypeVariable(Type type)
@@ -545,13 +529,7 @@ public final class ClassUtil
{
Asserts.assertNotNull(type, "type parameter can not be null");
- if (type instanceof TypeVariable)
- {
- return true;
- }
-
- return false;
-
+ return type instanceof TypeVariable;
}
@@ -1180,13 +1158,6 @@ public final class ClassUtil
return null;
}
- public static boolean isPrimitive(Class<?> clazz)
- {
- Asserts.nullCheckForClass(clazz);
-
- return clazz.isPrimitive();
- }
-
public static boolean isArray(Class<?> clazz)
{
Asserts.nullCheckForClass(clazz);
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SecurityUtil.java?rev=1081804&r1=1081803&r2=1081804&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SecurityUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/SecurityUtil.java
Tue Mar 15 14:43:37 2011
@@ -116,7 +116,7 @@ public class SecurityUtil
{
AccessController.doPrivileged(new
PrivilegedActionForAccessibleObject(obj, flag));
return null;
- };
+ }
protected static class PrivilegedActionForAccessibleObject implements
PrivilegedAction<Object>
{
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=1081804&r1=1081803&r2=1081804&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 14:43:37 2011
@@ -93,7 +93,7 @@ public final class WebBeansAnnotatedType
{
if(annConst.isAnnotationPresent(Inject.class))
{
- if (found == true)
+ if (found)
{
throw new WebBeansConfigurationException("There are
more than one constructor with @Inject annotation in annotation type : "
+ type);
@@ -441,7 +441,7 @@ public final class WebBeansAnnotatedType
ProducerFieldBean<X> producerFieldBean = new
ProducerFieldBean<X>(bean,
(Class<X>)ClassUtil.getClass(annotatedField.getBaseType()));
producerFieldBean.setProducerField(field);
- if
(ClassUtil.isPrimitive(ClassUtil.getClass(annotatedField.getBaseType())))
+ if
(ClassUtil.getClass(annotatedField.getBaseType()).isPrimitive())
{
producerFieldBean.setNullable(false);
}
@@ -501,7 +501,7 @@ public final class WebBeansAnnotatedType
configureProducerSpecialization(producerMethodBean,
(AnnotatedMethod<X>)annotatedMethod);
}
- if
(ClassUtil.isPrimitive(ClassUtil.getClass(annotatedMethod.getBaseType())))
+ if
(ClassUtil.getClass(annotatedMethod.getBaseType()).isPrimitive())
{
producerMethodBean.setNullable(false);
}
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=1081804&r1=1081803&r2=1081804&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 14:43:37 2011
@@ -445,7 +445,7 @@ public final class WebBeansUtil
{
if (constructor.getAnnotation(Inject.class) != null)
{
- if (inAnnotation == true)// duplicate @In
+ if (inAnnotation)// duplicate @In
{
throw new WebBeansConfigurationException("There are more
than one Constructor with "
+ "Initializer
annotation in class " + clazz.getName());
@@ -811,7 +811,7 @@ public final class WebBeansUtil
continue;
}
- if (found == true)
+ if (found)
{
throw new WebBeansConfigurationException("@" +
commonAnnotation.getSimpleName()
+ " annotation is declared more than one method in
the class : " + clazz.getName());
@@ -882,7 +882,7 @@ public final class WebBeansUtil
continue;
}
- if (found == true)
+ if (found)
{
throw new WebBeansConfigurationException("@" +
commonAnnotation.getSimpleName()
+ " annotation is declared more than one method in
the class : " + clazz.getName());
@@ -979,7 +979,7 @@ public final class WebBeansUtil
continue;
}
- if (found == true)
+ if (found)
{
throw new WebBeansConfigurationException("@" +
annot.getSimpleName()
+ " annotation is declared more than one method in
the class : " + clazz.getName());
@@ -1038,7 +1038,7 @@ public final class WebBeansUtil
continue;
}
- if (found == true)
+ if (found)
{
throw new WebBeansConfigurationException("@" +
annot.getSimpleName()
+ " annotation is declared more than one method in
the class : "
@@ -1866,7 +1866,7 @@ public final class WebBeansUtil
if(!beanClass.isInterface() && beanClass != Object.class)
{
- if(ClassUtil.isPrimitive(beanClass))
+ if(beanClass.isPrimitive())
{
violationMessage.addLine("It isn't possible to use a
primitive type (" + beanClass.getName(), ")");
}
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java?rev=1081804&r1=1081803&r2=1081804&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
Tue Mar 15 14:43:37 2011
@@ -89,7 +89,7 @@ public class DependingInterceptorTest ex
Assert.assertTrue(reference2 instanceof RequestScopedBean);
RequestScopedBean beanInstance2 = (RequestScopedBean)reference2;
- beanInstance2.getMyService().getJ();;
+ beanInstance2.getMyService().getJ();
RequestScopedBean realInstance2 = beanInstance2.getInstance();
Assert.assertTrue(TransactionInterceptor.ECHO);
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/literals/InstanceTypeLiteralBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/literals/InstanceTypeLiteralBean.java?rev=1081804&r1=1081803&r2=1081804&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/literals/InstanceTypeLiteralBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/literals/InstanceTypeLiteralBean.java
Tue Mar 15 14:43:37 2011
@@ -28,11 +28,11 @@ import javax.inject.Named;
@Named("literalBean")
public class InstanceTypeLiteralBean
{
- public static interface IOrder<T>{};
+ public static interface IOrder<T>{}
- public static class StringOrder implements IOrder<String>{};
+ public static class StringOrder implements IOrder<String>{}
- public static class IntegerOrder implements IOrder<Integer>{};
+ public static class IntegerOrder implements IOrder<Integer>{}
private @Inject Instance<IOrder<?>> instance;
