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/07 12:10:44 UTC
svn commit: r1429750 - in /openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/config/inheritance/
main/java/org/apache/webbeans/util/
test/java/org/apache/webbeans/newtests/interceptors/resolution/
Author: struberg
Date: Mon Jan 7 11:10:44 2013
New Revision: 1429750
URL: http://svn.apache.org/viewvc?rev=1429750&view=rev
Log:
OWB-748 remove unused code
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java?rev=1429750&r1=1429749&r2=1429750&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java Mon Jan 7 11:10:44 2013
@@ -22,16 +22,11 @@ import java.lang.annotation.Annotation;
import java.util.HashSet;
import java.util.Set;
-import org.apache.webbeans.component.AbstractOwbBean;
-
/**
* Defines the bean inherited meta-datas.
*/
abstract class AbstractBeanInheritedMetaData<T> implements IBeanInheritedMetaData
{
- /**Component that inherits the meta-datas*/
- protected AbstractOwbBean<T> component;
-
/**Inherited class*/
protected Class<?> inheritedClazz;
@@ -50,12 +45,10 @@ abstract class AbstractBeanInheritedMeta
/**
* Create a new bean inherited data.
*
- * @param component webbeans component
* @param inheritedClazz inherited class
*/
- protected AbstractBeanInheritedMetaData(AbstractOwbBean<T> component, Class<?> inheritedClazz)
+ protected AbstractBeanInheritedMetaData(Class<?> inheritedClazz)
{
- this.component = component;
this.inheritedClazz = inheritedClazz;
setInheritedQualifiers();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java?rev=1429750&r1=1429749&r2=1429750&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java Mon Jan 7 11:10:44 2013
@@ -35,7 +35,7 @@ public class BeanInheritedMetaData<T> ex
{
public BeanInheritedMetaData(AbstractOwbBean<T> component)
{
- super(component, component.getReturnType().getSuperclass());
+ super(component.getReturnType().getSuperclass());
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=1429750&r1=1429749&r2=1429750&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java Mon Jan 7 11:10:44 2013
@@ -21,7 +21,6 @@ package org.apache.webbeans.util;
import org.apache.webbeans.config.BeanTypeSetResolver;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansException;
-import org.apache.webbeans.logger.WebBeansLoggerFacade;
import javax.enterprise.event.Event;
import javax.enterprise.inject.spi.InjectionPoint;
@@ -41,7 +40,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Logger;
/**
* Utility classes with respect to the class operations.
@@ -53,8 +51,6 @@ public final class ClassUtil
{
public static final Map<Class<?>, Class<?>> PRIMITIVE_TO_WRAPPERS_MAP = new HashMap<Class<?>, Class<?>>();
- private static final Logger logger = WebBeansLoggerFacade.getLogger(ClassUtil.class);
-
static
{
PRIMITIVE_TO_WRAPPERS_MAP.put(Integer.TYPE,Integer.class);
Modified: 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/InterceptorResolutionTest.java?rev=1429750&r1=1429749&r2=1429750&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/InterceptorResolutionTest.java Mon Jan 7 11:10:44 2013
@@ -37,6 +37,8 @@ import org.apache.webbeans.test.componen
import org.apache.webbeans.test.component.intercept.webbeans.ActionInterceptor;
import org.apache.webbeans.test.component.intercept.webbeans.SecureInterceptor;
import org.apache.webbeans.test.component.intercept.webbeans.TransactionalInterceptor;
+import org.apache.webbeans.test.component.intercept.InterceptedComponent;
+import org.apache.webbeans.test.component.intercept.Interceptor1;
import org.apache.webbeans.test.component.intercept.webbeans.bindings.Action;
import org.apache.webbeans.test.component.intercept.webbeans.bindings.Secure;
@@ -206,4 +208,38 @@ public class InterceptorResolutionTest
shutDownContainer();
}
+ @Test
+ public void testEjbStyleInterceptorResolution() throws Exception
+ {
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(this.getClass().getPackage().getName(), this.getClass().getSimpleName()));
+
+ Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
+ beanClasses.add(InterceptedComponent.class);
+ beanClasses.add(Interceptor1.class);
+
+ startContainer(beanClasses, beanXmls);
+
+ InterceptorResolution ir = new InterceptorResolution(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);
+ Assert.assertNotNull(interceptorInfo);
+
+ /*X
+ Assert.assertNotNull(interceptorInfo.getBusinessMethodsInfo());
+ Assert.assertEquals(1, interceptorInfo.getBusinessMethodsInfo().size());
+
+
+ for (Map.Entry<Method, InterceptorResolution.MethodInterceptorInfo> mi : interceptorInfo.getBusinessMethodsInfo().entrySet())
+ {
+ Assert.assertNotNull(mi.getValue().getEjbInterceptors());
+ Assert.assertEquals(1, mi.getValue().getEjbInterceptors().length);
+ }
+ */
+
+ shutDownContainer();
+ }
+
}