From eb3ce405dba47f7fef0de3cac50d928f0b2ad40f Mon Sep 17 00:00:00 2001 From: jansupol Date: Tue, 29 Mar 2022 19:14:08 +0200 Subject: [PATCH] Updated CDI, BV, and EL. Signed-off-by: jansupol --- containers/grizzly2-http/pom.xml | 37 +++++-------------- containers/grizzly2-servlet/pom.xml | 1 + .../src/main/resources/META-INF/beans.xml | 9 ++++- .../src/main/webapp/WEB-INF/beans.xml | 9 ++++- .../src/main/resources/META-INF/beans.xml | 9 ++++- .../CdiExternalRequestScopeExtension.java | 2 +- .../CdiInterceptorWrapperExtension.java | 2 +- .../cdi1x/internal/CdiComponentProvider.java | 4 +- .../restclient/RestClientProducer.java | 4 +- .../inject/weld/internal/bean/BeanHelper.java | 9 +++-- .../inject/weld/internal/bean/JerseyBean.java | 4 +- .../weld/internal/scope/RequestScopeBean.java | 2 +- .../inject/cdi/se/RequestScopeBean.java | 2 +- .../jersey/inject/cdi/se/bean/BeanHelper.java | 7 ++-- .../jersey/inject/cdi/se/bean/JerseyBean.java | 4 +- pom.xml | 10 ++--- .../src/main/resources/META-INF/beans.xml | 8 +++- .../src/main/resources/META-INF/beans.xml | 9 ++++- .../src/main/webapp/WEB-INF/beans.xml | 9 ++++- .../src/test/resources/META-INF/beans.xml | 9 ++++- 20 files changed, 85 insertions(+), 65 deletions(-) diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml index 908323864b..8173ba3eef 100644 --- a/containers/grizzly2-http/pom.xml +++ b/containers/grizzly2-http/pom.xml @@ -107,6 +107,15 @@ org.apache.felix maven-bundle-plugin true + + + + org.glassfish.grizzly.*;version="[3.0,5.0)", + * + + + true + @@ -162,33 +171,5 @@ - - jdk8 - - 1.8 - - - - - - maven-compiler-plugin - - - default-testCompile - - - true - - - - - - - - diff --git a/containers/grizzly2-servlet/pom.xml b/containers/grizzly2-servlet/pom.xml index 02fe0f2aa7..f44f63cd3f 100644 --- a/containers/grizzly2-servlet/pom.xml +++ b/containers/grizzly2-servlet/pom.xml @@ -71,6 +71,7 @@ jakarta.servlet.*;version="[5.0,7.0)", + org.glassfish.grizzly.*;version="[3.0,5.0)", * diff --git a/examples/cdi-webapp/src/main/resources/META-INF/beans.xml b/examples/cdi-webapp/src/main/resources/META-INF/beans.xml index 5d361e9284..77e336a616 100644 --- a/examples/cdi-webapp/src/main/resources/META-INF/beans.xml +++ b/examples/cdi-webapp/src/main/resources/META-INF/beans.xml @@ -1,7 +1,7 @@ - + + diff --git a/examples/cdi-webapp/src/main/webapp/WEB-INF/beans.xml b/examples/cdi-webapp/src/main/webapp/WEB-INF/beans.xml index 5d361e9284..77e336a616 100644 --- a/examples/cdi-webapp/src/main/webapp/WEB-INF/beans.xml +++ b/examples/cdi-webapp/src/main/webapp/WEB-INF/beans.xml @@ -1,7 +1,7 @@ - + + diff --git a/examples/helloworld-weld/src/main/resources/META-INF/beans.xml b/examples/helloworld-weld/src/main/resources/META-INF/beans.xml index 5d361e9284..77e336a616 100644 --- a/examples/helloworld-weld/src/main/resources/META-INF/beans.xml +++ b/examples/helloworld-weld/src/main/resources/META-INF/beans.xml @@ -1,7 +1,7 @@ - + + diff --git a/ext/cdi/jersey-cdi1x-servlet/src/main/java/org/glassfish/jersey/ext/cdi1x/servlet/internal/CdiExternalRequestScopeExtension.java b/ext/cdi/jersey-cdi1x-servlet/src/main/java/org/glassfish/jersey/ext/cdi1x/servlet/internal/CdiExternalRequestScopeExtension.java index 3a17677b94..ce367f5fbd 100644 --- a/ext/cdi/jersey-cdi1x-servlet/src/main/java/org/glassfish/jersey/ext/cdi1x/servlet/internal/CdiExternalRequestScopeExtension.java +++ b/ext/cdi/jersey-cdi1x-servlet/src/main/java/org/glassfish/jersey/ext/cdi1x/servlet/internal/CdiExternalRequestScopeExtension.java @@ -124,7 +124,7 @@ public boolean isAlternative() { return false; } - @Override + // @Override - Removed in CDI 4 public boolean isNullable() { return false; } diff --git a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java index 6cced30242..875f63c9e3 100644 --- a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java +++ b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java @@ -155,7 +155,7 @@ public boolean isAlternative() { return false; } - @Override + // @Override - Removed in CDI 4 public boolean isNullable() { return false; } diff --git a/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java b/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java index 2cbc60ff71..63a3eac491 100644 --- a/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java +++ b/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018 Payara Foundation and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -823,7 +823,7 @@ public Set getInjectionPoints() { return Collections.emptySet(); } - @Override + // @Override - Removed in CDI 4 public boolean isNullable() { return true; } diff --git a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientProducer.java b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientProducer.java index 48bc397b18..d58341942e 100644 --- a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientProducer.java +++ b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientProducer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -123,7 +123,7 @@ public Set getInjectionPoints() { return Collections.emptySet(); } - @Override + // @Override - Removed in CDI 4 public boolean isNullable() { return false; } diff --git a/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/bean/BeanHelper.java b/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/bean/BeanHelper.java index c5c4cfea5e..b653b549cf 100644 --- a/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/bean/BeanHelper.java +++ b/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/bean/BeanHelper.java @@ -157,7 +157,8 @@ public static BindingBeanPair registerSupplier(RuntimeType runtimeType, Supp Class> supplierClass = (Class>) binding.getSupplierClass(); AnnotatedType> annotatedType = beanManager.createAnnotatedType(supplierClass); - InjectionTarget> injectionTarget = beanManager.createInjectionTarget(annotatedType); + final InjectionTargetFactory> injectionTargetFactory = beanManager.getInjectionTargetFactory(annotatedType); + final InjectionTarget> injectionTarget = injectionTargetFactory.createInjectionTarget(null); SupplierClassBean supplierBean = new SupplierClassBean<>(runtimeType, binding); InjectionTarget> jit = getJerseyInjectionTarget(supplierClass, injectionTarget, supplierBean, resolvers); @@ -218,7 +219,8 @@ private static ConstructorInjectionPoint createConstructorInjectionPoint( final Class> bindingClass = (Class>) binding.getSupplierClass(); final AnnotatedType> annotatedType = beanManager.createAnnotatedType(bindingClass); - final InjectionTarget> injectionTarget = beanManager.createInjectionTarget(annotatedType); + final InjectionTargetFactory> injectionTargetFactory = beanManager.getInjectionTargetFactory(annotatedType); + final InjectionTarget> injectionTarget = injectionTargetFactory.createInjectionTarget(null); final CachedConstructorAnalyzer> analyzer = new CachedConstructorAnalyzer<>(bindingClass, InjectionUtils.getInjectAnnotations(resolvers)); @@ -239,7 +241,8 @@ private static ConstructorInjectionPoint createConstructorInjectionPoint( final Class bindingClass = binding.getImplementationType(); final AnnotatedType annotatedType = beanManager.createAnnotatedType(bindingClass); - final InjectionTarget injectionTarget = beanManager.createInjectionTarget(annotatedType); + final InjectionTargetFactory injectionTargetFactory = beanManager.getInjectionTargetFactory(annotatedType); + final InjectionTarget injectionTarget = injectionTargetFactory.createInjectionTarget(null); final CachedConstructorAnalyzer analyzer = new CachedConstructorAnalyzer<>(bindingClass, InjectionUtils.getInjectAnnotations(resolvers)); diff --git a/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/bean/JerseyBean.java b/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/bean/JerseyBean.java index 2f4da94d3a..a56f23bac3 100644 --- a/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/bean/JerseyBean.java +++ b/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/bean/JerseyBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -142,7 +142,7 @@ public boolean isAlternative() { return false; } - @Override + // @Override - Removed in CDI 4 public boolean isNullable() { return false; } diff --git a/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/scope/RequestScopeBean.java b/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/scope/RequestScopeBean.java index eff570f858..7dd99c8f89 100644 --- a/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/scope/RequestScopeBean.java +++ b/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/scope/RequestScopeBean.java @@ -54,7 +54,7 @@ public RequestScopeBean(BeanManager beanManager) { this.injectionTarget = injectionTargetFactory.createInjectionTarget(null); } - @Override + // @Override - Removed in CDI 4 public boolean isNullable() { return false; } diff --git a/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/RequestScopeBean.java b/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/RequestScopeBean.java index 4bf816fd7f..86e97abfd4 100644 --- a/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/RequestScopeBean.java +++ b/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/RequestScopeBean.java @@ -54,7 +54,7 @@ public RequestScopeBean(BeanManager beanManager) { this.injectionTarget = injectionTargetFactory.createInjectionTarget(null); } - @Override + // @Override - Removed in CDI 4 public boolean isNullable() { return false; } diff --git a/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/bean/BeanHelper.java b/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/bean/BeanHelper.java index 2ae0ebc541..584193f5bd 100644 --- a/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/bean/BeanHelper.java +++ b/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/bean/BeanHelper.java @@ -147,9 +147,10 @@ public static void registerSupplier(SupplierInstanceBinding binding, Afte public static void registerSupplier(SupplierClassBinding binding, AfterBeanDiscovery abd, Collection resolvers, BeanManager beanManager) { - Class> supplierClass = (Class>) binding.getSupplierClass(); - AnnotatedType> annotatedType = beanManager.createAnnotatedType(supplierClass); - InjectionTarget> injectionTarget = beanManager.createInjectionTarget(annotatedType); + final Class> supplierClass = (Class>) binding.getSupplierClass(); + final AnnotatedType> annotatedType = beanManager.createAnnotatedType(supplierClass); + final InjectionTargetFactory> injectionTargetFactory = beanManager.getInjectionTargetFactory(annotatedType); + final InjectionTarget> injectionTarget = injectionTargetFactory.createInjectionTarget(null); SupplierClassBean supplierBean = new SupplierClassBean<>(binding); InjectionTarget> jit = getJerseyInjectionTarget(supplierClass, injectionTarget, supplierBean, resolvers); diff --git a/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/bean/JerseyBean.java b/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/bean/JerseyBean.java index 9b94750675..c6bd602a75 100644 --- a/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/bean/JerseyBean.java +++ b/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/bean/JerseyBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -133,7 +133,7 @@ public boolean isAlternative() { return false; } - @Override + // @Override - Removed in CDI 4 public boolean isNullable() { return false; } diff --git a/pom.xml b/pom.xml index 426ec8a58b..dc41f0b93f 100644 --- a/pom.xml +++ b/pom.xml @@ -2157,8 +2157,8 @@ 3.0.0-M5 - 4.0.2.Final - 7.0.1.Final + 5.0.0.CR2 + 8.0.0.Alpha1 2.11.0 @@ -2168,7 +2168,7 @@ 7.0.0-M2 - 3.0.0 + 4.0.0 4.0.0 4.0.0-M1 2.0.0 @@ -2182,8 +2182,8 @@ 4.0.0 2.1.0 2.0.1 - 4.0.0 - 4.0.2 + 5.0.0 + 5.0.0-M1 jakarta.annotation.*;version="[2.0,3)" 2.1.0 2.0.1 diff --git a/tests/e2e-inject/cdi2-se/src/main/resources/META-INF/beans.xml b/tests/e2e-inject/cdi2-se/src/main/resources/META-INF/beans.xml index ae8422432b..c2146b486f 100644 --- a/tests/e2e-inject/cdi2-se/src/main/resources/META-INF/beans.xml +++ b/tests/e2e-inject/cdi2-se/src/main/resources/META-INF/beans.xml @@ -1,7 +1,7 @@ - + org.glassfish.jersey.tests.e2e.inject.cdi.se.SecurityInterceptor diff --git a/tests/integration/cdi-integration/cdi-test-webapp/src/main/resources/META-INF/beans.xml b/tests/integration/cdi-integration/cdi-test-webapp/src/main/resources/META-INF/beans.xml index 14ea61ec34..8d3e4b2f53 100644 --- a/tests/integration/cdi-integration/cdi-test-webapp/src/main/resources/META-INF/beans.xml +++ b/tests/integration/cdi-integration/cdi-test-webapp/src/main/resources/META-INF/beans.xml @@ -1,7 +1,7 @@ - + + diff --git a/tests/integration/cdi-integration/cdi-test-webapp/src/main/webapp/WEB-INF/beans.xml b/tests/integration/cdi-integration/cdi-test-webapp/src/main/webapp/WEB-INF/beans.xml index 14ea61ec34..8d3e4b2f53 100644 --- a/tests/integration/cdi-integration/cdi-test-webapp/src/main/webapp/WEB-INF/beans.xml +++ b/tests/integration/cdi-integration/cdi-test-webapp/src/main/webapp/WEB-INF/beans.xml @@ -1,7 +1,7 @@ - + + diff --git a/tests/integration/jersey-4542/src/test/resources/META-INF/beans.xml b/tests/integration/jersey-4542/src/test/resources/META-INF/beans.xml index d773c46699..d6b4b48da5 100644 --- a/tests/integration/jersey-4542/src/test/resources/META-INF/beans.xml +++ b/tests/integration/jersey-4542/src/test/resources/META-INF/beans.xml @@ -1,7 +1,7 @@ - \ No newline at end of file + + \ No newline at end of file