You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2022/06/20 07:59:39 UTC
[myfaces] branch master updated: MYFACES-4437
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new 6cab4bfde MYFACES-4437
6cab4bfde is described below
commit 6cab4bfde986e665de4fcc4214f8c7519916ead4
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Mon Jun 20 09:59:31 2022 +0200
MYFACES-4437
---
.../main/java/org/apache/myfaces/cdi/CDIInjectionProviderImpl.java | 6 +++---
.../java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java | 2 +-
impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java | 7 +++----
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/CDIInjectionProviderImpl.java b/impl/src/main/java/org/apache/myfaces/cdi/CDIInjectionProviderImpl.java
index a60c2a6a7..928503015 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/CDIInjectionProviderImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/CDIInjectionProviderImpl.java
@@ -45,7 +45,7 @@ public class CDIInjectionProviderImpl extends InjectionProvider
public Object inject(Object instance) throws InjectionProviderException
{
AnnotatedType annoType = beanManager.createAnnotatedType(instance.getClass());
- InjectionTarget target = beanManager.createInjectionTarget(annoType);
+ InjectionTarget target = beanManager.getInjectionTargetFactory(annoType).createInjectionTarget(null);
CreationalContext<?> creationalContext = beanManager.createCreationalContext(null);
target.inject(instance, creationalContext);
@@ -57,7 +57,7 @@ public class CDIInjectionProviderImpl extends InjectionProvider
public void postConstruct(Object instance, Object creationMetaData) throws InjectionProviderException
{
AnnotatedType annoType = beanManager.createAnnotatedType(instance.getClass());
- InjectionTarget target = beanManager.createInjectionTarget(annoType);
+ InjectionTarget target = beanManager.getInjectionTargetFactory(annoType).createInjectionTarget(null);
target.postConstruct(instance);
}
@@ -67,7 +67,7 @@ public class CDIInjectionProviderImpl extends InjectionProvider
if (creationMetaData instanceof CreationalContext)
{
AnnotatedType annoType = beanManager.createAnnotatedType(instance.getClass());
- InjectionTarget target = beanManager.createInjectionTarget(annoType);
+ InjectionTarget target = beanManager.getInjectionTargetFactory(annoType).createInjectionTarget(null);
target.preDestroy(instance);
((CreationalContext)creationMetaData).release();
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java
index 8048532ab..6268357f8 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java
@@ -121,7 +121,7 @@ public abstract class AbstractDynamicProducer<T> implements Bean<T>, Passivation
return false;
}
- @Override
+ //@Override not available anymore in CDI 4.0
public boolean isNullable()
{
return false;
diff --git a/impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java b/impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java
index b47848a72..99deb3a0d 100644
--- a/impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java
@@ -76,8 +76,8 @@ public class EndpointImpl extends Endpoint
Serializable user = (Serializable) session.getUserProperties().get(WebsocketConfigurator.WEBSOCKET_USER);
BeanManager beanManager = CDI.current().getBeanManager();
- beanManager.fireEvent(new WebsocketEvent(channel, user, null), OPENED);
-
+ beanManager.getEvent().select(OPENED).fire(new WebsocketEvent(channel, user, null));
+
session.getUserProperties().put(
WebsocketSessionClusterSerializedRestore.WEBSOCKET_SESSION_SERIALIZED_RESTORE,
new WebsocketSessionClusterSerializedRestore(channelToken));
@@ -111,8 +111,7 @@ public class EndpointImpl extends Endpoint
try
{
BeanManager beanManager = CDI.current().getBeanManager();
- beanManager.fireEvent(
- new WebsocketEvent(channel, user, closeReason.getCloseCode()), CLOSED);
+ beanManager.getEvent().select(CLOSED).fire(new WebsocketEvent(channel, user, closeReason.getCloseCode()));
}
catch(Exception e)
{