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/20 00:59:35 UTC
svn commit: r1435766 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
annotation/ component/ context/ context/creational/ util/
Author: struberg
Date: Sat Jan 19 23:59:35 2013
New Revision: 1435766
URL: http://svn.apache.org/viewvc?rev=1435766&view=rev
Log:
OWB-344 remove unused cod3
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/EjbInterceptorContext.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.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/ClassUtil.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java?rev=1435766&r1=1435765&r2=1435766&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java Sat Jan 19 23:59:35 2013
@@ -44,7 +44,6 @@ import javax.inject.Qualifier;
import javax.inject.Scope;
import javax.interceptor.InterceptorBinding;
-import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -847,27 +846,4 @@ public final class AnnotationManager
}
}
- /**
- * Returns trur for serializable types.
- * @param clazz class info
- * @return true if class is serializable
- */
- public boolean checkInjectionPointForInterceptorPassivation(Class<?> clazz)
- {
- Asserts.nullCheckForClass(clazz);
- Field[] fields = webBeansContext.getSecurityService().doPrivilegedGetDeclaredFields(clazz);
- for(Field field : fields)
- {
- if(field.getAnnotation(Inject.class) != null)
- {
- Class<?> type = field.getType();
- if(!Serializable.class.isAssignableFrom(type))
- {
- return false;
- }
- }
- }
-
- return true;
- }
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java?rev=1435766&r1=1435765&r2=1435766&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java Sat Jan 19 23:59:35 2013
@@ -27,7 +27,6 @@ import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
-import org.apache.webbeans.util.WebBeansUtil;
/**
* Abstract class for producer components.
@@ -102,57 +101,6 @@ public abstract class AbstractProducerBe
destroy.destroy(inst, cc);
}
- /**
- * Returns producer bean's owner bean instance.
- *
- * @return owner bean instance
- */
- @SuppressWarnings("unchecked")
- protected Object getParentInstance(CreationalContext<?> creationalContext)
- {
- // return getManager().getInstance(this.ownerComponent);
-
- Object parentInstance;
-
- Bean<?> specialize = WebBeansUtil.getMostSpecializedBean(getManager(),
- (AbstractOwbBean<T>) ownerComponent);
-
- if (specialize != null)
- {
- parentInstance = getManager().getReference(specialize, null, creationalContext);
- }
- else
- {
- parentInstance = getManager().getReference(ownerComponent, null, creationalContext);
- }
-
- return parentInstance;
-
- }
-
- @SuppressWarnings("unchecked")
- protected Object getParentInstanceFromContext(CreationalContext<?> creationalContext)
- {
- Object parentInstance;
-
- Bean<?> specialize = WebBeansUtil.getMostSpecializedBean(getManager(),
- (AbstractOwbBean<T>) ownerComponent);
-
- if (specialize != null)
- {
- parentInstance = getManager().getContext(specialize.getScope()).
- get((Bean<Object>)specialize,(CreationalContext<Object>) creationalContext);
- }
- else
- {
- parentInstance = getManager().getContext(
- ownerComponent.getScope()).get((Bean<Object>)ownerComponent,
- (CreationalContext<Object>) creationalContext);
- }
-
- return parentInstance;
-
- }
protected boolean isPassivationCapable(Class<?> returnType, Integer modifiers)
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=1435766&r1=1435765&r2=1435766&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Sat Jan 19 23:59:35 2013
@@ -59,19 +59,9 @@ public abstract class AbstractContext im
/**Contextual Scope Type*/
protected Class<? extends Annotation> scopeType;
- /**
- * Creates a new context instance
- */
- protected AbstractContext()
- {
- }
-
- public <T> void initContextualBag(Contextual<T> contextual, CreationalContext<T> creationalContext)
- {
- createContextualBag(contextual, creationalContext);
- }
+
@SuppressWarnings("unchecked")
private <T> void createContextualBag(Contextual<T> contextual, CreationalContext<T> creationalContext)
@@ -171,21 +161,6 @@ public abstract class AbstractContext im
return instance;
}
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public <T> CreationalContext<T> getCreationalContext(Contextual<T> contextual)
- {
- BeanInstanceBag<?> bag = componentInstanceMap.get(contextual);
- if (bag != null)
- {
- return (CreationalContext<T>) bag.getBeanCreationalContext();
- }
-
- return null;
- }
/**
* Destroy the given web beans component instance.
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java?rev=1435766&r1=1435765&r2=1435766&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java Sat Jan 19 23:59:35 2013
@@ -185,23 +185,5 @@ public final class ContextFactory
return contextService.getCurrentContext(scopeType);
}
- /**
- * Activate context.
- */
- public void activateContext(Class<? extends Annotation> scopeType)
- {
- ContextsService contextService = getContextsService();
- contextService.activateContext(scopeType);
- }
-
- /**
- * Deactivate context.
- */
- public void deActivateContext(Class<? extends Annotation> scopeType)
- {
- ContextsService contextService = getContextsService();
- contextService.deActivateContext(scopeType);
- }
-
}
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=1435766&r1=1435765&r2=1435766&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 19 23:59:35 2013
@@ -143,36 +143,7 @@ public final class AnnotationUtil
}
- /**
- * Check given annotation exist in the any 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 hasMethodParameterAnnotation(Method method, Class<? extends Annotation> clazz)
- {
- Asserts.assertNotNull(method, "Method argument can not be null");
- Asserts.nullCheckForClass(clazz);
-
- Annotation[][] parameterAnns = method.getParameterAnnotations();
-
- for (Annotation[] parameters : parameterAnns)
- {
- for (Annotation param : parameters)
- {
- Class<? extends Annotation> btype = param.annotationType();
- if (btype.equals(clazz))
- {
- return true;
- }
- }
- }
- return false;
- }
-
public static <X> boolean hasAnnotatedMethodParameterAnnotation(AnnotatedMethod<X> annotatedMethod, Class<? extends Annotation> clazz)
{
Asserts.assertNotNull(annotatedMethod, "annotatedMethod argument can not be null");
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=1435766&r1=1435765&r2=1435766&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 19 23:59:35 2013
@@ -321,23 +321,6 @@ public final class ClassUtil
return getObjectMethodNames().contains(methodName);
}
- public static boolean isMoreThanOneMethodWithName(String methodName, Class<?> clazz)
- {
- Asserts.assertNotNull(methodName, "methodName parameter can not be null");
- Asserts.nullCheckForClass(clazz);
-
- Method[] methods = SecurityUtil.doPrivilegedGetDeclaredMethods(clazz);
- int methodCount = 0;
- for (Method m : methods)
- {
- if (m.getName().equals(methodName))
- {
- methodCount++;
- }
- }
-
- return methodCount > 1;
- }
/**
* Returns true if type is an instance of <code>ParameterizedType</code>