Author: struberg
Date: Fri Jun 16 18:05:13 2017
New Revision: 1798971
URL: http://svn.apache.org/viewvc?rev=1798971&view=rev
Log:
OWB-1189 fix ProcessSyntheticAnnoatedTypeImpl
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticAnnotatedType.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java?rev=1798971&r1=1798970&r2=1798971&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java
Fri Jun 16 18:05:13 2017
@@ -21,23 +21,19 @@ package org.apache.webbeans.portable.eve
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessSyntheticAnnotatedType;
-import javax.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
+import org.apache.webbeans.config.WebBeansContext;
+
/**
* Default implementation of the {@link
javax.enterprise.inject.spi.ProcessSyntheticAnnotatedType}.
*
* @param <X> bean class info
*/
-public class ProcessSyntheticAnnotatedTypeImpl<X> extends EventBase implements
ProcessSyntheticAnnotatedType<X>
+public class ProcessSyntheticAnnotatedTypeImpl<X> extends
ProcessAnnotatedTypeImpl<X> implements ProcessSyntheticAnnotatedType<X>
{
private Extension source;
- /**Annotated Type*/
- private AnnotatedType<X> annotatedType = null;
-
- /**veto or not*/
- private boolean veto = false;
/**
* This field gets set to <code>true</code> when a custom AnnotatedType
@@ -47,9 +43,10 @@ public class ProcessSyntheticAnnotatedTy
private boolean modifiedAnnotatedType = false;
- public ProcessSyntheticAnnotatedTypeImpl(AnnotatedType<X> annotatedType,
Extension source)
+ public ProcessSyntheticAnnotatedTypeImpl(WebBeansContext webBeansContext,
AnnotatedType<X> annotatedType, Extension source)
{
- this.annotatedType = annotatedType;
+ super(webBeansContext, annotatedType);
+
this.source = source;
}
@@ -61,27 +58,6 @@ public class ProcessSyntheticAnnotatedTy
}
/**
- * {@inheritDoc}
- */
- @Override
- public AnnotatedType<X> getAnnotatedType()
- {
- checkState();
- return annotatedType;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setAnnotatedType(AnnotatedType<X> type)
- {
- checkState();
- annotatedType = type;
- modifiedAnnotatedType = true;
- }
-
- /**
* Returns sets or not.
*
* @return set or not
@@ -91,31 +67,4 @@ public class ProcessSyntheticAnnotatedTy
return modifiedAnnotatedType;
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void veto()
- {
- checkState();
- veto = true;
- }
-
- //X TODO OWB-1182 CDI 2.0
- @Override
- public AnnotatedTypeConfigurator<X> configureAnnotatedType()
- {
- throw new UnsupportedOperationException("CDI 2.0 not yet imlemented");
- }
-
- /**
- * Returns veto status.
- *
- * @return veto status
- */
- public boolean isVeto()
- {
- return veto;
- }
-
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticAnnotatedType.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticAnnotatedType.java?rev=1798971&r1=1798970&r2=1798971&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticAnnotatedType.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticAnnotatedType.java
Fri Jun 16 18:05:13 2017
@@ -20,14 +20,16 @@ package org.apache.webbeans.portable.eve
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Extension;
+
+import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.events.ProcessSyntheticAnnotatedTypeImpl;
public class GProcessSyntheticAnnotatedType extends
ProcessSyntheticAnnotatedTypeImpl implements GenericBeanEvent
{
- public GProcessSyntheticAnnotatedType(Extension source, AnnotatedType
annotatedType)
+ public GProcessSyntheticAnnotatedType(WebBeansContext webBeansContext,
Extension source, AnnotatedType annotatedType)
{
- super(annotatedType, source);
+ super(webBeansContext, annotatedType, source);
}
@Override
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1798971&r1=1798970&r2=1798971&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Fri Jun 16 18:05:13 2017
@@ -999,7 +999,7 @@ public final class WebBeansUtil
public <T> GProcessSyntheticAnnotatedType
fireProcessSyntheticAnnotatedTypeEvent(AnnotatedType<T> annotatedType)
{
Extension source =
AnnotatedTypeWrapper.class.isInstance(annotatedType) ?
AnnotatedTypeWrapper.class.cast(annotatedType).getSource() : null;
- GProcessSyntheticAnnotatedType gProcessSyntheticAnnotatedType = new
GProcessSyntheticAnnotatedType(source, annotatedType);
+ GProcessSyntheticAnnotatedType gProcessSyntheticAnnotatedType = new
GProcessSyntheticAnnotatedType(webBeansContext, source, annotatedType);
//Fires ProcessSyntheticAnnotatedType
webBeansContext.getBeanManagerImpl().fireEvent(gProcessSyntheticAnnotatedType,
true, AnnotationUtil.EMPTY_ANNOTATION_ARRAY);
