Skip to content

Commit

Permalink
Renamed Scan.getClasses to Scan.getAll.
Browse files Browse the repository at this point in the history
  • Loading branch information
nmihajlovski committed Feb 17, 2016
1 parent c8dd47a commit 12f6c24
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
Expand Up @@ -45,13 +45,13 @@ public AppClasspathEntitiesPlugin() {
@Override @Override
public synchronized <E> Class<E> getEntityType(String simpleTypeName) { public synchronized <E> Class<E> getEntityType(String simpleTypeName) {


for (Class<?> type : Scan.annotated(DbEntity.class).getClasses()) { for (Class<?> type : Scan.annotated(DbEntity.class).getAll()) {
if (type.getSimpleName().equalsIgnoreCase(simpleTypeName)) { if (type.getSimpleName().equalsIgnoreCase(simpleTypeName)) {
return (Class<E>) type; return (Class<E>) type;
} }
} }


for (Class<?> type : Scan.annotated(Scaffold.class).getClasses()) { for (Class<?> type : Scan.annotated(Scaffold.class).getAll()) {
if (type.getSimpleName().equalsIgnoreCase(simpleTypeName)) { if (type.getSimpleName().equalsIgnoreCase(simpleTypeName)) {
return (Class<E>) type; return (Class<E>) type;
} }
Expand Down
2 changes: 1 addition & 1 deletion rapidoid-commons/src/main/java/org/rapidoid/scan/Scan.java
Expand Up @@ -50,7 +50,7 @@ public static ScanParams classLoader(ClassLoader classLoader) {
return new ScanParams().classLoader(classLoader); return new ScanParams().classLoader(classLoader);
} }


public static synchronized List<Class<?>> getClasses() { public static synchronized List<Class<?>> getAll() {
return ClasspathUtil.getClasses(new ScanParams()); return ClasspathUtil.getClasses(new ScanParams());
} }


Expand Down
Expand Up @@ -85,7 +85,7 @@ public synchronized ClassLoader classLoader() {
return this.classLoader; return this.classLoader;
} }


public synchronized List<Class<?>> getClasses() { public synchronized List<Class<?>> getAll() {
return ClasspathUtil.getClasses(this); return ClasspathUtil.getClasses(this);
} }


Expand Down
Expand Up @@ -44,27 +44,27 @@ public class ClasspathScanTest extends AbstractCommonsTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Test @Test
public void testClasspathScanByName() { public void testClasspathScanByName() {
List<Class<?>> classes = Scan.matching(".*ScanTest").getClasses(); List<Class<?>> classes = Scan.matching(".*ScanTest").getAll();


eq(U.set(classes), U.set(ClasspathScanTest.class)); eq(U.set(classes), U.set(ClasspathScanTest.class));


classes = Scan.in("custom").matching(".*Bar").getClasses(); classes = Scan.in("custom").matching(".*Bar").getAll();


eq(U.set(classes), U.set(Bar.class)); eq(U.set(classes), U.set(Bar.class));
} }


@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Test @Test
public void testClasspathScanByAnnotation() { public void testClasspathScanByAnnotation() {
List<Class<?>> classes = Scan.annotated(MyAnnot.class).getClasses(); List<Class<?>> classes = Scan.annotated(MyAnnot.class).getAll();


eq(U.set(classes), U.set(Foo.class, Bar.class)); eq(U.set(classes), U.set(Foo.class, Bar.class));
} }


@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Test @Test
public void testScanAll() { public void testScanAll() {
List<Class<?>> classes = Scan.getClasses(); List<Class<?>> classes = Scan.getAll();


Set<Class<? extends Object>> expectedSubset = U.set(Foo.class, Bar.class, MyAnnot.class, Set<Class<? extends Object>> expectedSubset = U.set(Foo.class, Bar.class, MyAnnot.class,
ClasspathScanTest.class, Aaa.class, Cls.getClassIfExists("Bbb"), Ccccc.class); ClasspathScanTest.class, Aaa.class, Cls.getClassIfExists("Bbb"), Ccccc.class);
Expand Down
Expand Up @@ -58,7 +58,7 @@ private static synchronized org.hibernate.ejb.HibernateEntityManagerFactory emFa


org.hibernate.cfg.AnnotationConfiguration cfg = new org.hibernate.cfg.AnnotationConfiguration(); org.hibernate.cfg.AnnotationConfiguration cfg = new org.hibernate.cfg.AnnotationConfiguration();


List<Class<?>> entityTypes = Scan.annotated(Entity.class).getClasses(); List<Class<?>> entityTypes = Scan.annotated(Entity.class).getAll();
for (Class<?> entityType : entityTypes) { for (Class<?> entityType : entityTypes) {
cfg.addAnnotatedClass(entityType); cfg.addAnnotatedClass(entityType);
} }
Expand Down
Expand Up @@ -59,7 +59,7 @@ public synchronized OnAnnotated in(String... packages) {


@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public synchronized List<Class<?>> getAll() { public synchronized List<Class<?>> getAll() {
return Scan.annotated(annotated).in(path).getClasses(); return Scan.annotated(annotated).in(path).getAll();
} }


} }

0 comments on commit 12f6c24

Please sign in to comment.