You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2013/01/11 08:15:57 UTC
svn commit: r1431918 - in /openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/component/
main/java/org/apache/webbeans/component/creation/
main/java/org/apache/webbeans/config/
main/java/org/apache/webbeans/intercept/ test/java/org/apa...
Author: struberg
Date: Fri Jan 11 07:15:57 2013
New Revision: 1431918
URL: http://svn.apache.org/viewvc?rev=1431918&view=rev
Log:
OWB-344 provide InterceptorResolution as Service via the WebBeansContext
Added:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
- copied, changed from r1431198, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolution.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorBeanBuilderTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionServiceTest.java
- copied, changed from r1431198, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.java
openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionServiceTest.xml (props changed)
- copied unchanged from r1431198, openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.xml
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolution.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.java
openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.xml
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=1431918&r1=1431917&r2=1431918&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java Fri Jan 11 07:15:57 2013
@@ -78,10 +78,14 @@ public abstract class AbstractInjectionT
/**
* Holds the all of the interceptor related data, contains around-invoke,
* post-construct and pre-destroy
+ * @deprecated old InterceptorData based config
*/
protected List<InterceptorData> interceptorStack = new ArrayList<InterceptorData>();
- /**Decorators*/
+ /**
+ * Decorators
+ * @deprecated will be replaced by InterceptorResolution logic
+ */
protected List<Decorator<?>> decorators = new ArrayList<Decorator<?>>();
/**Bean inherited meta data*/
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java?rev=1431918&r1=1431917&r2=1431918&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java Fri Jan 11 07:15:57 2013
@@ -27,13 +27,17 @@ import org.apache.webbeans.config.WebBea
/**
* Bean builder for {@link org.apache.webbeans.component.InterceptorBean}s.
*/
-public abstract class CdiInterceptorBeanBuilder<T> extends InterceptorBeanBuilder<T>
+public class CdiInterceptorBeanBuilder<T> extends InterceptorBeanBuilder<T>
{
- protected CdiInterceptorBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
+ public CdiInterceptorBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
{
super(new CdiInterceptorBean<T>(webBeansContext, annotatedType));
}
+ public void defineCdiInterceptorBean()
+ {
+
+ }
public CdiInterceptorBean<T> getBean()
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java?rev=1431918&r1=1431917&r2=1431918&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java Fri Jan 11 07:15:57 2013
@@ -21,16 +21,24 @@ package org.apache.webbeans.component.cr
import javax.enterprise.context.Dependent;
import org.apache.webbeans.component.InterceptorBean;
+import org.apache.webbeans.intercept.InterceptorResolutionService;
/**
* Bean builder for {@link org.apache.webbeans.component.InterceptorBean}s.
*/
public abstract class InterceptorBeanBuilder<T> extends AbstractInjectionTargetBeanBuilder<T>
{
+ protected final InterceptorResolutionService interceptorResolutionService;
+
protected InterceptorBeanBuilder(InterceptorBean<T> bean)
{
super(bean, Dependent.class);
+ interceptorResolutionService = bean.getWebBeansContext().getInterceptorResolutionService();
}
+ protected void defineInterceptorBean()
+ {
+
+ }
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1431918&r1=1431917&r2=1431918&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java Fri Jan 11 07:15:57 2013
@@ -36,6 +36,7 @@ import org.apache.webbeans.deployment.St
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.inject.AlternativesManager;
import org.apache.webbeans.inject.impl.InjectionPointFactory;
+import org.apache.webbeans.intercept.InterceptorResolutionService;
import org.apache.webbeans.intercept.InterceptorUtil;
import org.apache.webbeans.intercept.InterceptorsManager;
import org.apache.webbeans.intercept.WebBeansInterceptorConfig;
@@ -55,6 +56,9 @@ import org.apache.webbeans.util.ClassUti
import org.apache.webbeans.util.WebBeansUtil;
/**
+ * This is the central point to manage the whole CDI container
+ * for a single application There is one WebBeansContext per BeanManagerImpl.
+ *
* @version $Rev$ $Date$
*/
public class WebBeansContext
@@ -85,6 +89,7 @@ public class WebBeansContext
private final InterceptorUtil interceptorUtil = new InterceptorUtil(this);
private final SecurityService securityService;
private final LoaderService loaderService;
+ private final InterceptorResolutionService interceptorResolutionService = new InterceptorResolutionService(this);
private ScannerService scannerService;
public WebBeansContext()
@@ -152,6 +157,7 @@ public class WebBeansContext
managerMap.put(PluginLoader.class, pluginLoader);
managerMap.put(SerializableBeanVault.class, serializableBeanVault);
managerMap.put(StereoTypeManager.class, stereoTypeManager);
+ managerMap.put(InterceptorResolutionService.class, interceptorResolutionService);
}
@Deprecated
@@ -304,6 +310,11 @@ public class WebBeansContext
return interceptorsManager;
}
+ public InterceptorResolutionService getInterceptorResolutionService()
+ {
+ return interceptorResolutionService;
+ }
+
public PluginLoader getPluginLoader()
{
return pluginLoader;
Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java (from r1431198, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolution.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolution.java&r1=1431198&r2=1431918&rev=1431918&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolution.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java Fri Jan 11 07:15:57 2013
@@ -49,12 +49,12 @@ import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.ClassUtil;
/**
- * Class to calculate static interceptor resolution information.
+ * Class to calculate interceptor resolution information.
*
*/
-public class InterceptorResolution
+public class InterceptorResolutionService
{
- private static final Logger logger = WebBeansLoggerFacade.getLogger(InterceptorResolution.class);
+ private static final Logger logger = WebBeansLoggerFacade.getLogger(InterceptorResolutionService.class);
private final WebBeansContext webBeansContext;
@@ -64,7 +64,7 @@ public class InterceptorResolution
private final Class<? extends Annotation> aroundTimeoutClass;
- public InterceptorResolution(WebBeansContext webBeansContext)
+ public InterceptorResolutionService(WebBeansContext webBeansContext)
{
this.webBeansContext = webBeansContext;
ejbPlugin = webBeansContext.getPluginLoader().getEjbLCAPlugin();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java?rev=1431918&r1=1431917&r2=1431918&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java Fri Jan 11 07:15:57 2013
@@ -62,7 +62,7 @@ import java.util.logging.Logger;
* @version $Rev$ $Date$
* @see org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove
*
- * @deprecated this class can most probably get removed. All important logic is contained in {@link InterceptorResolution}
+ * @deprecated this class can most probably get removed. All important logic is contained in {@link InterceptorResolutionService}
*/
public final class WebBeansInterceptorConfig
{
@@ -79,6 +79,7 @@ public final class WebBeansInterceptorCo
/**
* Configure bean instance interceptor stack.
* @param bean bean instance
+ * @deprecated old InterceptorData based config
*/
public void defineBeanInterceptorStack(AbstractInjectionTargetBean<?> bean)
{
Added: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorBeanBuilderTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorBeanBuilderTest.java?rev=1431918&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorBeanBuilderTest.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorBeanBuilderTest.java Fri Jan 11 07:15:57 2013
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.webbeans.newtests.interceptors.resolution;
+
+
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.Bean;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.webbeans.component.creation.CdiInterceptorBeanBuilder;
+import org.apache.webbeans.newtests.AbstractUnitTest;
+import org.apache.webbeans.newtests.interceptors.factory.beans.ClassInterceptedClass;
+import org.apache.webbeans.test.component.intercept.webbeans.TransactionalInterceptor;
+import org.apache.webbeans.test.component.intercept.webbeans.bindings.Transactional;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Tests for the various InterceptorBeanBuilder implementations.
+ */
+public class InterceptorBeanBuilderTest extends AbstractUnitTest
+{
+ @Test
+ public void testClassLevelSingleInterceptor() throws Exception
+ {
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(this.getClass().getPackage().getName(), InterceptorResolutionServiceTest.class.getSimpleName()));
+
+ Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
+ beanClasses.add(ClassInterceptedClass.class);
+ beanClasses.add(Transactional.class);
+ beanClasses.add(TransactionalInterceptor.class);
+
+ startContainer(beanClasses, beanXmls);
+
+ AnnotatedType<TransactionalInterceptor> annotatedType = getBeanManager().createAnnotatedType(TransactionalInterceptor.class);
+
+/*X TODO finish
+ CdiInterceptorBeanBuilder<TransactionalInterceptor> ibb
+ = new CdiInterceptorBeanBuilder<TransactionalInterceptor>(getWebBeansContext(), annotatedType);
+ Bean<TransactionalInterceptor> bean = ibb.getBean();
+ Assert.assertNotNull(bean);
+*/
+ }
+}
Copied: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionServiceTest.java (from r1431198, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionServiceTest.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionServiceTest.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.java&r1=1431198&r2=1431918&rev=1431918&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionServiceTest.java Fri Jan 11 07:15:57 2013
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
-import org.apache.webbeans.intercept.InterceptorResolution;
+import org.apache.webbeans.intercept.InterceptorResolutionService;
import org.apache.webbeans.newtests.AbstractUnitTest;
import org.apache.webbeans.newtests.interceptors.factory.beans.ClassInterceptedClass;
import org.apache.webbeans.newtests.interceptors.factory.beans.ClassMultiInterceptedClass;
@@ -51,7 +51,7 @@ import org.junit.Test;
/**
* Test interceptor resolution.
*/
-public class InterceptorResolutionTest extends AbstractUnitTest
+public class InterceptorResolutionServiceTest extends AbstractUnitTest
{
@Test
@@ -67,11 +67,11 @@ public class InterceptorResolutionTest
startContainer(beanClasses, beanXmls);
- InterceptorResolution ir = new InterceptorResolution(getWebBeansContext());
+ InterceptorResolutionService ir = new InterceptorResolutionService(getWebBeansContext());
AnnotatedType<ClassInterceptedClass> annotatedType = getBeanManager().createAnnotatedType(ClassInterceptedClass.class);
Bean<ClassInterceptedClass> bean = (Bean<ClassInterceptedClass>) getBeanManager().resolve(getBeanManager().getBeans(ClassInterceptedClass.class));
- InterceptorResolution.BeanInterceptorInfo interceptorInfo = ir.calculateInterceptorInfo(bean, annotatedType);
+ InterceptorResolutionService.BeanInterceptorInfo interceptorInfo = ir.calculateInterceptorInfo(bean, annotatedType);
Assert.assertNotNull(interceptorInfo);
Assert.assertNotNull(interceptorInfo.getInterceptors());
@@ -79,11 +79,11 @@ public class InterceptorResolutionTest
Assert.assertNull(interceptorInfo.getDecorators());
- Map<Method, InterceptorResolution.MethodInterceptorInfo> methodInterceptorInfos = interceptorInfo.getBusinessMethodsInfo();
+ Map<Method, InterceptorResolutionService.MethodInterceptorInfo> methodInterceptorInfos = interceptorInfo.getBusinessMethodsInfo();
Assert.assertNotNull(methodInterceptorInfos);
Assert.assertEquals(7, methodInterceptorInfos.size());
- for (InterceptorResolution.MethodInterceptorInfo mi : methodInterceptorInfos.values())
+ for (InterceptorResolutionService.MethodInterceptorInfo mi : methodInterceptorInfos.values())
{
Assert.assertEquals(1, mi.getCdiInterceptors().length);
}
@@ -108,11 +108,11 @@ public class InterceptorResolutionTest
startContainer(beanClasses, beanXmls);
- InterceptorResolution ir = new InterceptorResolution(getWebBeansContext());
+ InterceptorResolutionService ir = new InterceptorResolutionService(getWebBeansContext());
AnnotatedType<ClassMultiInterceptedClass> annotatedType = getBeanManager().createAnnotatedType(ClassMultiInterceptedClass.class);
Bean<ClassMultiInterceptedClass> bean = (Bean<ClassMultiInterceptedClass>) getBeanManager().resolve(getBeanManager().getBeans(ClassMultiInterceptedClass.class));
- InterceptorResolution.BeanInterceptorInfo interceptorInfo = ir.calculateInterceptorInfo(bean, annotatedType);
+ InterceptorResolutionService.BeanInterceptorInfo interceptorInfo = ir.calculateInterceptorInfo(bean, annotatedType);
Assert.assertNotNull(interceptorInfo);
Assert.assertNotNull(interceptorInfo.getInterceptors());
@@ -120,11 +120,11 @@ public class InterceptorResolutionTest
Assert.assertNull(interceptorInfo.getDecorators());
- Map<Method, InterceptorResolution.MethodInterceptorInfo> methodInterceptorInfos = interceptorInfo.getBusinessMethodsInfo();
+ Map<Method, InterceptorResolutionService.MethodInterceptorInfo> methodInterceptorInfos = interceptorInfo.getBusinessMethodsInfo();
Assert.assertNotNull(methodInterceptorInfos);
Assert.assertEquals(6, methodInterceptorInfos.size());
- for (InterceptorResolution.MethodInterceptorInfo mi : methodInterceptorInfos.values())
+ for (InterceptorResolutionService.MethodInterceptorInfo mi : methodInterceptorInfos.values())
{
Assert.assertEquals(3, mi.getCdiInterceptors().length);
}
@@ -147,11 +147,11 @@ public class InterceptorResolutionTest
startContainer(beanClasses, beanXmls);
- InterceptorResolution ir = new InterceptorResolution(getWebBeansContext());
+ InterceptorResolutionService ir = new InterceptorResolutionService(getWebBeansContext());
AnnotatedType<MethodInterceptedClass> annotatedType = getBeanManager().createAnnotatedType(MethodInterceptedClass.class);
Bean<MethodInterceptedClass> bean = (Bean<MethodInterceptedClass>) getBeanManager().resolve(getBeanManager().getBeans(MethodInterceptedClass.class));
- InterceptorResolution.BeanInterceptorInfo interceptorInfo = ir.calculateInterceptorInfo(bean, annotatedType);
+ InterceptorResolutionService.BeanInterceptorInfo interceptorInfo = ir.calculateInterceptorInfo(bean, annotatedType);
Assert.assertNotNull(interceptorInfo);
Assert.assertNotNull(interceptorInfo.getInterceptors());
@@ -159,11 +159,11 @@ public class InterceptorResolutionTest
Assert.assertNull(interceptorInfo.getDecorators());
- Map<Method, InterceptorResolution.MethodInterceptorInfo> methodInterceptorInfos = interceptorInfo.getBusinessMethodsInfo();
+ Map<Method, InterceptorResolutionService.MethodInterceptorInfo> methodInterceptorInfos = interceptorInfo.getBusinessMethodsInfo();
Assert.assertNotNull(methodInterceptorInfos);
Assert.assertEquals(2, methodInterceptorInfos.size());
- for (Map.Entry<Method, InterceptorResolution.MethodInterceptorInfo> mi : methodInterceptorInfos.entrySet())
+ for (Map.Entry<Method, InterceptorResolutionService.MethodInterceptorInfo> mi : methodInterceptorInfos.entrySet())
{
if (mi.getKey().getName().equals("getMeaningOfLife"))
{
@@ -191,12 +191,12 @@ public class InterceptorResolutionTest
startContainer(beanClasses, beanXmls);
- InterceptorResolution ir = new InterceptorResolution(getWebBeansContext());
+ InterceptorResolutionService ir = new InterceptorResolutionService(getWebBeansContext());
AnnotatedType<DecoratedClass> annotatedType = getBeanManager().createAnnotatedType(DecoratedClass.class);
Bean<DecoratedClass> bean = (Bean<DecoratedClass>) getBeanManager().resolve(
getBeanManager().getBeans(DecoratedClass.class, new AnnotationLiteral<Binding1>() {}));
- InterceptorResolution.BeanInterceptorInfo interceptorInfo = ir.calculateInterceptorInfo(bean, annotatedType);
+ InterceptorResolutionService.BeanInterceptorInfo interceptorInfo = ir.calculateInterceptorInfo(bean, annotatedType);
Assert.assertNotNull(interceptorInfo);
Assert.assertNotNull(interceptorInfo.getBusinessMethodsInfo());
@@ -220,11 +220,11 @@ public class InterceptorResolutionTest
startContainer(beanClasses, beanXmls);
- InterceptorResolution ir = new InterceptorResolution(getWebBeansContext());
+ InterceptorResolutionService ir = new InterceptorResolutionService(getWebBeansContext());
AnnotatedType<InterceptedComponent> annotatedType = getBeanManager().createAnnotatedType(InterceptedComponent.class);
Bean<InterceptedComponent> bean = (Bean<InterceptedComponent>) getBeanManager().resolve(getBeanManager().getBeans(InterceptedComponent.class));
- InterceptorResolution.BeanInterceptorInfo interceptorInfo = ir.calculateInterceptorInfo(bean, annotatedType);
+ InterceptorResolutionService.BeanInterceptorInfo interceptorInfo = ir.calculateInterceptorInfo(bean, annotatedType);
Assert.assertNotNull(interceptorInfo);
/*X
Assert.assertNotNull(interceptorInfo.getBusinessMethodsInfo());
Propchange: openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionServiceTest.xml
------------------------------------------------------------------------------
svn:eol-style = native