TOMEE-2117 fix compile error in conjunction with ProcessObserverMethod
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9e0287ca Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9e0287ca Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9e0287ca Branch: refs/heads/fb_tomee8 Commit: 9e0287cada5258b2d9d26a353c39a8c29bd5e62b Parents: eed5302 Author: Mark Struberg <strub...@apache.org> Authored: Wed Aug 16 00:20:02 2017 +0200 Committer: Mark Struberg <strub...@apache.org> Committed: Wed Aug 16 00:20:02 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/openejb/cdi/CdiEjbBean.java | 3 +- .../java/org/apache/openejb/cdi/CdiPlugin.java | 8 +++-- .../openejb/rest/ThreadLocalServletContext.java | 32 +++++++++++++++++++- .../openejb/cdi/WebappBeanManagerTest.java | 2 +- 4 files changed, 39 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/9e0287ca/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java index 34dbd33..be43cc2 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java @@ -523,7 +523,8 @@ public class CdiEjbBean<T> extends BaseEjbBean<T> implements InterceptedMarker, public T createNewPojo(final CreationalContext<T> creationalContext) { final CreationalContextImpl<T> ccImpl = CreationalContextImpl.class.cast(creationalContext); // super.produce(cc) will not work since we need the unproxied instance - decorator case - final Map<javax.enterprise.inject.spi.Interceptor<?>, Object> interceptorInstances = super.createInterceptorInstances(ccImpl); + final Map<javax.enterprise.inject.spi.Interceptor<?>, Object> interceptorInstances + = webBeansContext.getInterceptorResolutionService().createInterceptorInstances(getInterceptorInfo(), ccImpl); final InterceptorResolutionService.BeanInterceptorInfo interceptorInfo = super.getInterceptorInfo(); if (interceptorInfo != null) { final Map<Constructor<?>, InterceptorResolutionService.BusinessMethodInterceptorInfo> constructorInterceptorInfos = http://git-wip-us.apache.org/repos/asf/tomee/blob/9e0287ca/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java index db39ccb..edac247 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java @@ -391,9 +391,11 @@ public class CdiPlugin extends AbstractOwbPlugin implements OpenWebBeansJavaEEPl webBeansUtil.fireProcessProducerFieldBeanEvent(annotatedFields); webBeansUtil.inspectDeploymentErrorStack("There are errors that are added by ProcessProducerField event observers for producer field beans. Look at logs for further details"); - //Fire ObservableMethods - webBeansUtil.fireProcessObservableMethodBeanEvent(observerMethodsMap); - webBeansUtil.inspectDeploymentErrorStack("There are errors that are added by ProcessObserverMethod event observers for observer methods. Look at logs for further details"); + //Fire ProcessObserverMethods + //X TODO ProcessObserverMethod now has a way to SET a new ObserverMethod. So the old method doesn't work anymore + //X TODO created TOMEE-2117 for it. + //X webBeansUtil.fireProcessObserverMethodBeanEvent(observerMethodsMap); + //X webBeansUtil.inspectDeploymentErrorStack("There are errors that are added by ProcessObserverMethod event observers for observer methods. Look at logs for further details"); if (!webBeansUtil.isAnnotatedTypeDecoratorOrInterceptor(annotatedType)) { for (final ProducerMethodBean<?> producerMethod : producerMethods) { http://git-wip-us.apache.org/repos/asf/tomee/blob/9e0287ca/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java index 0e6a5f9..1d12933 100755 --- a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java @@ -303,6 +303,36 @@ public class ThreadLocalServletContext extends AbstractRestThreadLocalProxy<Serv } public void setResponseCharacterEncoding(String encoding) { - return get().setResponseCharacterEncoding(encoding); + get().setResponseCharacterEncoding(encoding); + } + + @Override + public ServletRegistration.Dynamic addJspFile(String jspName, String jspFile) { + return get().addJspFile(jspName, jspFile); + } + + @Override + public int getSessionTimeout() { + return get().getSessionTimeout(); + } + + @Override + public void setSessionTimeout(int sessionTimeout) { + get().setSessionTimeout(sessionTimeout); + } + + @Override + public String getRequestCharacterEncoding() { + return get().getRequestCharacterEncoding(); + } + + @Override + public void setRequestCharacterEncoding(String encoding) { + get().setRequestCharacterEncoding(encoding); + } + + @Override + public String getResponseCharacterEncoding() { + return get().getResponseCharacterEncoding(); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/9e0287ca/container/openejb-core/src/test/java/org/apache/openejb/cdi/WebappBeanManagerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/cdi/WebappBeanManagerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/cdi/WebappBeanManagerTest.java index 3c51da6..59285c3 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/cdi/WebappBeanManagerTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/cdi/WebappBeanManagerTest.java @@ -51,7 +51,7 @@ public class WebappBeanManagerTest { wbm.fireEvent(new GProcessProducerMethod(null, null, null), true); wbm.fireEvent(new GProcessInjectionTarget(null, null), true); wbm.fireEvent(new GProcessBean(null, null), true); - wbm.fireEvent(new GProcessAnnotatedType(null), true); + wbm.fireEvent(new GProcessAnnotatedType(ctx, null), true); wbm.fireEvent(new GProcessSessionBean(null, null, null, null), true); wbm.fireEvent(new AfterBeanDiscoveryImpl(ctx), true); wbm.fireEvent(new AfterDeploymentValidationImpl(wbm), true);
