Author: struberg
Date: Tue May 26 06:52:38 2015
New Revision: 1681689
URL: http://svn.apache.org/r1681689
Log:
OWB-812 extract commonly used "WebBeansContext" param name
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.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/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/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/container/InjectionTargetFactoryImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.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=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -48,7 +48,7 @@ public abstract class EjbBeanBuilder<T,
public EjbBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T>
annotatedType, BeanAttributes<T> beanAttributes)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext");
+ Asserts.assertNotNull(webBeansContext,
Asserts.PARAM_NAME_WEBBEANSCONTEXT);
Asserts.assertNotNull(annotatedType, "annotated type");
Asserts.assertNotNull(beanAttributes, "beanAttributes");
this.webBeansContext = webBeansContext;
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=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -44,7 +44,7 @@ public abstract class AbstractProducerBe
public AbstractProducerBeanBuilder(InjectionTargetBean<?> parent, A
annotated, BeanAttributes<T> beanAttributes)
{
- Asserts.assertNotNull(parent, "webBeansContext");
+ Asserts.assertNotNull(parent, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
Asserts.assertNotNull(annotated, "annotated");
Asserts.assertNotNull(beanAttributes, "beanAttributes");
this.parent = parent;
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=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -54,7 +54,7 @@ public abstract class BaseProducerFactor
public BaseProducerFactory(Bean<P> parent, WebBeansContext webBeansContext)
{
- Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+ Asserts.assertNotNull(webBeansContext,
Asserts.PARAM_NAME_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=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -552,7 +552,7 @@ public abstract class BeanAttributesBuil
private BeanAttributesBuilderFactory(WebBeansContext webBeansContext)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext");
+ Asserts.assertNotNull(webBeansContext,
Asserts.PARAM_NAME_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=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -83,7 +83,7 @@ public class DecoratorBeanBuilder<T> ext
public DecoratorBeanBuilder(WebBeansContext webBeansContext,
AnnotatedType<T> annotatedType, BeanAttributes<T> beanAttributes)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext");
+ Asserts.assertNotNull(webBeansContext,
Asserts.PARAM_NAME_WEBBEANSCONTEXT);
Asserts.assertNotNull(annotatedType, "annotated type");
Asserts.assertNotNull(beanAttributes, "beanAttributes");
this.webBeansContext = webBeansContext;
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=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -31,7 +31,7 @@ public class ExtensionBeanBuilder<T>
public ExtensionBeanBuilder(WebBeansContext webBeansContext, Class<T> type)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext");
+ Asserts.assertNotNull(webBeansContext,
Asserts.PARAM_NAME_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/InterceptorBeanBuilder.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java?rev=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -66,7 +66,7 @@ public abstract class InterceptorBeanBui
protected InterceptorBeanBuilder(WebBeansContext webBeansContext,
AnnotatedType<T> annotatedType, BeanAttributes<T> beanAttributes)
{
- Asserts.assertNotNull(webBeansContext, "webBeansContext");
+ Asserts.assertNotNull(webBeansContext,
Asserts.PARAM_NAME_WEBBEANSCONTEXT);
Asserts.assertNotNull(annotatedType, "annotated type");
Asserts.assertNotNull(beanAttributes, "beanAttributes");
this.webBeansContext = webBeansContext;
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=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -48,7 +48,7 @@ public class ManagedBeanBuilder<T, M ext
*/
public ManagedBeanBuilder(WebBeansContext webBeansContext,
AnnotatedType<T> annotatedType, BeanAttributes<T> beanAttributes)
{
- Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+ Asserts.assertNotNull(webBeansContext,
Asserts.PARAM_NAME_WEBBEANSCONTEXT);
Asserts.assertNotNull(annotatedType, "annotated type");
Asserts.assertNotNull(beanAttributes, "beanAttributes");
this.webBeansContext = webBeansContext;
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=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -59,7 +59,7 @@ public class ObserverMethodsBuilder<T>
*/
public ObserverMethodsBuilder(WebBeansContext webBeansContext,
AnnotatedType<T> annotatedType)
{
- Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+ Asserts.assertNotNull(webBeansContext,
Asserts.PARAM_NAME_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/ProducerFieldBeansBuilder.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java?rev=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -55,7 +55,7 @@ public class ProducerFieldBeansBuilder<T
*/
public ProducerFieldBeansBuilder(WebBeansContext webBeansContext,
AnnotatedType<T> annotatedType)
{
- Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+ Asserts.assertNotNull(webBeansContext,
Asserts.PARAM_NAME_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=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -54,7 +54,7 @@ public class ProducerMethodBeansBuilder<
*/
public ProducerMethodBeansBuilder(WebBeansContext webBeansContext,
AnnotatedType<T> annotatedType)
{
- Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+ Asserts.assertNotNull(webBeansContext,
Asserts.PARAM_NAME_WEBBEANSCONTEXT);
Asserts.assertNotNull(annotatedType, "annotated type");
this.webBeansContext = webBeansContext;
this.annotatedType = annotatedType;
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=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -46,7 +46,7 @@ public class InjectionTargetFactoryImpl<
public InjectionTargetFactoryImpl(AnnotatedType<T> annotatedType,
WebBeansContext webBeansContext)
{
Asserts.assertNotNull(annotatedType, "AnnotatedType");
- Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+ Asserts.assertNotNull(webBeansContext,
Asserts.PARAM_NAME_WEBBEANSCONTEXT);
this.annotatedType = annotatedType;
this.webBeansContext = webBeansContext;
}
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=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -53,7 +53,7 @@ public abstract class BaseProducerProduc
WebBeansContext webBeansContext)
{
super(points);
- Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+ Asserts.assertNotNull(webBeansContext,
Asserts.PARAM_NAME_WEBBEANSCONTEXT);
this.owner = owner;
this.webBeansContext = webBeansContext;
this.disposalIPs = disposalIPs;
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=1681689&r1=1681688&r2=1681689&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
Tue May 26 06:52:38 2015
@@ -28,6 +28,8 @@ import java.lang.reflect.Method;
*/
public final class Asserts
{
+ public static final String PARAM_NAME_WEBBEANSCONTEXT = "WebBeansContetx";
+ public static final String PARAM_NAME_ANNOTATION = "Annotation";
/*
* Private constructor
