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 2015/05/18 19:03:13 UTC
svn commit: r1680056 - in /openwebbeans/trunk:
webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/
webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/
webbeans-impl/src/main/java/org/apache/webbeans/annotation/ webbeans-imp...
Author: struberg
Date: Mon May 18 17:03:11 2015
New Revision: 1680056
URL: http://svn.apache.org/r1680056
Log:
removed redundant 'may not be null' from all Asserts.notNull
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.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/annotation/AnnotationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbGenericArrayTypeImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.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/NotificationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.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/Asserts.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/JNDIUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/JSFUtil.java
Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java Mon May 18 17:03:11 2015
@@ -48,9 +48,9 @@ public abstract class EjbBeanBuilder<T,
public EjbBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType, BeanAttributes<T> beanAttributes)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext may not be null");
- Asserts.assertNotNull(annotatedType, "annotated type may not be null");
- Asserts.assertNotNull(beanAttributes, "beanAttributes may not be null");
+ Asserts.assertNotNull(webBeansContext, "webBeansContext");
+ Asserts.assertNotNull(annotatedType, "annotated type");
+ Asserts.assertNotNull(beanAttributes, "beanAttributes");
this.webBeansContext = webBeansContext;
this.annotatedType = annotatedType;
this.beanAttributes = beanAttributes;
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=1680056&r1=1680055&r2=1680056&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 Mon May 18 17:03:11 2015
@@ -60,7 +60,7 @@ public final class EjbValidator
*/
public static void validateEjbScopeType(BaseEjbBean<?> ejbBean)
{
- Asserts.assertNotNull(ejbBean, "Session Bean can not be null");
+ Asserts.assertNotNull(ejbBean, "Session Bean");
if (ejbBean.getScope() == null)
{
@@ -96,7 +96,7 @@ public final class EjbValidator
*/
public static void validateDecoratorOrInterceptor(Class<?> ejbClass)
{
- Asserts.assertNotNull(ejbClass, "ejbClass parameter can not be null");
+ Asserts.assertNotNull(ejbClass, "ejbClass");
if (AnnotationUtil.hasClassAnnotation(ejbClass, Decorator.class))
{
@@ -117,8 +117,8 @@ public final class EjbValidator
*/
public static void validateGenericBeanType(Class<?> ejbClass, Class<? extends Annotation> scopeType)
{
- Asserts.assertNotNull(ejbClass, "ejbClass parameter can not be null");
- Asserts.assertNotNull(ejbClass, "scopeType parameter can not be null");
+ Asserts.assertNotNull(ejbClass, "ejbClass");
+ Asserts.assertNotNull(ejbClass, "scopeType");
if (ejbClass.getTypeParameters().length > 0)
{
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=1680056&r1=1680055&r2=1680056&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 Mon May 18 17:03:11 2015
@@ -187,7 +187,7 @@ public final class AnnotationManager
*/
public boolean hasInterceptorBindingMetaAnnotation(Annotation[] anns)
{
- Asserts.assertNotNull(anns, "anns parameter can not be null");
+ Asserts.assertNotNull(anns, "anns");
for (Annotation ann : anns)
{
@@ -219,7 +219,7 @@ public final class AnnotationManager
*/
public Annotation[] getInterceptorBindingMetaAnnotations(Annotation[] anns)
{
- Asserts.assertNotNull(anns, "anns parameter can not be null");
+ Asserts.assertNotNull(anns, "anns");
List<Annotation> interAnns = new ArrayList<Annotation>();
for (final Annotation ann : anns)
@@ -283,7 +283,7 @@ public final class AnnotationManager
public <X> Annotation[] getAnnotatedMethodFirstParameterQualifierWithGivenAnnotation(
AnnotatedMethod<X> annotatedMethod, Class<? extends Annotation> clazz)
{
- Asserts.assertNotNull(annotatedMethod, "annotatedMethod argument can not be null");
+ Asserts.assertNotNull(annotatedMethod, "annotatedMethod");
Asserts.nullCheckForClass(clazz);
List<Annotation> list = new ArrayList<Annotation>();
@@ -319,7 +319,7 @@ public final class AnnotationManager
*/
public Annotation[] getMethodFirstParameterQualifierWithGivenAnnotation(Method method, Class<? extends Annotation> clazz)
{
- Asserts.assertNotNull(method, "Method argument can not be null");
+ Asserts.assertNotNull(method, "Method");
Asserts.nullCheckForClass(clazz);
Annotation[][] parameterAnns = method.getParameterAnnotations();
@@ -370,7 +370,7 @@ public final class AnnotationManager
*/
public Set<Annotation> getQualifierAnnotations(Collection<Annotation> annotations)
{
- Asserts.assertNotNull(annotations, "Annotations argument can not be null");
+ Asserts.assertNotNull(annotations, "annotations");
if (annotations.isEmpty())
{
@@ -503,7 +503,7 @@ public final class AnnotationManager
public boolean hasStereoTypeMetaAnnotation(Set<Class<? extends Annotation>> anns)
{
- Asserts.assertNotNull(anns, "anns parameter can not be null");
+ Asserts.assertNotNull(anns, "anns");
for (Class<? extends Annotation> ann : anns)
{
@@ -518,7 +518,7 @@ public final class AnnotationManager
public boolean hasStereoTypeMetaAnnotation(Annotation[] anns)
{
- Asserts.assertNotNull(anns, "anns parameter can not be null");
+ Asserts.assertNotNull(anns, "anns");
for (Annotation ann : anns)
{
@@ -533,7 +533,7 @@ public final class AnnotationManager
public Annotation[] getStereotypeMetaAnnotations(Annotation[] anns)
{
- Asserts.assertNotNull(anns, "anns parameter can not be null");
+ Asserts.assertNotNull(anns, "anns");
List<Annotation> interAnns = new ArrayList<Annotation>();
for (Annotation ann : anns)
@@ -559,7 +559,7 @@ public final class AnnotationManager
*/
public Set<Class<? extends Annotation>> getStereotypeMetaAnnotations(Set<Class<? extends Annotation>> stereotypes)
{
- Asserts.assertNotNull(stereotypes, "anns parameter can not be null");
+ Asserts.assertNotNull(stereotypes, "anns");
Set<Class<? extends Annotation>> interAnns = new HashSet<Class<? extends Annotation>>();
for (Class<? extends Annotation> ann : stereotypes)
@@ -591,7 +591,7 @@ public final class AnnotationManager
*/
public Set<Class<? extends Annotation>> getStereotypes(Set<Class<? extends Annotation>> anns)
{
- Asserts.assertNotNull(anns, "bean parameter can not be null");
+ Asserts.assertNotNull(anns, "bean");
if (hasStereoTypeMetaAnnotation(anns))
{
return getStereotypeMetaAnnotations(anns);
@@ -752,9 +752,9 @@ public final class AnnotationManager
public Annotation[] checkForNewQualifierForDeployment(Type type, Class<?> clazz, String name,
Annotation[] annotations)
{
- Asserts.assertNotNull(type, "Type argument can not be null");
+ Asserts.assertNotNull(type, "Type argument");
Asserts.nullCheckForClass(clazz);
- Asserts.assertNotNull(annotations, "Annotations argument can not be null");
+ Asserts.assertNotNull(annotations, "Annotations argument");
Annotation[] as = getQualifierAnnotations(annotations);
for (Annotation a : annotations)
@@ -784,9 +784,9 @@ public final class AnnotationManager
Method method,
Method superMethod)
{
- Asserts.assertNotNull(component,"component parameter can not be null");
- Asserts.assertNotNull(method,"method parameter can not be null");
- Asserts.assertNotNull(superMethod,"superMethod parameter can not be null");
+ Asserts.assertNotNull(component,"component");
+ Asserts.assertNotNull(method,"method");
+ Asserts.assertNotNull(superMethod,"superMethod");
boolean hasName = false;
if(AnnotationUtil.hasMethodAnnotation(superMethod, Named.class))
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java Mon May 18 17:03:11 2015
@@ -47,7 +47,7 @@ public abstract class BuiltInOwbBean<T>
ProducerFactory<T> producerFactory)
{
super(webBeansContext, webBeansType, beanAttributes, returnType, nullable);
- Asserts.assertNotNull(producerFactory, "ProducerFactory may not be null");
+ Asserts.assertNotNull(producerFactory, "ProducerFactory");
producer = producerFactory.createProducer(this);
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java Mon May 18 17:03:11 2015
@@ -68,7 +68,7 @@ public class InjectionTargetBean<T> exte
InjectionTargetFactory<T> factory)
{
super(webBeansContext, webBeansType, beanAttributes, beanClass, false);
- Asserts.assertNotNull(annotatedType, "AnnotatedType may not be null");
+ Asserts.assertNotNull(annotatedType, "AnnotatedType");
this.annotatedType = annotatedType;
injectionTarget = factory.createInjectionTarget(this);
setEnabled(true);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java Mon May 18 17:03:11 2015
@@ -44,9 +44,9 @@ public abstract class AbstractProducerBe
public AbstractProducerBeanBuilder(InjectionTargetBean<?> parent, A annotated, BeanAttributes<T> beanAttributes)
{
- Asserts.assertNotNull(parent, "webBeansContext may not be null");
- Asserts.assertNotNull(annotated, "annotated may not be null");
- Asserts.assertNotNull(beanAttributes, "beanAttributes may not be null");
+ Asserts.assertNotNull(parent, "webBeansContext");
+ Asserts.assertNotNull(annotated, "annotated");
+ Asserts.assertNotNull(beanAttributes, "beanAttributes");
this.parent = parent;
annotatedMember = annotated;
this.beanAttributes = beanAttributes;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java Mon May 18 17:03:11 2015
@@ -54,7 +54,7 @@ public abstract class BaseProducerFactor
public BaseProducerFactory(Bean<P> parent, WebBeansContext webBeansContext)
{
- Asserts.assertNotNull(webBeansContext, "WebBeansContext may not be null");
+ Asserts.assertNotNull(webBeansContext, "WebBeansContext");
this.parent = parent;
this.webBeansContext = webBeansContext;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java Mon May 18 17:03:11 2015
@@ -552,7 +552,7 @@ public abstract class BeanAttributesBuil
private BeanAttributesBuilderFactory(WebBeansContext webBeansContext)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext may not be null");
+ Asserts.assertNotNull(webBeansContext, "webBeansContext");
this.webBeansContext = webBeansContext;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java Mon May 18 17:03:11 2015
@@ -83,9 +83,9 @@ public class DecoratorBeanBuilder<T> ext
public DecoratorBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType, BeanAttributes<T> beanAttributes)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext may not be null");
- Asserts.assertNotNull(annotatedType, "annotated type may not be null");
- Asserts.assertNotNull(beanAttributes, "beanAttributes may not be null");
+ Asserts.assertNotNull(webBeansContext, "webBeansContext");
+ Asserts.assertNotNull(annotatedType, "annotated type");
+ Asserts.assertNotNull(beanAttributes, "beanAttributes");
this.webBeansContext = webBeansContext;
this.annotatedType = annotatedType;
this.beanAttributes = beanAttributes;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java Mon May 18 17:03:11 2015
@@ -31,8 +31,8 @@ public class ExtensionBeanBuilder<T>
public ExtensionBeanBuilder(WebBeansContext webBeansContext, Class<T> type)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext may not be null");
- Asserts.assertNotNull(type, "type may not be null");
+ Asserts.assertNotNull(webBeansContext, "webBeansContext");
+ Asserts.assertNotNull(type, "type");
this.webBeansContext = webBeansContext;
annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(type);
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java Mon May 18 17:03:11 2015
@@ -40,7 +40,7 @@ public class FieldProducerFactory<P> ext
public FieldProducerFactory(AnnotatedField<? super P> producerField, Bean<P> parent, WebBeansContext webBeansContext)
{
super(parent, webBeansContext);
- Asserts.assertNotNull(producerField, "producer method may not be null");
+ Asserts.assertNotNull(producerField, "producer method");
if (producerField.isAnnotationPresent(Inject.class))
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java Mon May 18 17:03:11 2015
@@ -66,9 +66,9 @@ public abstract class InterceptorBeanBui
protected InterceptorBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType, BeanAttributes<T> beanAttributes)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext may not be null");
- Asserts.assertNotNull(annotatedType, "annotated type may not be null");
- Asserts.assertNotNull(beanAttributes, "beanAttributes may not be null");
+ Asserts.assertNotNull(webBeansContext, "webBeansContext");
+ Asserts.assertNotNull(annotatedType, "annotated type");
+ Asserts.assertNotNull(beanAttributes, "beanAttributes");
this.webBeansContext = webBeansContext;
this.annotatedType = annotatedType;
this.beanAttributes = beanAttributes;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java Mon May 18 17:03:11 2015
@@ -48,9 +48,9 @@ public class ManagedBeanBuilder<T, M ext
*/
public ManagedBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType, BeanAttributes<T> beanAttributes)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext may not be null");
- Asserts.assertNotNull(annotatedType, "annotated type may not be null");
- Asserts.assertNotNull(beanAttributes, "beanAttributes may not be null");
+ Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+ Asserts.assertNotNull(annotatedType, "annotated type");
+ Asserts.assertNotNull(beanAttributes, "beanAttributes");
this.webBeansContext = webBeansContext;
this.annotatedType = annotatedType;
this.beanAttributes = beanAttributes;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java Mon May 18 17:03:11 2015
@@ -37,7 +37,7 @@ public class MethodProducerFactory<P> ex
public MethodProducerFactory(AnnotatedMethod<? super P> producerMethod, Bean<P> parent, WebBeansContext webBeansContext)
{
super(parent, webBeansContext);
- Asserts.assertNotNull(producerMethod, "producer method may not be null");
+ Asserts.assertNotNull(producerMethod, "producer method");
this.producerMethod = producerMethod;
defineDisposalMethod();
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java Mon May 18 17:03:11 2015
@@ -59,8 +59,8 @@ public class ObserverMethodsBuilder<T>
*/
public ObserverMethodsBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext may not be null");
- Asserts.assertNotNull(annotatedType, "annotated type may not be null");
+ Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+ Asserts.assertNotNull(annotatedType, "annotated type");
this.webBeansContext = webBeansContext;
this.annotatedType = annotatedType;
}
@@ -119,7 +119,7 @@ public class ObserverMethodsBuilder<T>
private void checkObserverMethodConditions(AbstractOwbBean<?> bean, AnnotatedParameter<?> annotatedParameter)
{
- Asserts.assertNotNull(annotatedParameter, "annotatedParameter can not be null");
+ Asserts.assertNotNull(annotatedParameter, "annotatedParameter");
AnnotatedMethod<?> annotatedMethod = (AnnotatedMethod<?>)annotatedParameter.getDeclaringCallable();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java Mon May 18 17:03:11 2015
@@ -55,8 +55,8 @@ public class ProducerFieldBeansBuilder<T
*/
public ProducerFieldBeansBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext may not be null");
- Asserts.assertNotNull(annotatedType, "annotated type may not be null");
+ Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+ Asserts.assertNotNull(annotatedType, "annotated type");
this.webBeansContext = webBeansContext;
this.annotatedType = annotatedType;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java Mon May 18 17:03:11 2015
@@ -54,8 +54,8 @@ public class ProducerMethodBeansBuilder<
*/
public ProducerMethodBeansBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext may not be null");
- Asserts.assertNotNull(annotatedType, "annotated type may not be null");
+ Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+ Asserts.assertNotNull(annotatedType, "annotated type");
this.webBeansContext = webBeansContext;
this.annotatedType = annotatedType;
}
@@ -135,7 +135,7 @@ public class ProducerMethodBeansBuilder<
*/
private void checkProducerMethodForDeployment(AnnotatedMethod<? super T> annotatedMethod)
{
- Asserts.assertNotNull(annotatedMethod, "annotatedMethod argument can not be null");
+ Asserts.assertNotNull(annotatedMethod, "annotatedMethod argument");
if (annotatedMethod.isAnnotationPresent(Inject.class) ||
annotatedMethod.isAnnotationPresent(Disposes.class) ||
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbGenericArrayTypeImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbGenericArrayTypeImpl.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbGenericArrayTypeImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbGenericArrayTypeImpl.java Mon May 18 17:03:11 2015
@@ -21,7 +21,6 @@ package org.apache.webbeans.config;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Type;
-import org.apache.webbeans.util.Asserts;
public class OwbGenericArrayTypeImpl implements GenericArrayType
{
@@ -30,7 +29,6 @@ public class OwbGenericArrayTypeImpl imp
public OwbGenericArrayTypeImpl(Type componentType)
{
- Asserts.assertNotNull(componentType, "component type may not be null");
this.componentType = componentType;
}
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=1680056&r1=1680055&r2=1680056&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 Mon May 18 17:03:11 2015
@@ -289,7 +289,7 @@ public class BeanManagerImpl implements
@Override
public Context getContext(Class<? extends Annotation> scopeType)
{
- Asserts.assertNotNull(scopeType, "scopeType parameter can not be null");
+ Asserts.assertNotNull(scopeType, "scopeType");
Context standardContext = webBeansContext.getContextsService().getCurrentContext(scopeType);
@@ -525,8 +525,8 @@ public class BeanManagerImpl implements
private void addContext(Class<? extends Annotation> scopeType, javax.enterprise.context.spi.Context context)
{
- Asserts.assertNotNull(scopeType, "scopeType parameter can not be null");
- Asserts.assertNotNull(context, "context parameter can not be null");
+ Asserts.assertNotNull(scopeType, "scopeType");
+ Asserts.assertNotNull(context, "context");
List<Context> contextList = contextMap.get(scopeType);
@@ -605,7 +605,7 @@ public class BeanManagerImpl implements
@Override
public Set<Bean<?>> getBeans(String name)
{
- Asserts.assertNotNull(name, "name parameter can not be null");
+ Asserts.assertNotNull(name, "name");
return injectionResolver.implResolveByName(name);
}
@@ -623,7 +623,7 @@ public class BeanManagerImpl implements
@Override
public Object getInjectableReference(InjectionPoint injectionPoint, CreationalContext<?> ownerCreationalContext)
{
- Asserts.assertNotNull(injectionPoint, "injectionPoint parameter can not be null");
+ Asserts.assertNotNull(injectionPoint, "injectionPoint");
//Injected instance
Object instance = null;
@@ -702,7 +702,7 @@ public class BeanManagerImpl implements
@Override
public Object getReference(Bean<?> bean, Type beanType, CreationalContext<?> creationalContext)
{
- Asserts.assertNotNull(bean, "bean parameter can not be null");
+ Asserts.assertNotNull(bean, "bean parameter");
Context context = null;
Object instance = null;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Mon May 18 17:03:11 2015
@@ -340,7 +340,7 @@ public class InjectionResolver
@SuppressWarnings("unchecked")
public Set<Bean<?>> implResolveByName(String name)
{
- Asserts.assertNotNull(name, "name parameter can not be null");
+ Asserts.assertNotNull(name, "name parameter");
String cacheKey = name;
Set<Bean<?>> resolvedComponents = resolvedBeansByName.get(cacheKey);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java Mon May 18 17:03:11 2015
@@ -45,8 +45,8 @@ public class InjectionTargetFactoryImpl<
public InjectionTargetFactoryImpl(AnnotatedType<T> annotatedType, WebBeansContext webBeansContext)
{
- Asserts.assertNotNull(annotatedType, "AnnotatedType may not be null");
- Asserts.assertNotNull(webBeansContext, "WebBeansContext may not be null");
+ Asserts.assertNotNull(annotatedType, "AnnotatedType");
+ Asserts.assertNotNull(webBeansContext, "WebBeansContext");
this.annotatedType = annotatedType;
this.webBeansContext = webBeansContext;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Mon May 18 17:03:11 2015
@@ -20,7 +20,6 @@ package org.apache.webbeans.context.crea
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansException;
-import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.WebBeansUtil;
import javax.enterprise.context.spi.Contextual;
@@ -189,8 +188,6 @@ public class CreationalContextImpl<T> im
*/
public <K> void addDependent(Contextual<K> dependent, Object instance)
{
- Asserts.assertNotNull(dependent,"dependent parameter cannot be null");
-
if(instance != null)
{
DependentCreationalContext<K> dependentCreational = new DependentCreationalContext<K>(dependent);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java Mon May 18 17:03:11 2015
@@ -121,7 +121,7 @@ public class ConversationManager
*/
public void addToConversationStorage(ConversationContext conversationContext, String conversationId)
{
- Asserts.assertNotNull(conversationId, "conversationId must be set");
+ Asserts.assertNotNull(conversationId, "conversationId");
Context sessionContext = webBeansContext.getContextsService().getCurrentContext(SessionScoped.class);
Set<ConversationContext> sessionConversations = getSessionConversations(sessionContext, true);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java Mon May 18 17:03:11 2015
@@ -66,7 +66,7 @@ public class DefaultSingletonService imp
*/
public void clearInstances(ClassLoader classLoader)
{
- Asserts.assertNotNull(classLoader, "classloader is null");
+ Asserts.assertNotNull(classLoader, "classloader");
synchronized (singletonMap)
{
singletonMap.remove(classLoader);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java Mon May 18 17:03:11 2015
@@ -63,7 +63,7 @@ public class DecoratorsManager
public void addEnabledDecorator(Class<?> decoratorClazz)
{
- Asserts.assertNotNull(decoratorClazz, "decoratorClazz parameter can not be emtpy");
+ Asserts.assertNotNull(decoratorClazz, "decoratorClazz parameter");
if (!enabledDecorators.contains(decoratorClazz))
{
enabledDecorators.add(decoratorClazz);
@@ -72,8 +72,8 @@ public class DecoratorsManager
public int compare(Class<?> src, Class<?> target)
{
- Asserts.assertNotNull(src, "src parameter can not be null");
- Asserts.assertNotNull(target, "target parameter can not be null");
+ Asserts.assertNotNull(src, "src parameter");
+ Asserts.assertNotNull(target, "target parameter");
final int p1 = priorityDecorators.getSorted().indexOf(src);
final int p2 = priorityDecorators.getSorted().indexOf(target);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java Mon May 18 17:03:11 2015
@@ -51,7 +51,7 @@ public class StereoTypeManager
*/
public void addStereoTypeModel(IStereoTypeModel model)
{
- Asserts.assertNotNull(model, "model parameter can not be null");
+ Asserts.assertNotNull(model, "model parameter");
stereoTypeMap.put(model.getName(), model);
}
@@ -63,7 +63,7 @@ public class StereoTypeManager
*/
public IStereoTypeModel getStereoTypeModel(String modelName)
{
- Asserts.assertNotNull(modelName, "modelName parameter can not be null");
+ Asserts.assertNotNull(modelName, "modelName parameter");
if (stereoTypeMap.containsKey(modelName))
{
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=1680056&r1=1680055&r2=1680056&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 Mon May 18 17:03:11 2015
@@ -54,7 +54,7 @@ public class EventImpl<T> implements Eve
*/
public EventImpl(EventMetadata metadata, WebBeansContext webBeansContext)
{
- Asserts.assertNotNull(metadata, "event metadata may not be null");
+ Asserts.assertNotNull(metadata, "event metadata");
this.metadata = wrapMetadata(metadata);
this.webBeansContext = webBeansContext;
}
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=1680056&r1=1680055&r2=1680056&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 Mon May 18 17:03:11 2015
@@ -700,7 +700,7 @@ public final class NotificationManager
*/
public <T> ObserverMethod<?> getObservableMethodForAnnotatedMethod(AnnotatedMethod<?> annotatedMethod, AnnotatedParameter<?> annotatedParameter, AbstractOwbBean<T> bean)
{
- Asserts.assertNotNull(annotatedParameter, "annotatedParameter can not be null");
+ Asserts.assertNotNull(annotatedParameter, "annotatedParameter");
//Observer creation from annotated method
ObserverMethodImpl<T> observer = isContainerEvent(annotatedParameter)?
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java Mon May 18 17:03:11 2015
@@ -105,7 +105,7 @@ public class InjectionPointFactory
public <X> InjectionPoint buildInjectionPoint(Bean<?> owner, AnnotatedField<X> annotField, boolean fireEvent)
{
- Asserts.assertNotNull(annotField, "annotField parameter can not be null");
+ Asserts.assertNotNull(annotField, "annotField");
Annotation[] annots = AnnotationUtil.asArray(annotField.getAnnotations());
Annotation[] qualifierAnnots = webBeansContext.getAnnotationManager().getQualifierAnnotations(annots);
@@ -150,7 +150,7 @@ public class InjectionPointFactory
public <X> InjectionPoint buildInjectionPoint(Bean<?> owner, AnnotatedParameter<X> parameter, boolean fireEvent)
{
- Asserts.assertNotNull(parameter, "parameter parameter can not be null");
+ Asserts.assertNotNull(parameter, "annotatedParameter");
Set<Annotation> anns = parameter.getAnnotations();
Annotation[] qualifierAnnots = webBeansContext.getAnnotationManager().getQualifierAnnotations(anns.toArray(new Annotation[anns.size()]));
InjectionPointImpl injectionPoint = new InjectionPointImpl(owner, Arrays.asList(qualifierAnnots), parameter);
@@ -173,8 +173,6 @@ public class InjectionPointFactory
private <X> void buildInjectionPoints(Bean<?> owner, AnnotatedCallable<X> callable, Collection<InjectionPoint> lists)
{
- Asserts.assertNotNull(callable, "callable parameter can not be null");
-
List<AnnotatedParameter<X>> parameters = callable.getParameters();
for (AnnotatedParameter<?> parameter : parameters)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java Mon May 18 17:03:11 2015
@@ -88,7 +88,7 @@ class InjectionPointImpl implements Inje
*/
InjectionPointImpl(Bean<?> bean)
{
- Asserts.assertNotNull(bean, "bean may not be null");
+ Asserts.assertNotNull(bean, "bean");
this.ownerBean = bean;
this.injectionType = bean.getBeanClass();
this.qualifierAnnotations = bean.getQualifiers() == null ?
@@ -110,7 +110,7 @@ class InjectionPointImpl implements Inje
{
throw new IllegalArgumentException("member is null");
}
- Asserts.assertNotNull(qualifiers, "qualifiers may not be null");
+ Asserts.assertNotNull(qualifiers, "qualifiers");
this.ownerBean = ownerBean;
injectionType = type;
qualifierAnnotations = Collections.unmodifiableSet(new HashSet<Annotation>(qualifiers));
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java Mon May 18 17:03:11 2015
@@ -88,9 +88,9 @@ public class InterceptorResolutionServic
public <T> BeanInterceptorInfo calculateInterceptorInfo(Set<Type> beanTypes, Set<Annotation> qualifiers, AnnotatedType<T> annotatedType)
{
- Asserts.assertNotNull(beanTypes, "beanTypes must not be null!");
- Asserts.assertNotNull(qualifiers, "qualifiers must not be null!");
- Asserts.assertNotNull(annotatedType, "AnnotatedType must not be null!");
+ Asserts.assertNotNull(beanTypes, "beanTypes");
+ Asserts.assertNotNull(qualifiers, "qualifiers");
+ Asserts.assertNotNull(annotatedType, "AnnotatedType");
List<AnnotatedMethod> interceptableAnnotatedMethods = getInterceptableBusinessMethods(annotatedType);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java Mon May 18 17:03:11 2015
@@ -154,8 +154,8 @@ public class InterceptorsManager
*/
public int compareCdiInterceptors(Class<?> src, Class<?> target)
{
- Asserts.assertNotNull(src, "src parameter can not be null");
- Asserts.assertNotNull(target, "target parameter can not be null");
+ Asserts.assertNotNull(src, "src");
+ Asserts.assertNotNull(target, "target");
final int p1 = priorityInterceptors.getSorted().indexOf(src);
final int p2 = priorityInterceptors.getSorted().indexOf(target);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java Mon May 18 17:03:11 2015
@@ -168,7 +168,7 @@ public final class AnnotatedElementFacto
*/
public <X> AnnotatedType<X> newAnnotatedType(Class<X> annotatedClass)
{
- Asserts.assertNotNull(annotatedClass, "annotatedClass is null");
+ Asserts.assertNotNull(annotatedClass, "annotatedClass");
ConcurrentMap<String, AnnotatedType<X>> annotatedTypes = getAnnotatedTypeCache(annotatedClass);
AnnotatedType<X> annotatedType = annotatedTypes.get(OWB_DEFAULT_KEY);
if(annotatedType == null)
@@ -228,8 +228,8 @@ public final class AnnotatedElementFacto
@SuppressWarnings("unchecked")
public <X> AnnotatedConstructor<X> newAnnotatedConstructor(Constructor<X> constructor, AnnotatedType<X> declaringClass)
{
- Asserts.assertNotNull(constructor, "constructor is null");
- Asserts.assertNotNull(declaringClass, "declaringClass is null");
+ Asserts.assertNotNull(constructor, "constructor");
+ Asserts.assertNotNull(declaringClass, "declaringClass");
AnnotatedConstructorImpl<X> annConstructor;
if(annotatedConstructorCache.containsKey(constructor))
@@ -260,8 +260,8 @@ public final class AnnotatedElementFacto
@SuppressWarnings("unchecked")
public <X> AnnotatedField<X> newAnnotatedField(Field field, AnnotatedType<X> declaringClass)
{
- Asserts.assertNotNull(field, "field is null");
- Asserts.assertNotNull(declaringClass, "declaringClass is null");
+ Asserts.assertNotNull(field, "field");
+ Asserts.assertNotNull(declaringClass, "declaringClass");
AnnotatedFieldImpl<X> annotField;
if(annotatedFieldCache.containsKey(field))
@@ -292,8 +292,8 @@ public final class AnnotatedElementFacto
@SuppressWarnings("unchecked")
public <X> AnnotatedMethod<X> newAnnotatedMethod(Method method, AnnotatedType<X> declaringType)
{
- Asserts.assertNotNull(method, "method is null");
- Asserts.assertNotNull(declaringType, "declaringType is null");
+ Asserts.assertNotNull(method, "method");
+ Asserts.assertNotNull(declaringType, "declaringType");
AnnotatedMethodImpl<X> annotMethod;
if(annotatedMethodCache.containsKey(method))
@@ -319,7 +319,7 @@ public final class AnnotatedElementFacto
*/
public <T> Set<AnnotatedMethod<? super T>> getFilteredAnnotatedMethods(AnnotatedType<T> annotatedType)
{
- Asserts.assertNotNull(annotatedType, "annotatedType is null");
+ Asserts.assertNotNull(annotatedType, "annotatedType");
Set<AnnotatedMethod<?>> methods = annotatedMethodsOfTypeCache.get(annotatedType);
if (methods != null)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java Mon May 18 17:03:11 2015
@@ -53,7 +53,7 @@ public abstract class BaseProducerProduc
WebBeansContext webBeansContext)
{
super(points);
- Asserts.assertNotNull(webBeansContext, "WebBeansContext may not be null");
+ Asserts.assertNotNull(webBeansContext, "WebBeansContext");
this.owner = owner;
this.webBeansContext = webBeansContext;
this.disposalIPs = disposalIPs;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java Mon May 18 17:03:11 2015
@@ -53,7 +53,7 @@ public class ProducerFieldProducer<T, P>
{
throw new IllegalArgumentException("owner may not be null");
}
- Asserts.assertNotNull(producerField, "field may not be null");
+ Asserts.assertNotNull(producerField, "producerField");
this.producerField = producerField;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java Mon May 18 17:03:11 2015
@@ -50,7 +50,7 @@ public class ProducerMethodProducer<T, P
WebBeansContext webBeansContext)
{
super(owner, disposerMethod, points, disposalIPs, webBeansContext);
- Asserts.assertNotNull(producerMethod, "method may not be null");
+ Asserts.assertNotNull(producerMethod, "producerMethod");
if (!producerMethod.isStatic())
{
if (owner == null)
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=1680056&r1=1680055&r2=1680056&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 Mon May 18 17:03:11 2015
@@ -128,7 +128,7 @@ public final class AnnotationUtil
public static <X> boolean hasAnnotatedMethodParameterAnnotation(AnnotatedMethod<X> annotatedMethod, Class<? extends Annotation> clazz)
{
- Asserts.assertNotNull(annotatedMethod, "annotatedMethod argument can not be null");
+ Asserts.assertNotNull(annotatedMethod, "annotatedMethod argument");
Asserts.nullCheckForClass(clazz);
List<AnnotatedParameter<X>> parameters = annotatedMethod.getParameters();
@@ -181,8 +181,8 @@ public final class AnnotationUtil
*/
public static boolean isCdiAnnotationEqual(final AnnotatedType<?> at, final Annotation annotation1, final Annotation annotation2)
{
- Asserts.assertNotNull(annotation1, "annotation1 argument can not be null");
- Asserts.assertNotNull(annotation2, "annotation2 argument can not be null");
+ Asserts.assertNotNull(annotation1, "annotation1 argument");
+ Asserts.assertNotNull(annotation2, "annotation2 argument");
Class<?> qualifier1AnnotationType = at.getJavaClass();
@@ -202,8 +202,16 @@ public final class AnnotationUtil
public static boolean isCdiAnnotationEqual(Annotation annotation1, Annotation annotation2)
{
- Asserts.assertNotNull(annotation1, "annotation1 argument can not be null");
- Asserts.assertNotNull(annotation2, "annotation2 argument can not be null");
+ if (annotation1 == null && annotation2 == null)
+ {
+ return true;
+ }
+
+ if (annotation1 == null && annotation2 != null || annotation1 != null && annotation2 == null)
+
+ {
+ return false;
+ }
Class<? extends Annotation> qualifier1AnnotationType
= annotation1.annotationType();
@@ -234,7 +242,10 @@ public final class AnnotationUtil
*/
public static int getCdiAnnotationHashCode(Annotation annotation)
{
- Asserts.assertNotNull(annotation, "annotation argument can not be null");
+ if (annotation == null)
+ {
+ return 0;
+ }
int hashCode = 0;
@@ -425,7 +436,7 @@ public final class AnnotationUtil
public static boolean hasClassAnnotation(Class<?> clazz, Class<? extends Annotation> annotation)
{
Asserts.nullCheckForClass(clazz);
- Asserts.assertNotNull(annotation, "Annotation argument can not be null");
+ Asserts.assertNotNull(annotation, "Annotation");
try
{
@@ -446,9 +457,6 @@ public final class AnnotationUtil
public static boolean hasMetaAnnotation(Annotation[] anns, Class<? extends Annotation> metaAnnotation)
{
- Asserts.assertNotNull(anns, "Anns argument can not be null");
- Asserts.assertNotNull(metaAnnotation, "MetaAnnotation argument can not be null");
-
for (Annotation annot : anns)
{
if (annot.annotationType().isAnnotationPresent(metaAnnotation))
@@ -475,8 +483,6 @@ public final class AnnotationUtil
@SuppressWarnings("unchecked")
public static <T extends Annotation> T getAnnotation(Annotation[] anns, Class<T> annotation)
{
- Asserts.assertNotNull(anns, "anns argument can not be null");
- Asserts.assertNotNull(annotation, "annotation argument can not be null");
for (Annotation annot : anns)
{
if (annot.annotationType().equals(annotation))
@@ -499,8 +505,6 @@ public final class AnnotationUtil
{
List<Annotation> annots = new ArrayList<Annotation>();
Annotation[] result;
- Asserts.assertNotNull(anns, "Anns argument can not be null");
- Asserts.assertNotNull(metaAnnotation, "MetaAnnotation argument can not be null");
for (Annotation annot : anns)
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java Mon May 18 17:03:11 2015
@@ -41,13 +41,13 @@ public final class Asserts
* Check the object is null or not
*
* @param obj null check object
- * @param message exception message
+ * @param parameterName name of parameter which may not be null
*/
- public static void assertNotNull(Object obj, String message)
+ public static void assertNotNull(Object obj, String parameterName)
{
if (obj == null)
{
- throw new NullPointerException(message);
+ throw new NullPointerException(parameterName + " may not be null");
}
}
@@ -71,7 +71,7 @@ public final class Asserts
*/
public static void nullCheckForClass(Class<?> clazz)
{
- Asserts.assertNotNull(clazz, "clazz argument can not be null");
+ Asserts.assertNotNull(clazz, "clazz argument");
}
/**
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=1680056&r1=1680055&r2=1680056&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 May 18 17:03:11 2015
@@ -220,7 +220,6 @@ public final class ClassUtil
public static Object callInstanceMethod(Method method, Object instance, Object[] args)
{
Asserts.nullCheckForMethod(method);
- Asserts.assertNotNull(instance, "instance parameter can not be null");
try
{
@@ -472,8 +471,6 @@ public final class ClassUtil
*/
public static boolean isParametrizedType(Type type)
{
- Asserts.assertNotNull(type, "type parameter can not be null");
-
return type instanceof ParameterizedType;
}
@@ -486,14 +483,14 @@ public final class ClassUtil
*/
public static boolean isWildCardType(Type type)
{
- Asserts.assertNotNull(type, "type parameter can not be null");
+ Asserts.assertNotNull(type, "type");
return type instanceof WildcardType;
}
public static boolean isUnboundedTypeVariable(Type type)
{
- Asserts.assertNotNull(type, "type parameter can not be null");
+ Asserts.assertNotNull(type, "type");
if (type instanceof TypeVariable)
{
@@ -540,7 +537,7 @@ public final class ClassUtil
*/
public static boolean isTypeVariable(Type type)
{
- Asserts.assertNotNull(type, "type parameter can not be null");
+ Asserts.assertNotNull(type, "type");
return type instanceof TypeVariable;
}
@@ -572,8 +569,8 @@ public final class ClassUtil
*/
public static boolean isClassAssignableFrom(Class<?> lhs, Class<?> rhs)
{
- Asserts.assertNotNull(lhs, "lhs parameter can not be null");
- Asserts.assertNotNull(rhs, "rhs parameter can not be null");
+ Asserts.assertNotNull(lhs, "lhs");
+ Asserts.assertNotNull(rhs, "rhs");
if(lhs.isPrimitive())
{
@@ -689,7 +686,7 @@ public final class ClassUtil
*/
public static Type[] getActualTypeArguments(Type type)
{
- Asserts.assertNotNull(type, "type parameter can not be null");
+ Asserts.assertNotNull(type, "type");
if (type instanceof ParameterizedType)
{
@@ -775,7 +772,7 @@ public final class ClassUtil
*/
public static boolean checkParametrizedType(ParameterizedType pType)
{
- Asserts.assertNotNull(pType, "pType argument can not be null");
+ Asserts.assertNotNull(pType, "pType");
Type[] types = pType.getActualTypeArguments();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/JNDIUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/JNDIUtil.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/JNDIUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/JNDIUtil.java Mon May 18 17:03:11 2015
@@ -45,8 +45,8 @@ public final class JNDIUtil
public static void bind(String name, Object object)
{
- Asserts.assertNotNull(name, "name parameter can not be null");
- Asserts.assertNotNull(object, "object parameter can not be null");
+ Asserts.assertNotNull(name, "name");
+ Asserts.assertNotNull(object, "object");
try
{
@@ -79,7 +79,7 @@ public final class JNDIUtil
public static void unbind(String name)
{
- Asserts.assertNotNull(name, "name parameter can not be null");
+ Asserts.assertNotNull(name, "name");
try
{
@@ -96,7 +96,7 @@ public final class JNDIUtil
@SuppressWarnings("unchecked")
public static <T> T lookup(String name, Class<? extends T> expectedClass) throws WebBeansException
{
- Asserts.assertNotNull(name, "name parameter can not be null");
+ Asserts.assertNotNull(name, "name");
try
{
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=1680056&r1=1680055&r2=1680056&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 May 18 17:03:11 2015
@@ -210,7 +210,7 @@ public final class WebBeansUtil
*/
public static void checkProducerGenericType(Bean<?> bean,Member member)
{
- Asserts.assertNotNull(bean,"Bean is null");
+ Asserts.assertNotNull(bean,"Bean");
Type type;
@@ -437,7 +437,7 @@ public final class WebBeansUtil
*/
public <T> NewManagedBean<T> createNewComponent(OwbBean<T> bean, Class<T> type)
{
- Asserts.assertNotNull(bean, "bean may not be null");
+ Asserts.assertNotNull(bean, "bean");
if (!EnumSet.of(WebBeansType.MANAGED, WebBeansType.ENTERPRISE, WebBeansType.PRODUCERMETHOD, WebBeansType.PRODUCERFIELD).contains(bean.getWebBeansType()))
{
throw new WebBeansConfigurationException("@New annotation on type : " + bean.getBeanClass()
@@ -1184,8 +1184,8 @@ public final class WebBeansUtil
public static boolean isAlternative(AnnotatedType<?> beanType, Set<Class<? extends Annotation>> stereotypes)
{
- Asserts.assertNotNull(beanType, "bean type can not be null");
- Asserts.assertNotNull(stereotypes, "stereotypes can not be null");
+ Asserts.assertNotNull(beanType, "bean type");
+ Asserts.assertNotNull(stereotypes, "stereotypes");
boolean alternative = false;
@@ -1213,8 +1213,8 @@ public final class WebBeansUtil
public void setBeanEnableFlagForProducerBean(InjectionTargetBean<?> parent, AbstractProducerBean<?> producer, Annotation[] annotations)
{
- Asserts.assertNotNull(parent, "parent can not be null");
- Asserts.assertNotNull(producer, "producer can not be null");
+ Asserts.assertNotNull(parent, "parent");
+ Asserts.assertNotNull(producer, "producer");
Set<Class<? extends Annotation>> stereotypes = producer.getStereotypes();
boolean alternative = false;
Modified: openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java (original)
+++ openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsComponentFactory.java Mon May 18 17:03:11 2015
@@ -56,7 +56,7 @@ public final class JmsComponentFactory
public <T> JmsBean<T> getJmsComponent(WebBeansContext webBeansContext, JMSModel model)
{
- Asserts.assertNotNull(model,"model parameter can not be null");
+ Asserts.assertNotNull(model,"model parameter");
Set<Type> apiTypes = new HashSet<Type>();
Set<Annotation> qualifiers = new HashSet<Annotation>();
Modified: openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java (original)
+++ openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java Mon May 18 17:03:11 2015
@@ -55,7 +55,7 @@ public final class JmsUtil
public static boolean isJmsResourceClass(Class<?> clazz)
{
- Asserts.assertNotNull(clazz,"clazz parameter can not be null");
+ Asserts.assertNotNull(clazz,"clazz parameter");
if(ConnectionFactory.class.isAssignableFrom(clazz) ||
Connection.class.isAssignableFrom(clazz) ||
Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java (original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java Mon May 18 17:03:11 2015
@@ -64,7 +64,7 @@ public final class JSFUtil
public static String getRedirectViewIdWithCid(String redirectId, String cid)
{
- Asserts.assertNotNull(redirectId, "redirectId parameter can not be null");
+ Asserts.assertNotNull(redirectId, "redirectId");
StringBuilder buffer = new StringBuilder(redirectId);
int index = buffer.lastIndexOf("/");
Modified: openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/JSFUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/JSFUtil.java?rev=1680056&r1=1680055&r2=1680056&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/JSFUtil.java (original)
+++ openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/JSFUtil.java Mon May 18 17:03:11 2015
@@ -63,7 +63,7 @@ public final class JSFUtil
public static String getRedirectViewIdWithCid(String redirectId, String cid)
{
- Asserts.assertNotNull(redirectId, "redirectId parameter can not be null");
+ Asserts.assertNotNull(redirectId, "redirectId");
StringBuffer buffer = new StringBuffer(redirectId);
int index = buffer.lastIndexOf("/");