commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r1743444 - in /commons/proper/weaver/trunk/processor/src: main/java/org/apache/commons/weaver/Finder.java main/java/org/apache/commons/weaver/model/ScanRequest.java test/java/org/apache/commons/weaver/FinderTest.java
Date Wed, 11 May 2016 22:18:52 GMT
Author: mbenson
Date: Wed May 11 22:18:52 2016
New Revision: 1743444

URL: http://svn.apache.org/viewvc?rev=1743444&view=rev
Log:
[WEAVER-12] Provide a mechanism for working with all classfiles found in the weave environment

Modified:
    commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/Finder.java
    commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/ScanRequest.java
    commons/proper/weaver/trunk/processor/src/test/java/org/apache/commons/weaver/FinderTest.java

Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/Finder.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/Finder.java?rev=1743444&r1=1743443&r2=1743444&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/Finder.java
(original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/Finder.java
Wed May 11 22:18:52 2016
@@ -28,11 +28,14 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.IdentityHashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
@@ -390,23 +393,40 @@ class Finder extends AnnotationFinder im
             return result;
         }
 
+        /**
+         * Get the list of objects representing all scanned classes.
+         * @since 1.3
+         * @return {@link List} of {@link Annotated}{@code <Class<?>>}
+         */
+        public List<Annotated<Class<?>>> getAllClasses() {
+            return annotate(originalInfos.values());
+        }
+
         public List<Annotated<Class<?>>> findAnnotatedClasses(final Class<?
extends Annotation> annotation) {
             Finder.this.findAnnotatedClasses(annotation);
+
+            final List<Annotated<Class<?>>> annotatedClasses = annotate(getAnnotationInfos(annotation.getName()));
+            CollectionUtils.filter(annotatedClasses, new Predicate<Annotated<Class<?>>>()
{
+
+                @Override
+                public boolean evaluate(Annotated<Class<?>> annotatedClass) {
+                    return annotatedClass.isAnnotationPresent(annotation);
+                }
+            });
+            return annotatedClasses;
+        }
+
+        private List<Annotated<Class<?>>> annotate(Collection<? extends
Info> infos) {
             final List<Annotated<Class<?>>> result = new ArrayList<Annotated<Class<?>>>();
-            for (final Info info : getAnnotationInfos(annotation.getName())) {
+            for (final Info info : infos) {
                 if (info instanceof ClassInfo) {
                     final ClassInfo classInfo = (ClassInfo) info;
 
-                    IncludesClassfile<Class<?>> annotated;
                     try {
-                        annotated =
-                            new IncludesClassfile<Class<?>>(classInfo.get(),
classfileAnnotationsFor(classInfo));
+                        result.add(new IncludesClassfile<Class<?>>(classInfo.get(),
classfileAnnotationsFor(classInfo)));
                     } catch (final ClassNotFoundException e) {
                         continue;
                     }
-                    if (annotated.isAnnotationPresent(annotation)) {
-                        result.add(annotated);
-                    }
                 }
             }
             return result;
@@ -660,57 +680,63 @@ class Finder extends AnnotationFinder im
     public ScanResult scan(final ScanRequest request) {
         final ScanResult result = new ScanResult();
 
-        for (final WeaveInterest interest : request.getInterests()) {
-            switch (interest.target) {
-            case PACKAGE:
-                for (final Annotated<Package> pkg : this.withAnnotations().findAnnotatedPackages(
-                    interest.annotationType)) {
-                    result.getWeavable(pkg.get()).addAnnotations(pkg.getAnnotations());
-                }
-                break;
-            case TYPE:
-                for (final Annotated<Class<?>> type : this.withAnnotations().findAnnotatedClasses(
-                    interest.annotationType)) {
-                    result.getWeavable(type.get()).addAnnotations(type.getAnnotations());
+        if (!request.isConstrained() || request.getSupertypes().contains(Object.class)) {
+            for (final Annotated<Class<?>> type : this.withAnnotations().getAllClasses())
{
+                result.getWeavable(type.get()).addAnnotations(type.getAnnotations());
+            }
+        } else {
+            for (final WeaveInterest interest : request.getInterests()) {
+                switch (interest.target) {
+                case PACKAGE:
+                    for (final Annotated<Package> pkg : this.withAnnotations().findAnnotatedPackages(
+                        interest.annotationType)) {
+                        result.getWeavable(pkg.get()).addAnnotations(pkg.getAnnotations());
+                    }
+                    break;
+                case TYPE:
+                    for (final Annotated<Class<?>> type : this.withAnnotations().findAnnotatedClasses(
+                        interest.annotationType)) {
+                        result.getWeavable(type.get()).addAnnotations(type.getAnnotations());
+                    }
+                    break;
+                case METHOD:
+                    for (final Annotated<Method> method : this.withAnnotations().findAnnotatedMethods(
+                        interest.annotationType)) {
+                        result.getWeavable(method.get()).addAnnotations(method.getAnnotations());
+                    }
+                    break;
+                case CONSTRUCTOR:
+                    for (final Annotated<Constructor<?>> ctor : this.withAnnotations().findAnnotatedConstructors(
+                        interest.annotationType)) {
+                        result.getWeavable(ctor.get()).addAnnotations(ctor.getAnnotations());
+                    }
+                    break;
+                case FIELD:
+                    for (final Annotated<Field> fld : this.withAnnotations().findAnnotatedFields(interest.annotationType))
{
+                        result.getWeavable(fld.get()).addAnnotations(fld.getAnnotations());
+                    }
+                    break;
+                case PARAMETER:
+                    for (final Annotated<Parameter<Method>> parameter : this.withAnnotations()
+                        .findAnnotatedMethodParameters(interest.annotationType)) {
+                        result.getWeavable(parameter.get().getDeclaringExecutable())
+                            .getWeavableParameter(parameter.get().getIndex()).addAnnotations(parameter.getAnnotations());
+                    }
+                    for (final Annotated<Parameter<Constructor<?>>> parameter
: this.withAnnotations()
+                        .findAnnotatedConstructorParameters(interest.annotationType)) {
+                        result.getWeavable(parameter.get().getDeclaringExecutable())
+                            .getWeavableParameter(parameter.get().getIndex()).addAnnotations(parameter.getAnnotations());
+                    }
+                    break;
+                default:
+                    // should we log something?
+                    break;
                 }
-                break;
-            case METHOD:
-                for (final Annotated<Method> method : this.withAnnotations().findAnnotatedMethods(
-                    interest.annotationType)) {
-                    result.getWeavable(method.get()).addAnnotations(method.getAnnotations());
-                }
-                break;
-            case CONSTRUCTOR:
-                for (final Annotated<Constructor<?>> ctor : this.withAnnotations().findAnnotatedConstructors(
-                    interest.annotationType)) {
-                    result.getWeavable(ctor.get()).addAnnotations(ctor.getAnnotations());
-                }
-                break;
-            case FIELD:
-                for (final Annotated<Field> fld : this.withAnnotations().findAnnotatedFields(interest.annotationType))
{
-                    result.getWeavable(fld.get()).addAnnotations(fld.getAnnotations());
-                }
-                break;
-            case PARAMETER:
-                for (final Annotated<Parameter<Method>> parameter : this.withAnnotations()
-                    .findAnnotatedMethodParameters(interest.annotationType)) {
-                    result.getWeavable(parameter.get().getDeclaringExecutable())
-                        .getWeavableParameter(parameter.get().getIndex()).addAnnotations(parameter.getAnnotations());
-                }
-                for (final Annotated<Parameter<Constructor<?>>> parameter
: this.withAnnotations()
-                    .findAnnotatedConstructorParameters(interest.annotationType)) {
-                    result.getWeavable(parameter.get().getDeclaringExecutable())
-                        .getWeavableParameter(parameter.get().getIndex()).addAnnotations(parameter.getAnnotations());
-                }
-                break;
-            default:
-                // should we log something?
-                break;
             }
-        }
-        for (final Class<?> supertype : request.getSupertypes()) {
-            for (final Annotated<Class<?>> type : this.withAnnotations().findAssignableTypes(supertype))
{
-                result.getWeavable(type.get()).addAnnotations(type.getAnnotations());
+            for (final Class<?> supertype : request.getSupertypes()) {
+                for (final Annotated<Class<?>> type : this.withAnnotations().findAssignableTypes(supertype))
{
+                    result.getWeavable(type.get()).addAnnotations(type.getAnnotations());
+                }
             }
         }
         return inflater.inflate(result);

Modified: commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/ScanRequest.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/ScanRequest.java?rev=1743444&r1=1743443&r2=1743444&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/ScanRequest.java
(original)
+++ commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/ScanRequest.java
Wed May 11 22:18:52 2016
@@ -77,4 +77,13 @@ public class ScanRequest {
         return Collections.unmodifiableSet(supertypes);
     }
 
+    /**
+     * Learn whether this {@link ScanRequest} has been constrained. An unconstrained {@link
ScanRequest} will return all
+     * known types.
+     * @return {@code boolean}
+     * @since 1.3
+     */
+    public boolean isConstrained() {
+        return !interests.isEmpty() || !supertypes.isEmpty();
+    }
 }

Modified: commons/proper/weaver/trunk/processor/src/test/java/org/apache/commons/weaver/FinderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/test/java/org/apache/commons/weaver/FinderTest.java?rev=1743444&r1=1743443&r2=1743444&view=diff
==============================================================================
--- commons/proper/weaver/trunk/processor/src/test/java/org/apache/commons/weaver/FinderTest.java
(original)
+++ commons/proper/weaver/trunk/processor/src/test/java/org/apache/commons/weaver/FinderTest.java
Wed May 11 22:18:52 2016
@@ -26,17 +26,22 @@ import static org.junit.Assert.assertArr
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.net.URLClassLoader;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.lang3.Validate;
 import org.apache.commons.weaver.test.WeaverTestBase;
 import org.apache.commons.weaver.test.beans.AbstractTestBean;
 import org.apache.commons.weaver.test.beans.ComplexAnnotations;
@@ -49,6 +54,7 @@ import org.apache.commons.weaver.test.be
 import org.apache.commons.weaver.utils.URLArray;
 import org.apache.xbean.finder.Annotated;
 import org.apache.xbean.finder.archive.FileArchive;
+import org.hamcrest.Matchers;
 import org.junit.Test;
 
 public class FinderTest extends WeaverTestBase {
@@ -282,4 +288,28 @@ public class FinderTest extends WeaverTe
         assertTrue(subclasses.contains(TestBeanWithClassAnnotation.class));
         assertTrue(subclasses.contains(TestBeanWithMethodAnnotation.class));
     }
+
+    @Test
+    public void testFindAllTypes() throws IOException {
+        addClassForScanning(TestBeanInterface.class);
+        addClassForScanning(AbstractTestBean.class);
+        addClassForScanning(TestBeanWithClassAnnotation.class);
+        addClassForScanning(TestBeanWithMethodAnnotation.class);
+
+        List<Annotated<Class<?>>> allClasses = finder().withAnnotations().getAllClasses();
+        assertThat(extract(allClasses), Matchers.<Class<?>> containsInAnyOrder(TestBeanInterface.class,
+            AbstractTestBean.class, TestBeanWithClassAnnotation.class, TestBeanWithMethodAnnotation.class));
+    }
+
+    private List<Class<?>> extract(List<Annotated<Class<?>>>
input) {
+        Validate.noNullElements(input);
+        if (input.isEmpty()) {
+            return Collections.emptyList();
+        }
+        final List<Class<?>> result = new ArrayList<Class<?>>(input.size());
+        for (Annotated<Class<?>> c : input) {
+            result.add(c.get());
+        }
+        return result;
+    }
 }



Mime
View raw message