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 19:51:52 UTC
svn commit: r1429358 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
config/inheritance/ corespi/ inject/ lifecycle/ util/
Author: struberg
Date: Sat Jan 5 18:51:52 2013
New Revision: 1429358
URL: http://svn.apache.org/viewvc?rev=1429358&view=rev
Log:
OWB-748 remove even more 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/corespi/DefaultSingletonService.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/InjectableConstructor.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.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=1429358&r1=1429357&r2=1429358&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 Sat Jan 5 18:51:52 2013
@@ -84,18 +84,7 @@ abstract class AbstractBeanInheritedMeta
{
return inheritedScopeType;
}
-
- protected AbstractOwbBean<T> getComponent()
- {
- return component;
- }
-
- protected Class<?> getInheritedClazz()
- {
- return inheritedClazz;
- }
-
-
+
/**
* Internally set the inheritedBindingTypes
*/
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=1429358&r1=1429357&r2=1429358&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 18:51:52 2013
@@ -18,8 +18,6 @@
*/
package org.apache.webbeans.corespi;
-import java.lang.ref.WeakReference;
-import java.util.IdentityHashMap;
import java.util.Map;
import java.util.WeakHashMap;
@@ -35,9 +33,6 @@ public class DefaultSingletonService imp
*/
private final Map<ClassLoader, WebBeansContext> singletonMap = new WeakHashMap<ClassLoader, WebBeansContext>();
- private final Map<Object, WeakReference<ClassLoader>> objectToClassLoaderMap = new IdentityHashMap<Object, WeakReference<ClassLoader>>();
-
-
/**
* Gets singleton instance for deployment.
* @return signelton instance for this deployment
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=1429358&r1=1429357&r2=1429358&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 18:51:52 2013
@@ -61,9 +61,6 @@ public abstract class AbstractInjectable
/**Creational context instance that is passed to bean's create*/
protected CreationalContext<?> injectionOwnerCreationalContext;
- /**Field, method or constructor injection*/
- protected Member injectionMember;
-
//X TODO refactor. public static variables are utterly ugly
public static ThreadLocal<Object> instanceUnderInjection = new ThreadLocal<Object>();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java?rev=1429358&r1=1429357&r2=1429358&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java Sat Jan 5 18:51:52 2013
@@ -51,7 +51,6 @@ public class InjectableConstructor<T> ex
{
super(owner,creationalContext);
con = cons;
- injectionMember = con;
}
/**
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java?rev=1429358&r1=1429357&r2=1429358&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java Sat Jan 5 18:51:52 2013
@@ -42,7 +42,6 @@ public class InjectableField extends Abs
super(owner,creationalContext);
this.field = field;
this.instance = instance;
- injectionMember = field;
}
public Object doInjection()
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java?rev=1429358&r1=1429357&r2=1429358&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java Sat Jan 5 18:51:52 2013
@@ -66,7 +66,6 @@ public class InjectableMethods<T> extend
super(owner,creationalContext);
method = m;
this.instance = instance;
- injectionMember = m;
}
/*
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java?rev=1429358&r1=1429357&r2=1429358&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java Sat Jan 5 18:51:52 2013
@@ -195,14 +195,6 @@ public abstract class AbstractLifeCycle
}
/**
- * @return the logger
- */
- protected Logger getLogger()
- {
- return logger;
- }
-
- /**
* @return the contextsService
*/
public ContextsService getContextService()
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=1429358&r1=1429357&r2=1429358&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 18:51:52 2013
@@ -21,11 +21,9 @@ package org.apache.webbeans.util;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -157,45 +155,6 @@ public final class AnnotationUtil
return false;
}
- /**
- * Check given annotation exist in the multiple parameter of the given
- * method. Return true if exist false otherwise.
- *
- * @param method method
- * @param clazz checking annotation
- * @return true or false
- */
- public static boolean hasMethodMultipleParameterAnnotation(Method method, Class<? extends Annotation> clazz)
- {
- Asserts.assertNotNull(method, "Method argument can not be null");
- Asserts.nullCheckForClass(clazz);
-
- Annotation[][] parameterAnns = method.getParameterAnnotations();
-
- boolean found = false;
-
- for (Annotation[] parameters : parameterAnns)
- {
- for (Annotation param : parameters)
- {
-
- if (param.annotationType().equals(clazz))
- {
- if (!found)
- {
- found = true;
- }
- else
- {
- return true;
- }
- }
- }
-
- }
- return false;
- }
-
public static <X> boolean hasAnnotatedMethodMultipleParameterAnnotation(AnnotatedMethod<X> annotatedMethod, Class<? extends Annotation> clazz)
{
Asserts.assertNotNull(annotatedMethod, "annotatedMethod argument can not be null");
@@ -222,42 +181,7 @@ public final class AnnotationUtil
return false;
}
-
-
- /**
- * Gets the method first found parameter type that is annotated with the
- * given annotation.
- *
- * @param method method
- * @param clazz checking annotation
- * @return type
- */
- public static Type getMethodFirstParameterWithAnnotation(Method method, Class<? extends Annotation> clazz)
- {
- Asserts.assertNotNull(method, "Method argument can not be null");
- Asserts.nullCheckForClass(clazz);
-
- Annotation[][] parameterAnns = method.getParameterAnnotations();
- Type[] params = method.getGenericParameterTypes();
-
- int index = 0;
- for (Annotation[] parameters : parameterAnns)
- {
- for (Annotation param : parameters)
- {
- Class<? extends Annotation> btype = param.annotationType();
- if (btype.equals(clazz))
- {
- return params[index];
- }
- }
-
- index++;
- }
- return null;
- }
-
public static <X> Type getAnnotatedMethodFirstParameterWithAnnotation(AnnotatedMethod<X> annotatedMethod, Class<? extends Annotation> clazz)
{
Asserts.assertNotNull(annotatedMethod, "annotatedMethod argument can not be null");
@@ -411,47 +335,6 @@ public final class AnnotationUtil
}
/**
- * Checks if the specified method is overridden by another method from the list.
- *
- * @param method the method to check
- * @param overridingCandidates the collection of methods potentially overriding the specified method
- * @return
- */
- public static boolean isMethodOverridden(Method method, Collection<Method> overridingCandidates)
- {
- if (overridingCandidates.isEmpty() || Modifier.isPrivate(method.getModifiers()) || Modifier.isStatic(method.getModifiers()))
- {
- return false;
- }
- Class<?>[] methodParameterTypes = method.getParameterTypes();
- boolean isOverridden = false;
- candidates:
- for (Method candidate : overridingCandidates)
- {
- if (!candidate.getName().equals(method.getName()))
- {
- continue;
- }
- Class<?>[] candidateParameterTypes = candidate.getParameterTypes();
- if (candidateParameterTypes.length != methodParameterTypes.length)
- {
- continue;
- }
- for (int i = 0; i < methodParameterTypes.length; i++)
- {
- if (!candidateParameterTypes[i].equals(methodParameterTypes[i]))
- {
- continue candidates;
- }
- }
- // we don't need to check the return type as that is done by the java compiler
- isOverridden = true;
- break;
- }
- return isOverridden;
- }
-
- /**
* Quecks if the two values are equal.
*
* @param value1