[jboss-cvs] JBossAS SVN: r65037 - in projects/microcontainer/trunk: docs/examples/annotations/src/main/org/jboss/example/microcontainer/annotations and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 4 05:56:37 EDT 2007
Author: alesj
Date: 2007-09-04 05:56:37 -0400 (Tue, 04 Sep 2007)
New Revision: 65037
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
projects/microcontainer/trunk/docs/examples/annotations/src/main/org/jboss/example/microcontainer/annotations/AnnotationChecker.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractParameterAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BasicBeanAnnotationAdapter.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/PropertyAware.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java
Log:
Moving from MetaDataRetrieval to plain MetaData.
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java 2007-09-04 08:54:44 UTC (rev 65036)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java 2007-09-04 09:56:37 UTC (rev 65037)
@@ -122,14 +122,13 @@
return false;
}
- MetaDataRetrieval retrieval = null;
if (context != null)
{
//TODO We might need the context injected somehow by the GenericBeanFactory, since that is used for creating the aspect instances...
Kernel kernel = context.getKernel();
KernelMetaDataRepository repository = kernel.getMetaDataRepository();
- retrieval = repository.getMetaDataRetrieval(context);
-
+ MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(context);
+
if (retrieval instanceof MetaDataContext)
{
ScopeKey instanceKey = new ScopeKey(CommonLevels.INSTANCE, (String)context.getName());
Modified: projects/microcontainer/trunk/docs/examples/annotations/src/main/org/jboss/example/microcontainer/annotations/AnnotationChecker.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/annotations/src/main/org/jboss/example/microcontainer/annotations/AnnotationChecker.java 2007-09-04 08:54:44 UTC (rev 65036)
+++ projects/microcontainer/trunk/docs/examples/annotations/src/main/org/jboss/example/microcontainer/annotations/AnnotationChecker.java 2007-09-04 09:56:37 UTC (rev 65037)
@@ -21,6 +21,7 @@
*/
package org.jboss.example.microcontainer.annotations;
+import java.lang.annotation.Annotation;
import java.util.Map;
import java.util.Set;
@@ -28,9 +29,7 @@
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
-import org.jboss.metadata.spi.retrieval.AnnotationItem;
-import org.jboss.metadata.spi.retrieval.AnnotationsItem;
-import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
+import org.jboss.metadata.spi.MetaData;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
@@ -70,21 +69,17 @@
public boolean check(KernelControllerContext context, String annotation)
{
KernelMetaDataRepository repository = kernel.getMetaDataRepository();
- MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(context);
+ MetaData retrieval = repository.getMetaData(context);
if (retrieval != null)
{
- AnnotationsItem annotations = retrieval.retrieveAnnotations();
- if (annotations != null)
+ Annotation[] annotations = retrieval.getAnnotations();
+ if (annotations != null && annotations.length > 0)
{
- AnnotationItem[] annotationItems = annotations.getAnnotations();
- if (annotationItems != null && annotationItems.length > 0)
+ for (Annotation annItem : annotations)
{
- for (AnnotationItem annItem : annotationItems)
+ if (annItem.annotationType().getName().equals(annotation))
{
- if (annItem.getAnnotation().annotationType().getName().equals(annotation))
- {
- return true;
- }
+ return true;
}
}
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractAnnotationPlugin.java 2007-09-04 08:54:44 UTC (rev 65036)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractAnnotationPlugin.java 2007-09-04 09:56:37 UTC (rev 65037)
@@ -34,8 +34,7 @@
import org.jboss.beans.metadata.spi.MetaDataVisitor;
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.metadata.spi.retrieval.AnnotationItem;
-import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.reflect.spi.AnnotatedInfo;
import org.jboss.util.JBossObject;
import org.jboss.util.JBossStringBuilder;
@@ -98,7 +97,7 @@
return false;
}
- protected List<? extends MetaDataVisitorNode> internalApplyAnnotation(T info, MetaDataRetrieval retrieval, C annotation, KernelControllerContext context) throws Throwable
+ protected List<? extends MetaDataVisitorNode> internalApplyAnnotation(T info, MetaData retrieval, C annotation, KernelControllerContext context) throws Throwable
{
return internalApplyAnnotation(info, annotation, context);
}
@@ -114,19 +113,18 @@
return Collections.emptyList();
}
- public final void applyAnnotation(T info, MetaDataRetrieval retrieval, MetaDataVisitor visitor) throws Throwable
+ public final void applyAnnotation(T info, MetaData retrieval, MetaDataVisitor visitor) throws Throwable
{
boolean trace = log.isTraceEnabled();
Class<C> annotationClass = getAnnotation();
- AnnotationItem<C> item = retrieval.retrieveAnnotation(annotationClass);
- if (item == null)
+ C annotation = retrieval.getAnnotation(annotationClass);
+ if (annotation == null)
{
if (trace)
log.trace("No annotation: " + annotationClass.getName());
return;
}
- C annotation = item.getAnnotation();
if (isMetaDataAlreadyPresent(info, annotation, visitor.getControllerContext()))
{
if (trace)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractParameterAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractParameterAnnotationPlugin.java 2007-09-04 08:54:44 UTC (rev 65036)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractParameterAnnotationPlugin.java 2007-09-04 09:56:37 UTC (rev 65037)
@@ -35,8 +35,7 @@
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.kernel.plugins.config.Configurator;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.metadata.spi.retrieval.AnnotationItem;
-import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.signature.MethodParametersSignature;
import org.jboss.metadata.spi.signature.Signature;
import org.jboss.reflect.spi.AnnotatedInfo;
@@ -100,7 +99,7 @@
protected abstract void setParameterizedMetaData(P parameterizedMetaData, BeanMetaData beanMetaData);
@SuppressWarnings("unchecked")
- protected List<? extends MetaDataVisitorNode> internalApplyAnnotation(T info, MetaDataRetrieval retrieval, C annotation, KernelControllerContext context) throws Throwable
+ protected List<? extends MetaDataVisitorNode> internalApplyAnnotation(T info, MetaData retrieval, C annotation, KernelControllerContext context) throws Throwable
{
ParameterInfo[] parameters = getParameters(info);
if (parameters == null || parameters.length == 0)
@@ -121,17 +120,17 @@
Configurator.getParameterTypes(log.isTraceEnabled(), typeInfos),
i
);
- MetaDataRetrieval mdr = retrieval.getComponentMetaDataRetrieval(pis);
+ MetaData mdr = retrieval.getComponentMetaData(pis);
if (mdr != null)
{
ValueMetaData value = null;
for(Annotation2ValueMetaDataAdapter adapter : adapters)
{
// todo - match multiple annotations?
- AnnotationItem item = mdr.retrieveAnnotation(adapter.getAnnotation());
- if (item != null)
+ Annotation adapterAnnotation = mdr.getAnnotation(adapter.getAnnotation());
+ if (adapterAnnotation != null)
{
- value = adapter.createValueMetaData(item.getAnnotation());
+ value = adapter.createValueMetaData(adapterAnnotation);
break;
}
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AnnotationPlugin.java 2007-09-04 08:54:44 UTC (rev 65036)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AnnotationPlugin.java 2007-09-04 09:56:37 UTC (rev 65037)
@@ -26,7 +26,7 @@
import java.util.Set;
import org.jboss.beans.metadata.spi.MetaDataVisitor;
-import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.reflect.spi.AnnotatedInfo;
/**
@@ -40,5 +40,5 @@
Set<ElementType> getSupportedTypes();
- void applyAnnotation(T info, MetaDataRetrieval retrieval, MetaDataVisitor visitor) throws Throwable;
+ void applyAnnotation(T info, MetaData retrieval, MetaDataVisitor visitor) throws Throwable;
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BasicBeanAnnotationAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BasicBeanAnnotationAdapter.java 2007-09-04 08:54:44 UTC (rev 65036)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BasicBeanAnnotationAdapter.java 2007-09-04 09:56:37 UTC (rev 65037)
@@ -36,7 +36,7 @@
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
import org.jboss.logging.Logger;
-import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.signature.ConstructorSignature;
import org.jboss.metadata.spi.signature.FieldSignature;
import org.jboss.metadata.spi.signature.MethodSignature;
@@ -159,7 +159,7 @@
KernelControllerContext context = visitor.getControllerContext();
Kernel kernel = context.getKernel();
KernelMetaDataRepository repository = kernel.getMetaDataRepository();
- MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(context);
+ MetaData retrieval = repository.getMetaData(context);
boolean trace = log.isTraceEnabled();
BeanInfo info = context.getBeanInfo();
@@ -179,7 +179,7 @@
for(ConstructorInfo ci : constructors)
{
Signature cis = new ConstructorSignature(Configurator.getParameterTypes(trace, ci.getParameterTypes()));
- MetaDataRetrieval cmdr = retrieval.getComponentMetaDataRetrieval(cis);
+ MetaData cmdr = retrieval.getComponentMetaData(cis);
if (cmdr != null)
{
for(AnnotationPlugin plugin : constructorAnnotationPlugins)
@@ -204,7 +204,7 @@
{
visitedMethods.add(setter);
Signature sis = new MethodSignature(setter.getName(), Configurator.getParameterTypes(trace, setter.getParameterTypes()));
- MetaDataRetrieval cmdr = retrieval.getComponentMetaDataRetrieval(sis);
+ MetaData cmdr = retrieval.getComponentMetaData(sis);
if (cmdr != null)
{
for(AnnotationPlugin plugin : propertyAnnotationPlugins)
@@ -227,7 +227,7 @@
if (visitedMethods.contains(mi) == false)
{
Signature mis = new MethodSignature(mi.getName(), Configurator.getParameterTypes(trace, mi.getParameterTypes()));
- MetaDataRetrieval cmdr = retrieval.getComponentMetaDataRetrieval(mis);
+ MetaData cmdr = retrieval.getComponentMetaData(mis);
if (cmdr != null)
{
for(AnnotationPlugin plugin : methodAnnotationPlugins)
@@ -250,7 +250,7 @@
if (smi.isStatic() && smi.isPublic())
{
Signature mis = new MethodSignature(smi.getName(), Configurator.getParameterTypes(trace, smi.getParameterTypes()));
- MetaDataRetrieval cmdr = retrieval.getComponentMetaDataRetrieval(mis);
+ MetaData cmdr = retrieval.getComponentMetaData(mis);
if (cmdr != null)
{
for(AnnotationPlugin plugin : methodAnnotationPlugins)
@@ -271,7 +271,7 @@
for(FieldInfo fi : fields)
{
Signature fis = new FieldSignature(fi.getName());
- MetaDataRetrieval cmdr = retrieval.getComponentMetaDataRetrieval(fis);
+ MetaData cmdr = retrieval.getComponentMetaData(fis);
if (cmdr != null)
{
for(AnnotationPlugin plugin : fieldAnnotationPlugins)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/PropertyAware.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/PropertyAware.java 2007-09-04 08:54:44 UTC (rev 65036)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/PropertyAware.java 2007-09-04 09:56:37 UTC (rev 65037)
@@ -23,7 +23,7 @@
import org.jboss.beans.info.spi.PropertyInfo;
import org.jboss.beans.metadata.spi.MetaDataVisitor;
-import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
+import org.jboss.metadata.spi.MetaData;
/**
* Marker interface.
@@ -32,5 +32,5 @@
*/
public interface PropertyAware
{
- void applyAnnotation(PropertyInfo info, MetaDataRetrieval retrieval, MetaDataVisitor visitor) throws Throwable;
+ void applyAnnotation(PropertyInfo info, MetaData retrieval, MetaDataVisitor visitor) throws Throwable;
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java 2007-09-04 08:54:44 UTC (rev 65036)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java 2007-09-04 09:56:37 UTC (rev 65037)
@@ -34,10 +34,9 @@
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.MutableMetaData;
import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
-import org.jboss.metadata.spi.retrieval.AnnotationItem;
-import org.jboss.metadata.spi.retrieval.AnnotationsItem;
import org.jboss.metadata.spi.retrieval.MetaDataItem;
import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
import org.jboss.metadata.spi.scope.Scope;
@@ -83,31 +82,26 @@
KernelController controller,
KernelMetaDataRepository repository) throws Throwable
{
- MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(context);
+ MetaData retrieval = repository.getMetaData(context);
if (retrieval != null)
{
- AnnotationsItem annotations = retrieval.retrieveAnnotations();
- if (annotations != null)
+ Annotation[] annotations = retrieval.getAnnotations();
+ if (annotations != null && annotations.length > 0)
{
- AnnotationItem[] annotationItems = annotations.getAnnotations();
- if (annotationItems != null && annotationItems.length > 0)
+ Collection<Scope> scopes = new HashSet<Scope>();
+ for (Annotation annotation : annotations)
{
- Collection<Scope> scopes = new HashSet<Scope>();
- for (AnnotationItem annItem : annotationItems)
+ if (annotation.annotationType().isAnnotationPresent(ScopeFactoryLookup.class))
{
- Annotation annotation = annItem.getAnnotation();
- if (annotation.annotationType().isAnnotationPresent(ScopeFactoryLookup.class))
- {
- ScopeFactoryLookup sfl = annotation.annotationType().getAnnotation(ScopeFactoryLookup.class);
- Scope scope = sfl.value().newInstance().create(annotation);
- scopes.add(scope);
- }
+ ScopeFactoryLookup sfl = annotation.annotationType().getAnnotation(ScopeFactoryLookup.class);
+ Scope scope = sfl.value().newInstance().create(annotation);
+ scopes.add(scope);
}
- if (scopes.size() > 0)
- {
- return new ScopeKey(scopes);
- }
}
+ if (scopes.size() > 0)
+ {
+ return new ScopeKey(scopes);
+ }
}
}
return null;
More information about the jboss-cvs-commits
mailing list