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 2012/07/18 21:27:22 UTC
svn commit: r1363060 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
component/ container/ intercept/ util/
Author: struberg
Date: Wed Jul 18 19:27:21 2012
New Revision: 1363060
URL: http://svn.apache.org/viewvc?rev=1363060&view=rev
Log:
OWB-681 remove more obsolete stuff
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtils.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java?rev=1363060&r1=1363059&r2=1363060&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java Wed Jul 18 19:27:21 2012
@@ -25,9 +25,6 @@ import javax.enterprise.inject.spi.Injec
import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.spi.Producer;
-import org.apache.webbeans.portable.creation.InjectionTargetProducer;
-import org.apache.webbeans.portable.creation.ProducerBeansProducer;
-
/**
* Reponsible for producing, injection etc.
* of beans. Delegate operations to the wrapped
@@ -138,26 +135,4 @@ public class InjectionTargetWrapper<T> i
return wrapped.produce(creationalContext);
}
-
- public boolean isOwbProvided()
- {
- if(wrapped != null)
- {
- if(InjectionTargetProducer.class.isAssignableFrom(wrapped.getClass()))
- {
- return true;
- }
- }
-
- else if(wrappedProducer != null)
- {
- if(ProducerBeansProducer.class.isAssignableFrom(wrappedProducer.getClass()))
- {
- return true;
- }
- }
-
- return false;
- }
-
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=1363060&r1=1363059&r2=1363060&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Wed Jul 18 19:27:21 2012
@@ -273,7 +273,7 @@ public class InjectionResolver
private boolean isInstanceOrEventInjection(Type type)
{
- Class<?> clazz = null;
+ Class<?> clazz;
boolean injectInstanceOrEventProvider = false;
if (type instanceof ParameterizedType)
{
@@ -898,9 +898,7 @@ public class InjectionResolver
if (i == annotations.length)
{
result.add(component);
- i = 0;
}
-
}
return result;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java?rev=1363060&r1=1363059&r2=1363060&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java Wed Jul 18 19:27:21 2012
@@ -19,7 +19,6 @@
package org.apache.webbeans.container;
import java.lang.annotation.Annotation;
-import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Iterator;
import java.util.Set;
@@ -28,7 +27,6 @@ import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.ClassUtil;
import org.apache.webbeans.util.InjectionExceptionUtils;
@@ -70,27 +68,6 @@ public final class ResolutionUtil
return false;
}
- public static void resolveByTypeConditions(ParameterizedType type)
- {
- Asserts.assertNotNull(type, "type parameter can not be null");
- boolean result = ClassUtil.checkParametrizedType(type);
-
- if (!result)
- {
- throw new IllegalArgumentException("Parametrized type : " + type + " can not contain type variable or wildcard type arguments");
- }
- }
-
- public void getInstanceByTypeConditions(Annotation[] qualifiers)
- {
- webBeansContext.getAnnotationManager().checkQualifierConditions(qualifiers);
- }
-
- public void checkResolvedBeans(Set<Bean<?>> resolvedSet, Class<?> type, Annotation[] qualifiers)
- {
- checkResolvedBeans(resolvedSet, type, qualifiers, null);
- }
-
public void checkResolvedBeans(Set<Bean<?>> resolvedSet, Class<?> type, Annotation[] qualifiers, InjectionPoint injectionPoint)
{
if (resolvedSet.isEmpty())
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java?rev=1363060&r1=1363059&r2=1363060&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java Wed Jul 18 19:27:21 2012
@@ -33,36 +33,4 @@ public enum InterceptorType
{
AROUND_INVOKE, AROUND_TIMEOUT, POST_CONSTRUCT, PRE_DESTROY, PRE_PASSIVATE, POST_ACTIVATE;
- public static InterceptorType getType(InterceptionType type)
- {
- if (type.equals(InterceptionType.AROUND_INVOKE))
- {
- return AROUND_INVOKE;
- }
- else if (type.equals(InterceptionType.AROUND_TIMEOUT))
- {
- return AROUND_TIMEOUT;
- }
- else if (type.equals(InterceptionType.POST_CONSTRUCT))
- {
- return POST_CONSTRUCT;
- }
- else if (type.equals(InterceptionType.PRE_DESTROY))
- {
- return PRE_DESTROY;
- }
- else if (type.equals(InterceptionType.PRE_PASSIVATE))
- {
- return PRE_PASSIVATE;
- }
- else if (type.equals(InterceptionType.POST_ACTIVATE))
- {
- return POST_ACTIVATE;
- }
- else
- {
- throw new WebBeansException("Undefined interceptor type!");
- }
-
- }
-}
\ No newline at end of file
+}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtils.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtils.java?rev=1363060&r1=1363059&r2=1363060&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtils.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtils.java Wed Jul 18 19:27:21 2012
@@ -41,25 +41,6 @@ public class InjectionExceptionUtils
.addLine(violationMessage.toString())
.toString());
}
-
- public static void throwBeanNotFoundException(Class type, Annotation... qualifiers)
- {
- ViolationMessageBuilder violationMessage =
- newViolation("Cannot find beans for class ", type.getCanonicalName());
-
- violationMessage.addLine(createQualifierMessage(qualifiers));
-
- throw new ResolutionException(violationMessage.toString());
- }
-
- public static void throwUnsatisfiedResolutionException(String message, Method producerMethod)
- {
- ViolationMessageBuilder violationMessage = newViolation(message);
-
- violationMessage.addLine(createProducerMethodMessage(producerMethod));
-
- throw new UnsatisfiedResolutionException(violationMessage.toString());
- }
public static void throwUnsatisfiedResolutionException(Type type, Method producerMethod, Annotation... qualifiers)
{