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/18 13:38:32 UTC
svn commit: r1435114 - in /openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/context/creational/
main/java/org/apache/webbeans/decorator/
main/java/org/apache/webbeans/portable/ main/java/org/apache/webbeans/util/
test/java/org/apache...
Author: struberg
Date: Fri Jan 18 12:38:31 2013
New Revision: 1435114
URL: http://svn.apache.org/viewvc?rev=1435114&view=rev
Log:
OWB-344 remove unused code
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/AbstractDecoratorMethodHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1435114&r1=1435113&r2=1435114&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Fri Jan 18 12:38:31 2013
@@ -265,44 +265,6 @@ public class CreationalContextImpl<T> im
return null;
}
- /**
- * Gets bean decorator instance.
- * @param decorator decorator bean
- * @return bean decorator instance
- */
- public Object getDependentDecorator(Object ownerInstance, Contextual<?> decorator)
- {
- Asserts.assertNotNull(decorator, "Decorator parameter can not be null");
-
- if (ownerInstance == null || dependentObjects == null)
- {
- return null;
- }
-
- synchronized(this)
- {
- if (dependentObjects != null)
- {
- List<DependentCreationalContext<?>> values = dependentObjects.get(ownerInstance);
- if (values != null && values.size() > 0)
- {
- Iterator<DependentCreationalContext<?>> it = values.iterator();
- while (it.hasNext())
- {
- DependentCreationalContext<?> dc = it.next();
-
- if (dc.getDependentType().equals(DependentType.DECORATOR) &&
- dc.getContextual().equals(decorator))
- {
- return dc.getInstance();
- }
- }
- }
- }
- }
-
- return null;
- }
@SuppressWarnings("unchecked")
public void removeAllDependents()
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=1435114&r1=1435113&r2=1435114&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 Fri Jan 18 12:38:31 2013
@@ -19,13 +19,11 @@
package org.apache.webbeans.util;
import org.apache.webbeans.config.BeanTypeSetResolver;
-import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansException;
import javax.enterprise.event.Event;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.inject.Provider;
-import java.lang.reflect.Field;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -1143,24 +1141,6 @@ public final class ClassUtil
return true;
}
- public static Field[] getFieldsWithType(WebBeansContext webBeansContext, Class<?> clazz, Type type)
- {
- Asserts.nullCheckForClass(clazz);
- Asserts.assertNotNull(type, "type parameter can not be null");
-
- List<Field> fieldsWithType = new ArrayList<Field>();
- Field[] fields = webBeansContext.getSecurityService().doPrivilegedGetDeclaredFields(clazz);
- for (Field field : fields)
- {
- if(field.getType().equals(type))
- {
- fieldsWithType.add(field);
- }
- }
-
- return fieldsWithType.toArray(new Field[fieldsWithType.size()]);
-
- }
/**
* Returns injection point raw type.
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java?rev=1435114&r1=1435113&r2=1435114&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java Fri Jan 18 12:38:31 2013
@@ -51,7 +51,6 @@ import org.apache.webbeans.component.cre
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.context.DependentContext;
-import org.apache.webbeans.decorator.DecoratorUtil;
import org.apache.webbeans.deployment.StereoTypeModel;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
@@ -281,7 +280,6 @@ public abstract class TestContext implem
bean = define(clazz, WebBeansType.MANAGED, webBeansContext.getAnnotatedElementFactory().newAnnotatedType(clazz));
if (bean != null)
{
- DecoratorUtil.checkManagedBeanDecoratorConditions(bean,null);
webBeansContext.getWebBeansInterceptorConfig().defineBeanInterceptorStack(bean);
getComponents().add((AbstractOwbBean<?>) bean);