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/05 18:52:08 UTC
svn commit: r1429335 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
component/ context/creational/ conversation/ corespi/ event/ inject/
inject/impl/ portable/events/discovery/ util/
Author: struberg
Date: Sat Jan 5 17:52:08 2013
New Revision: 1429335
URL: http://svn.apache.org/viewvc?rev=1429335&view=rev
Log:
OWB-748 remove unused code
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewManagedBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java?rev=1429335&r1=1429334&r2=1429335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java Sat Jan 5 17:52:08 2013
@@ -60,7 +60,7 @@ public class EventBean<T> extends Abstra
Event<T> instance = null;
InjectionPoint injectionPoint = local.get();
- Type eventType = null;
+ Type eventType;
if(injectionPoint != null)
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewManagedBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewManagedBean.java?rev=1429335&r1=1429334&r2=1429335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewManagedBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewManagedBean.java Sat Jan 5 17:52:08 2013
@@ -54,14 +54,6 @@ public class NewManagedBean<T> extends M
}
/**
- * @return the definedType
- */
- public WebBeansType getDefinedType()
- {
- return definedType;
- }
-
- /**
* always true for New qualifier
*/
@Override
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java?rev=1429335&r1=1429334&r2=1429335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java Sat Jan 5 17:52:08 2013
@@ -45,16 +45,6 @@ public class BeanInstanceBag<T> implemen
{
return beanCreationalContext;
}
-
-
-
- /**
- * @param beanInstance the beanInstance to set
- */
- public void setBeanInstance(T beanInstance)
- {
- this.beanInstance = beanInstance;
- }
/**
* @return the beanInstance
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=1429335&r1=1429334&r2=1429335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java Sat Jan 5 17:52:08 2013
@@ -215,15 +215,6 @@ public class ConversationImpl implements
}
/**
- * Sets transient.
- * @param value transient value
- */
- public void setTransient(boolean value)
- {
- isTransient = value;
- }
-
- /**
* {@inheritDoc}
*/
public String getId()
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java?rev=1429335&r1=1429334&r2=1429335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java Sat Jan 5 17:52:08 2013
@@ -76,29 +76,6 @@ public class DefaultSingletonService imp
singletonMap.remove(classLoader);
}
}
-
- /**
- * Gets classloader with given singelton instance.
- * @param object singleton instance
- * @return the classloader that instance is created within
- */
- public ClassLoader getSingletonClassLoader(Object object)
- {
- Asserts.assertNotNull(object, "object is null");
- synchronized (objectToClassLoaderMap)
- {
- if(objectToClassLoaderMap.containsKey(object))
- {
- WeakReference<ClassLoader> current = objectToClassLoaderMap.get(object);
- if(current != null)
- {
- return current.get();
- }
- }
- }
-
- return null;
- }
/**
* {@inheritDoc}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java?rev=1429335&r1=1429334&r2=1429335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java Sat Jan 5 17:52:08 2013
@@ -27,12 +27,8 @@ import java.lang.reflect.Type;
import javax.enterprise.event.Event;
import javax.enterprise.event.Observes;
-import javax.enterprise.event.Reception;
import javax.enterprise.event.TransactionPhase;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansConfigurationException;
@@ -85,44 +81,6 @@ public final class EventUtil
return null;
}
- public static void checkObserverMethodConditions(Method candidateObserverMethod, Class<?> clazz)
- {
- Asserts.assertNotNull(candidateObserverMethod, "candidateObserverMethod parameter can not be null");
- Asserts.nullCheckForClass(clazz);
-
- if (AnnotationUtil.hasMethodMultipleParameterAnnotation(candidateObserverMethod, Observes.class))
- {
- throw new WebBeansConfigurationException("Observer method : " + candidateObserverMethod.getName() + " in class : " + clazz.getName()
- + " can not define two parameters with annotated @Observes");
- }
-
- if (AnnotationUtil.hasMethodAnnotation(candidateObserverMethod, Produces.class) || AnnotationUtil.hasMethodAnnotation(candidateObserverMethod, Inject.class))
- {
- throw new WebBeansConfigurationException("Observer method : " + candidateObserverMethod.getName() + " in class : "
- + clazz.getName() + " can not annotated with annotation in the list {@Produces, @Initializer, @Destructor}");
-
- }
-
- if (AnnotationUtil.hasMethodParameterAnnotation(candidateObserverMethod, Disposes.class))
- {
- throw new WebBeansConfigurationException("Observer method : " + candidateObserverMethod.getName() + " in class : "
- + clazz.getName() + " can not annotated with annotation @Disposes");
- }
- }
-
- public static boolean isReceptionIfExist(Method observerMethod)
- {
- Observes observes = AnnotationUtil.getMethodFirstParameterAnnotation(observerMethod, Observes.class);
- Reception reception = observes.notifyObserver();
- if(reception.equals(Reception.IF_EXISTS))
- {
- return true;
- }
-
- return false;
- }
-
-
public static boolean checkObservableInjectionPointConditions(InjectionPoint injectionPoint)
{
Type type = injectionPoint.getType();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=1429335&r1=1429334&r2=1429335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java Sat Jan 5 17:52:08 2013
@@ -211,15 +211,5 @@ public abstract class AbstractInjectable
return false;
}
-
- /**
- * Gets the component.
- *
- * @return the component
- */
- public OwbBean<?> getInjectionOwnerComponent()
- {
- return injectionOwnerBean;
- }
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java?rev=1429335&r1=1429334&r2=1429335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java Sat Jan 5 17:52:08 2013
@@ -22,7 +22,6 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Member;
-import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.util.ArrayList;
@@ -137,35 +136,6 @@ public class InjectionPointFactory
}
- @SuppressWarnings("unchecked")
- public List<InjectionPoint> getMethodInjectionPointData(Bean<?> owner, Method member)
- {
- Asserts.assertNotNull(owner, "owner parameter can not be null");
- Asserts.assertNotNull(member, "member parameter can not be null");
-
- List<InjectionPoint> lists = new ArrayList<InjectionPoint>();
-
- AnnotatedElementFactory annotatedElementFactory = webBeansContext.getAnnotatedElementFactory();
- AnnotatedType<?> annotated = annotatedElementFactory.newAnnotatedType(member.getDeclaringClass());
- AnnotatedMethod method = annotatedElementFactory.newAnnotatedMethod(member, annotated);
- List<AnnotatedParameter<?>> parameters = method.getParameters();
-
- InjectionPoint point = null;
-
- for(AnnotatedParameter<?> parameter : parameters)
- {
- //@Observes is not injection point type for method parameters
- if(parameter.getAnnotation(Observes.class) == null)
- {
- point = getGenericInjectionPoint(owner, parameter.getAnnotations().toArray(new Annotation[parameter.getAnnotations().size()]),
- parameter.getBaseType(), member , parameter);
- lists.add(point);
- }
- }
-
- return lists;
- }
-
public <X> List<InjectionPoint> getMethodInjectionPointData(Bean<?> owner, AnnotatedMethod<X> method)
{
Asserts.assertNotNull(owner, "owner parameter can not be null");
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java?rev=1429335&r1=1429334&r2=1429335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java Sat Jan 5 17:52:08 2013
@@ -46,14 +46,6 @@ public class ErrorStack
errorStack.addElement(e);
}
- public Throwable[] popErrors()
- {
- Throwable[] list = new Throwable[errorStack.size()];
- list = errorStack.toArray(list);
-
- return list;
- }
-
public void logErrors()
{
if(!errorStack.isEmpty())
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java?rev=1429335&r1=1429334&r2=1429335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java Sat Jan 5 17:52:08 2013
@@ -615,42 +615,6 @@ public final class AnnotationUtil
return Collections.emptyList();
}
-
- /**
- * Gets array of methods that has parameter with given annotation type.
- *
- * @param clazz class for check
- * @param annotation for check
- * @return array of methods
- */
- public static Method[] getMethodsWithParameterAnnotation(Class<?> clazz, Class<? extends Annotation> annotation)
- {
- Asserts.nullCheckForClass(clazz);
- Asserts.assertNotNull(annotation, "Annotation argument can not be null");
- List<Method> methodsWithParameterAnnotation = new ArrayList<Method>();
- List<Method> allMethods = new ArrayList<Method>();
-
- do
- {
- Method[] methods = SecurityUtil.doPrivilegedGetDeclaredMethods(clazz);
-
- for (Method m : methods)
- {
- if (hasMethodParameterAnnotation(m, annotation) && !isMethodOverridden(m, allMethods))
- {
- methodsWithParameterAnnotation.add(m);
- }
- allMethods.add(m);
- }
- clazz = clazz.getSuperclass();
- } while (clazz != null && clazz != Object.class);
-
- Method[] rMethod = methodsWithParameterAnnotation.toArray(new Method[methodsWithParameterAnnotation.size()]);
-
- return rMethod;
- }
-
-
/**
* Check whether or not class contains the given annotation.
*
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java?rev=1429335&r1=1429334&r2=1429335&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java Sat Jan 5 17:52:08 2013
@@ -65,16 +65,6 @@ public final class Asserts
}
/**
- * Null check for type modifiers.
- *
- * @param modifier modifier parameter check
- */
- public static void nullCheckForModifier(Integer modifier)
- {
- Asserts.assertNotNull(modifier, "modifier argument can not be null");
- }
-
- /**
* Null check for class parameter.
*
* @param clazz parameter
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=1429335&r1=1429334&r2=1429335&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 Sat Jan 5 17:52:08 2013
@@ -218,21 +218,6 @@ public final class ClassUtil
}
- public static List<Class<?>> getSuperClasses(Class<?> clazz, List<Class<?>> list)
- {
- Asserts.nullCheckForClass(clazz);
-
- Class<?> sc = clazz.getSuperclass();
- if (sc != null)
- {
- list.add(sc);
- getSuperClasses(sc, list);
- }
-
- return list;
-
- }
-
private static Set<String> getObjectMethodNames()
{
if (objectMethodNames == null)