This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 757ad4e OWB-1326 remove propagating Bean#isNullable()
757ad4e is described below
commit 757ad4ee701d32de57b81ddd046b4612613d9ab2
Author: Mark Struberg <[email protected]>
AuthorDate: Thu Jun 4 12:51:40 2020 +0200
OWB-1326 remove propagating Bean#isNullable()
This method got deprecated as of CDI 1.1.
The reason is that
a.) This information never was reliable.
b.) It's of no use. Because this information is only needed during runtime.
It's simply not static.
---
.../apache/webbeans/component/AbstractOwbBean.java | 5 ++--
.../webbeans/component/AbstractProducerBean.java | 2 +-
.../webbeans/component/BeanAttributesImpl.java | 21 +++++++--------
.../apache/webbeans/component/BeanManagerBean.java | 1 -
.../webbeans/component/BeanMetadataBean.java | 1 -
.../apache/webbeans/component/BuiltInOwbBean.java | 5 ++--
.../webbeans/component/ConversationBean.java | 2 --
.../webbeans/component/DecoratorMetadataBean.java | 1 -
.../org/apache/webbeans/component/EventBean.java | 1 -
.../webbeans/component/EventMetadataBean.java | 1 -
.../apache/webbeans/component/ExtensionBean.java | 1 -
.../webbeans/component/InjectionPointBean.java | 1 -
.../webbeans/component/InjectionTargetBean.java | 2 +-
.../apache/webbeans/component/InstanceBean.java | 1 -
.../InterceptedOrDecoratedBeanMetadataBean.java | 1 -
.../component/InterceptionFactoryBean.java | 1 -
.../component/InterceptorMetadataBean.java | 1 -
.../ProducerAwareInjectionTargetBean.java | 3 +--
.../component/creation/BeanAttributesBuilder.java | 31 +---------------------
.../third/ThirdpartyBeanAttributesImpl.java | 2 +-
.../component/third/ThirdpartyBeanImpl.java | 3 +--
.../BeanAttributesConfiguratorImpl.java | 2 +-
.../apache/webbeans/container/BeanManagerImpl.java | 1 -
.../control/RequestContextControllerBean.java | 1 -
.../test/tests/MultipleTimeTheSameBindingTest.java | 2 +-
.../org/apache/webbeans/jms/component/JmsBean.java | 2 +-
26 files changed, 23 insertions(+), 72 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
index 7b487f6..78f3df4 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
@@ -82,10 +82,9 @@ public abstract class AbstractOwbBean<T>
protected AbstractOwbBean(WebBeansContext webBeansContext,
WebBeansType webBeansType,
BeanAttributes<T> beanAttributes,
- Class<?> beanClass,
- boolean nullable)
+ Class<?> beanClass)
{
- super(beanAttributes, nullable);
+ super(beanAttributes);
this.webBeansType = webBeansType;
this.beanClass = beanClass;
this.webBeansContext = webBeansContext;
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
index c2a2471..64ab944 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
@@ -53,7 +53,7 @@ public class AbstractProducerBean<T> extends
AbstractOwbBean<T>
Class<T> returnType,
ProducerFactory<?> producerFactory)
{
- super(ownerComponent.webBeansContext, webBeansType, beanAttributes,
ownerComponent.getBeanClass(), !returnType.isPrimitive());
+ super(ownerComponent.webBeansContext, webBeansType, beanAttributes,
ownerComponent.getBeanClass());
this.returnType = returnType;
this.ownerComponent = ownerComponent;
producer = producerFactory.createProducer(this);
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java
index 46182aa..728e56f 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java
@@ -35,7 +35,6 @@ public class BeanAttributesImpl<T> implements
BeanAttributes<T>
private final Set<Annotation> qualifiers;
private final Class<? extends Annotation> scope;
private final String name;
- private final boolean nullable;
private final Set<Class<? extends Annotation>> stereotypes;
private final boolean alternative;
@@ -49,37 +48,35 @@ public class BeanAttributesImpl<T> implements
BeanAttributes<T>
bean.getQualifiers(),
bean.getScope(),
bean.getName(),
- bean.isNullable(),
bean.getStereotypes(),
bean.isAlternative());
}
- public BeanAttributesImpl(BeanAttributes<T> beanAttributes, boolean
nullable)
+ public BeanAttributesImpl(BeanAttributes<T> beanAttributes)
{
this(beanAttributes.getTypes(),
beanAttributes.getQualifiers(),
beanAttributes.getScope(),
beanAttributes.getName(),
- nullable,
beanAttributes.getStereotypes(),
beanAttributes.isAlternative());
}
public BeanAttributesImpl(Set<Type> types)
{
- this(types, AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION_SET,
Dependent.class, null, false, Collections.<Class<? extends
Annotation>>emptySet(), false);
+ this(types, AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION_SET,
Dependent.class, null, Collections.<Class<? extends Annotation>>emptySet(),
false);
}
public BeanAttributesImpl(Set<Type> types, Set<Annotation> qualifiers)
{
- this(types, qualifiers, Dependent.class, null, false,
Collections.<Class<? extends Annotation>>emptySet(), false);
+ this(types, qualifiers, Dependent.class, null, Collections.<Class<?
extends Annotation>>emptySet(), false);
}
public BeanAttributesImpl(Set<Type> types,
Set<Annotation> qualifiers,
Class<? extends Annotation> scope)
{
- this(types, qualifiers, scope, null, false, Collections.<Class<?
extends Annotation>>emptySet(), false);
+ this(types, qualifiers, scope, null, Collections.<Class<? extends
Annotation>>emptySet(), false);
}
public BeanAttributesImpl(Set<Type> types,
@@ -87,14 +84,13 @@ public class BeanAttributesImpl<T> implements
BeanAttributes<T>
Class<? extends Annotation> scope,
Set<Class<? extends Annotation>> stereotypes)
{
- this(types, qualifiers, scope, null, false, stereotypes, false);
+ this(types, qualifiers, scope, null, stereotypes, false);
}
public BeanAttributesImpl(Set<Type> types,
Set<Annotation> qualifiers,
Class<? extends Annotation> scope,
String name,
- boolean nullable,
Set<Class<? extends Annotation>> stereotypes,
boolean alternative)
{
@@ -102,7 +98,6 @@ public class BeanAttributesImpl<T> implements
BeanAttributes<T>
this.qualifiers = qualifiers == null?
Collections.<Annotation>emptySet(): Collections.unmodifiableSet(new
HashSet<>(qualifiers));
this.scope = scope;
this.name = name;
- this.nullable = nullable;
this.stereotypes = stereotypes == null
? Collections.<Class<? extends Annotation>>emptySet()
: Collections.unmodifiableSet(new HashSet<>(stereotypes));
@@ -133,9 +128,13 @@ public class BeanAttributesImpl<T> implements
BeanAttributes<T>
return name;
}
+ /**
+ * Since CDI-1.1 we do not rely on isNullable for a bean as this
information is really determined through other facts.
+ * @return always {@code false}
+ */
public boolean isNullable()
{
- return nullable;
+ return false;
}
@Override
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
index 257bb0d..08074cf 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
@@ -35,7 +35,6 @@ public class BeanManagerBean extends
BuiltInOwbBean<BeanManager>
WebBeansType.MANAGER,
new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(BeanManager.class,
Object.class), AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION_SET),
BeanManager.class,
- false,
new SimpleProducerFactory<>(new
BeanManagerProducer(webBeansContext)));
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java
index 48f0315..d377bd7 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java
@@ -43,7 +43,6 @@ public class BeanMetadataBean<T> extends
BuiltInOwbBean<Bean<T>>
WebBeansType.METADATA,
new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(Bean.class,
Contextual.class, Object.class)),
new TypeLiteral<Bean<T>>(){}.getRawType(),
- false,
new SimpleProducerFactory<>(new MetadataProducer<Bean<T>>()));
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
index 6252245..b59f6e6 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
@@ -33,7 +33,7 @@ public abstract class BuiltInOwbBean<T> extends
AbstractOwbBean<T>
protected BuiltInOwbBean(WebBeansContext webBeansContext, WebBeansType
webBeansType, Class<T> returnType, ProducerFactory<T> producerFactory)
{
- this(webBeansContext, webBeansType, new
BeanAttributesImpl<>(CollectionUtil.unmodifiableSet(returnType, Object.class)),
returnType, false, producerFactory);
+ this(webBeansContext, webBeansType, new
BeanAttributesImpl<>(CollectionUtil.unmodifiableSet(returnType, Object.class)),
returnType, producerFactory);
}
protected BuiltInOwbBean(
@@ -41,10 +41,9 @@ public abstract class BuiltInOwbBean<T> extends
AbstractOwbBean<T>
WebBeansType webBeansType,
BeanAttributesImpl<T> beanAttributes,
Class<T> returnType,
- boolean nullable,
ProducerFactory<T> producerFactory)
{
- super(webBeansContext, webBeansType, beanAttributes, returnType,
nullable);
+ super(webBeansContext, webBeansType, beanAttributes, returnType);
Asserts.assertNotNull(producerFactory, "ProducerFactory");
producer = producerFactory.createProducer(this);
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
index 183b845..ad49faa 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
@@ -51,11 +51,9 @@ public class ConversationBean extends
BuiltInOwbBean<ConversationImpl> implement
AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION_SET,
RequestScoped.class,
"javax.enterprise.context.conversation",
- false,
Collections.<Class<? extends Annotation>>emptySet(),
false),
ConversationImpl.class,
- false,
new SimpleProducerFactory<>(
new
ConversationProducer(webBeansContext.getAnnotatedElementFactory().newAnnotatedType(ConversationImpl.class),
webBeansContext)));
setEnabled(true);
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java
index fe3da62..4f744d8 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java
@@ -42,7 +42,6 @@ public class DecoratorMetadataBean<T> extends
BuiltInOwbBean<Decorator<T>>
WebBeansType.METADATA,
new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(Decorator.class,
Object.class)),
new TypeLiteral<Decorator<T>>(){}.getRawType(),
- false,
new SimpleProducerFactory<>(new
MetadataProducer<Decorator<T>>()));
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
index 78fd5c8..289df37 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
@@ -49,7 +49,6 @@ public class EventBean<T> extends BuiltInOwbBean<Event<T>>
{
}.getRawType(), Object.class)),
new TypeLiteral<Event<T>>(){}.getRawType(),
- false,
new SimpleProducerFactory<>(new
EventProducer<T>(webBeansContext)));
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java
index a530e33..8500594 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java
@@ -40,7 +40,6 @@ public class EventMetadataBean extends
BuiltInOwbBean<EventMetadata>
WebBeansType.METADATA,
new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(EventMetadata.class,
Object.class)),
EventMetadata.class,
- false,
new SimpleProducerFactory<>(new EventMetadataProducer()));
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
index 6efe6cb..291f45e 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
@@ -47,7 +47,6 @@ public class ExtensionBean<T> extends BuiltInOwbBean<T>
AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION_SET,
ApplicationScoped.class),
returnType,
- false,
new
ExtensionProducerFactory<>(webBeansContext.getAnnotatedElementFactory().getAnnotatedType(returnType),
webBeansContext));
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
index 8f85c04..2029f94 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
@@ -46,7 +46,6 @@ public class InjectionPointBean extends
BuiltInOwbBean<InjectionPoint>
WebBeansType.INJECTIONPOINT,
new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(InjectionPoint.class,
Object.class)),
InjectionPoint.class,
- false,
new SimpleProducerFactory<>(new InjectionPointProducer()));
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
index deeb150..b2c6c9b 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
@@ -67,7 +67,7 @@ public class InjectionTargetBean<T> extends
AbstractOwbBean<T> implements Serial
Class<T> beanClass,
InjectionTargetFactory<T> factory)
{
- super(webBeansContext, webBeansType, beanAttributes, beanClass, false);
+ super(webBeansContext, webBeansType, beanAttributes, beanClass);
Asserts.assertNotNull(annotatedType, "AnnotatedType");
this.annotatedType = annotatedType;
injectionTarget = factory.createInjectionTarget(this);
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
index b7d1aab..8466197 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
@@ -36,7 +36,6 @@ public class InstanceBean<T> extends
BuiltInOwbBean<Instance<T>>
WebBeansType.INSTANCE,
new
BeanAttributesImpl(CollectionUtil.unmodifiableSet(Instance.class,
Provider.class, Object.class)),
new TypeLiteral<Instance<T>>(){}.getRawType(),
- false,
new SimpleProducerFactory(new InstanceProducer(webBeansContext)));
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java
index 5d210b3..6966317 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java
@@ -53,7 +53,6 @@ public class InterceptedOrDecoratedBeanMetadataBean<T>
extends BuiltInOwbBean<Be
{
})),
new TypeLiteral<Bean<T>>(){}.getRawType(),
- false,
new SimpleProducerFactory<>(new BeanMetadataProducer<Bean<T>>()));
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptionFactoryBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptionFactoryBean.java
index 470862a..12b49c6 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptionFactoryBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptionFactoryBean.java
@@ -43,7 +43,6 @@ public class InterceptionFactoryBean extends
BuiltInOwbBean<InterceptionFactory>
CollectionUtil.<Type>unmodifiableSet(InterceptionFactory.class, Object.class),
AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION_SET),
InterceptionFactory.class,
- false,
new SimpleProducerFactory<>(new
InterceptionFactoryProducer(webBeansContext)));
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java
index 05a4f95..a9b965c 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java
@@ -42,7 +42,6 @@ public class InterceptorMetadataBean<T> extends
BuiltInOwbBean<Interceptor<T>>
WebBeansType.METADATA,
new
BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(Interceptor.class,
Object.class)),
new TypeLiteral<Interceptor<T>>(){}.getRawType(),
- false,
new SimpleProducerFactory<>(new
MetadataProducer<Interceptor<T>>()));
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java
index bea5c0e..3637ef3 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java
@@ -33,10 +33,9 @@ public class ProducerAwareInjectionTargetBean<T> extends
AbstractOwbBean<T> impl
public ProducerAwareInjectionTargetBean(WebBeansContext webBeansContext,
WebBeansType webBeansType,
BeanAttributes<T> beanAttributes,
Class<?> beanClass,
- boolean nullable,
ProducerFactory<?> factory)
{
- super(webBeansContext, webBeansType, beanAttributes, beanClass,
nullable);
+ super(webBeansContext, webBeansType, beanAttributes, beanClass);
this.producer = factory.createProducer(this);
String id = super.getId();
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
index 5d88058..22853d2 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
@@ -85,8 +85,6 @@ public abstract class BeanAttributesBuilder<T, A extends
Annotated>
protected String name;
- protected boolean nullable;
-
protected Set<Class<? extends Annotation>> stereotypes;
protected Boolean alternative;
@@ -128,9 +126,8 @@ public abstract class BeanAttributesBuilder<T, A extends
Annotated>
defineTypes();
defineName();
defineQualifiers();
- defineNullable();
defineAlternative();
- return new BeanAttributesImpl<>(types, qualifiers, scope, name,
nullable, stereotypes, alternative);
+ return new BeanAttributesImpl<>(types, qualifiers, scope, name,
stereotypes, alternative);
}
protected A getAnnotated()
@@ -545,13 +542,6 @@ public abstract class BeanAttributesBuilder<T, A extends
Annotated>
*/
protected abstract Annotated getSuperAnnotated();
- protected abstract void defineNullable();
-
- protected void defineNullable(boolean nullable)
- {
- this.nullable = nullable;
- }
-
/**
* {@inheritDoc}
*/
@@ -673,13 +663,6 @@ public abstract class BeanAttributesBuilder<T, A extends
Annotated>
}
}
}
-
- @Override
- protected void defineNullable()
- {
- defineNullable(false);
- }
-
@Override
protected AnnotatedType<? super C> getSuperAnnotated()
@@ -719,12 +702,6 @@ public abstract class BeanAttributesBuilder<T, A extends
Annotated>
{
defineName(getAnnotated(), () ->
getProducerDefaultName(getAnnotated()));
}
-
- @Override
- protected void defineNullable()
- {
-
defineNullable(!getAnnotated().getJavaMember().getType().isPrimitive());
- }
@Override
protected AnnotatedField<? super M> getSuperAnnotated()
@@ -778,12 +755,6 @@ public abstract class BeanAttributesBuilder<T, A extends
Annotated>
}
}
}
-
- @Override
- protected void defineNullable()
- {
-
defineNullable(!getAnnotated().getJavaMember().getReturnType().isPrimitive());
- }
@Override
protected AnnotatedMethod<? super M> getSuperAnnotated()
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java
index 12ad712..8e48329 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java
@@ -33,7 +33,7 @@ class ThirdpartyBeanAttributesImpl<T> extends
BeanAttributesImpl<T>
ThirdpartyBeanAttributesImpl(BeanAttributes<T> beanAttributes)
{
- super(beanAttributes, false);
+ super(beanAttributes);
this.qualifiers = calculateQualifiers(beanAttributes);
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
index eae2ae7..3487b88 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
@@ -40,8 +40,7 @@ public class ThirdpartyBeanImpl<T> extends AbstractOwbBean<T>
super(webBeansContext,
WebBeansType.THIRDPARTY,
new ThirdpartyBeanAttributesImpl<>(bean),
- bean.getBeanClass(),
- bean.isNullable());
+ bean.getBeanClass());
this.bean = bean;
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java
index 3985784..a78d461 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java
@@ -201,6 +201,6 @@ public class BeanAttributesConfiguratorImpl<T> implements
BeanAttributesConfigur
// make sure we always have an @Any Qualifier as well.
qualifiers.add(AnyLiteral.INSTANCE);
- return new BeanAttributesImpl<>(types, qualifiers, scope, name, false,
stereotypes, alternative);
+ return new BeanAttributesImpl<>(types, qualifiers, scope, name,
stereotypes, alternative);
}
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
index 86953eb..93e416b 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
@@ -1156,7 +1156,6 @@ public class BeanManagerImpl implements BeanManager,
Referenceable
WebBeansType.THIRDPARTY,
attributes,
findClass(factory, type),
- false,
factory);
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/context/control/RequestContextControllerBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/context/control/RequestContextControllerBean.java
index 19828cd..e9041aa 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/context/control/RequestContextControllerBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/context/control/RequestContextControllerBean.java
@@ -38,7 +38,6 @@ public class RequestContextControllerBean extends
BuiltInOwbBean<RequestContextC
new
BeanAttributesImpl<>(CollectionUtil.unmodifiableSet(RequestContextController.class,
Object.class),
AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION_SET),
RequestContextController.class,
- false,
new SimpleProducerFactory<>(new
RequestContextControllerProducer(webBeansContext)));
}
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/MultipleTimeTheSameBindingTest.java
b/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/MultipleTimeTheSameBindingTest.java
index 0f71902..7e91efb 100644
---
a/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/MultipleTimeTheSameBindingTest.java
+++
b/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/MultipleTimeTheSameBindingTest.java
@@ -70,7 +70,7 @@ public class MultipleTimeTheSameBindingTest extends
AbstractUnitTest
annotations.add(new TheQualifierLitereal(1));
annotations.add(new TheQualifierLitereal(2));
- pba.setBeanAttributes(new
BeanAttributesImpl<TheClass>(pba.getBeanAttributes(), false) {
+ pba.setBeanAttributes(new
BeanAttributesImpl<TheClass>(pba.getBeanAttributes()) {
public Set<Annotation> getQualifiers() {
return annotations;
}
diff --git
a/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java
b/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java
index 4dbb671..3677c89 100644
--- a/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java
+++ b/webbeans-jms/src/main/java/org/apache/webbeans/jms/component/JmsBean.java
@@ -34,7 +34,7 @@ public class JmsBean<T> extends AbstractOwbBean<T> implements
JmsBeanMarker
JmsBean(WebBeansContext webBeansContext, JMSModel jmsModel,
BeanAttributes<T> beanAttributes)
{
- super(webBeansContext, WebBeansType.JMS, beanAttributes,
Destination.class, false);
+ super(webBeansContext, WebBeansType.JMS, beanAttributes,
Destination.class);
this.jmsModel = jmsModel;
}
