From b8271eced25330016be51a2c25d07b2a7511c9e7 Mon Sep 17 00:00:00 2001 From: "j.j.snyder" Date: Thu, 4 May 2017 08:21:21 -0400 Subject: [PATCH 1/4] CDI Extension Fix for Weld 1.1.32.Final --- jersey-servlet/pom.xml | 4 ++-- .../server/impl/cdi/CDIComponentProviderFactory.java | 2 +- .../java/com/sun/jersey/server/impl/cdi/Utils.java | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/jersey-servlet/pom.xml b/jersey-servlet/pom.xml index 135455074..82474cacd 100644 --- a/jersey-servlet/pom.xml +++ b/jersey-servlet/pom.xml @@ -46,7 +46,7 @@ com.sun.jersey jersey-project - 1.12-SNAPSHOT + 1.11 jersey-servlet bundle @@ -184,7 +184,6 @@ - com.sun.jersey.server.impl.cdi, com.sun.jersey.server.impl.ejb, com.sun.jersey.server.impl.managedbeans @@ -193,6 +192,7 @@ com.sun.jersey.spi.container.servlet, com.sun.jersey.api.core.servlet, com.sun.jersey.api.container.servlet, + com.sun.jersey.server.impl.cdi, com.sun.jersey.server.impl.container.servlet diff --git a/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/CDIComponentProviderFactory.java b/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/CDIComponentProviderFactory.java index 6fa1eeddc..aab2efd82 100644 --- a/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/CDIComponentProviderFactory.java +++ b/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/CDIComponentProviderFactory.java @@ -86,7 +86,7 @@ public CDIComponentProviderFactory(Object bm, ResourceConfig rc, WebApplication beanManager = (BeanManager)bm; // work around proxying bug in Weld if (CDIExtension.lookupExtensionInBeanManager) { - extension = Utils.getInstance(beanManager, CDIExtension.class); + extension = Utils.getExtension( beanManager, CDIExtension.class ); } else { extension = CDIExtension.getInitializedExtension(); diff --git a/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/Utils.java b/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/Utils.java index c20977b9c..23f570628 100644 --- a/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/Utils.java +++ b/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/Utils.java @@ -42,6 +42,7 @@ import java.util.Collections; import java.util.Set; +import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.AmbiguousResolutionException; import javax.enterprise.inject.spi.Bean; @@ -88,6 +89,15 @@ public static T getInstance(BeanManager bm, Class c) { CreationalContext cc = bm.createCreationalContext(b); return c.cast(bm.getReference(b, c, cc)); } + + public static T getExtension( BeanManager bm, Class clazz ) { + Bean bean = getBean(bm, clazz); + if (bean == null) { + return null; + } + + return clazz.cast( bm.getContext( ApplicationScoped.class ).get( bean ) ); + } private static boolean isSharedBaseClass(Class c, Set> bs) { for (Bean b : bs) { From 0a704b213161cd1fcca5753762a621449b426872 Mon Sep 17 00:00:00 2001 From: "j.j.snyder" Date: Thu, 4 May 2017 08:28:23 -0400 Subject: [PATCH 2/4] CDI Extension Fix for Weld 1.1.32.Final --- jersey-servlet/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jersey-servlet/pom.xml b/jersey-servlet/pom.xml index 82474cacd..220d805b2 100644 --- a/jersey-servlet/pom.xml +++ b/jersey-servlet/pom.xml @@ -46,7 +46,7 @@ com.sun.jersey jersey-project - 1.11 + 1.12-SNAPSHOT jersey-servlet bundle From e415ffa861a4eac5cfda15d6bd422f5ee048a7e0 Mon Sep 17 00:00:00 2001 From: Marek Potociar Date: Thu, 4 May 2017 14:35:52 +0200 Subject: [PATCH 3/4] Formatting normalization. --- .../sun/jersey/server/impl/cdi/CDIComponentProviderFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/CDIComponentProviderFactory.java b/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/CDIComponentProviderFactory.java index aab2efd82..e5d82ad1c 100644 --- a/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/CDIComponentProviderFactory.java +++ b/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/CDIComponentProviderFactory.java @@ -86,7 +86,7 @@ public CDIComponentProviderFactory(Object bm, ResourceConfig rc, WebApplication beanManager = (BeanManager)bm; // work around proxying bug in Weld if (CDIExtension.lookupExtensionInBeanManager) { - extension = Utils.getExtension( beanManager, CDIExtension.class ); + extension = Utils.getExtension(beanManager, CDIExtension.class); } else { extension = CDIExtension.getInitializedExtension(); From f46a4b734790535175648e809a9d8166579d1313 Mon Sep 17 00:00:00 2001 From: Marek Potociar Date: Thu, 4 May 2017 14:38:04 +0200 Subject: [PATCH 4/4] Formatting normalization. --- .../src/main/java/com/sun/jersey/server/impl/cdi/Utils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/Utils.java b/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/Utils.java index 23f570628..9d41de62e 100644 --- a/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/Utils.java +++ b/jersey-servlet/src/main/java/com/sun/jersey/server/impl/cdi/Utils.java @@ -90,13 +90,13 @@ public static T getInstance(BeanManager bm, Class c) { return c.cast(bm.getReference(b, c, cc)); } - public static T getExtension( BeanManager bm, Class clazz ) { + public static T getExtension(BeanManager bm, Class clazz) { Bean bean = getBean(bm, clazz); if (bean == null) { return null; } - return clazz.cast( bm.getContext( ApplicationScoped.class ).get( bean ) ); + return clazz.cast(bm.getContext(ApplicationScoped.class).get(bean)); } private static boolean isSharedBaseClass(Class c, Set> bs) {