[jboss-cvs] JBossAS SVN: r102932 - projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 24 20:23:26 EDT 2010
Author: alesj
Date: 2010-03-24 20:23:25 -0400 (Wed, 24 Mar 2010)
New Revision: 102932
Modified:
projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java
Log:
Map to path, instead of URL.
Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java 2010-03-25 00:12:08 UTC (rev 102931)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java 2010-03-25 00:23:25 UTC (rev 102932)
@@ -54,13 +54,13 @@
public class ScannerImpl extends WeakClassLoaderHolder implements Scanner, ScanningHandle<ScannerImpl>
{
/** The packages cache */
- private Map<URL, Set<Package>> packages = new HashMap<URL, Set<Package>>();
+ private Map<String, Set<Package>> packages = new HashMap<String, Set<Package>>();
/** The packages cache */
- private Map<URL, Set<String>> pckgCache = new HashMap<URL, Set<String>>();
+ private Map<String, Set<String>> pckgCache = new HashMap<String, Set<String>>();
/** The classes cache */
- private Map<URL, Map<Class<? extends Annotation>, Set<String>>> classes = new HashMap<URL, Map<Class<? extends Annotation>, Set<String>>>();
+ private Map<String, Map<Class<? extends Annotation>, Set<String>>> classes = new HashMap<String, Map<Class<? extends Annotation>, Set<String>>>();
/** The files cache */
- private Map<URL, Map<String, Set<NamedInputStream>>> files = new HashMap<URL, Map<String, Set<NamedInputStream>>>();
+ private Map<String, Map<String, Set<NamedInputStream>>> files = new HashMap<String, Map<String, Set<NamedInputStream>>>();
/** The deployment unit */
private DeploymentUnit unit;
@@ -114,7 +114,8 @@
void addPackage(URL url, String pckg)
{
- Set<String> cache = pckgCache.get(url);
+ String path = url.getPath();
+ Set<String> cache = pckgCache.get(path);
if (cache != null)
{
if (cache.contains(pckg))
@@ -123,27 +124,28 @@
else
{
cache = new HashSet<String>();
- pckgCache.put(url, cache);
+ pckgCache.put(path, cache);
}
cache.add(pckg); // cache result
- Set<Package> pckgs = packages.get(url);
+ Set<Package> pckgs = packages.get(path);
if (pckgs == null)
{
pckgs = new HashSet<Package>();
- packages.put(url, pckgs);
+ packages.put(path, pckgs);
}
pckgs.add(loadPackage(pckg));
}
void addClass(URL url, Class<? extends Annotation> annotation, String clazz)
{
- Map<Class<? extends Annotation>, Set<String>> map = classes.get(url);
+ String path = url.getPath();
+ Map<Class<? extends Annotation>, Set<String>> map = classes.get(path);
if (map == null)
{
map = new HashMap<Class<? extends Annotation>, Set<String>>();
- classes.put(url, map);
+ classes.put(path, map);
}
Set<String> cls = map.get(annotation);
if (cls == null)
@@ -156,11 +158,12 @@
void addFile(URL url, String pattern, NamedInputStream nis)
{
- Map<String, Set<NamedInputStream>> map = files.get(url);
+ String path = url.getPath();
+ Map<String, Set<NamedInputStream>> map = files.get(path);
if (map == null)
{
map = new HashMap<String, Set<NamedInputStream>>();
- files.put(url, map);
+ files.put(path, map);
}
Set<NamedInputStream> nims = map.get(pattern);
if (nims == null)
@@ -178,18 +181,18 @@
files.putAll(subHandle.getFiles());
}
- public Set<Package> getPackagesInJar(URL jartoScan, Set<Class<? extends Annotation>> annotationsToLookFor)
+ public Set<Package> getPackagesInJar(URL jarToScan, Set<Class<? extends Annotation>> annotationsToLookFor)
{
- if (jartoScan == null)
+ if (jarToScan == null)
throw new IllegalArgumentException("Null jar to scan url");
if (annotationsToLookFor == null)
throw new IllegalArgumentException("Null annotations to look for");
-
if (annotationsToLookFor.size() > 0)
throw new AssertionFailure("Improper use of NativeScanner: must not filter packages");
- Set<Package> p = packages.get(jartoScan);
+ String path = jarToScan.getPath();
+ Set<Package> p = packages.get(path);
if (p == null && allowQueryInvocationSearch)
{
Module module = AttachmentLocator.searchAncestors(unit, Module.class);
@@ -198,7 +201,7 @@
p = new HashSet<Package>();
- VirtualFile root = getFile(jartoScan);
+ VirtualFile root = getFile(jarToScan);
Set<String> pckgs = PackageVisitor.determineAllPackages(
new VirtualFile[]{root},
null,
@@ -206,18 +209,18 @@
module.getIncluded(),
module.getExcluded(),
module.getExcludedExport());
- for (String path : pckgs)
+ for (String pckg : pckgs)
{
- Package pck = loadPackage(path);
+ Package pck = loadPackage(pckg);
p.add(pck);
}
if (cacheNewResults)
- packages.put(jartoScan, p);
+ packages.put(path, p);
}
// remove cached string packages
- pckgCache.remove(jartoScan);
+ pckgCache.remove(path);
return p != null ? Collections.unmodifiableSet(p) : Collections.<Package>emptySet();
}
@@ -242,7 +245,7 @@
else
{
Set<Class<? extends Annotation>> missingCacheAnnotations = new HashSet<Class<? extends Annotation>>();
- Map<Class<? extends Annotation>, Set<String>> map = classes.get(jartoScan);
+ Map<Class<? extends Annotation>, Set<String>> map = classes.get(jartoScan.getPath());
if (map != null)
{
for (Class<? extends Annotation> annClass : annotationsToLookFor)
@@ -286,7 +289,7 @@
if (map != null)
map.putAll(temp);
else
- classes.put(jartoScan, temp);
+ classes.put(jartoScan.getPath(), temp);
}
for (Set<String> vals : temp.values())
strings.addAll(vals);
@@ -307,7 +310,8 @@
throw new IllegalArgumentException("Null file patterns to look for");
Set<NamedInputStream> result = new HashSet<NamedInputStream>();
- Map<String, Set<NamedInputStream>> map = files.get(jartoScan);
+ String path = jartoScan.getPath();
+ Map<String, Set<NamedInputStream>> map = files.get(path);
if (map != null)
{
findFiles(jartoScan, filePatterns, map, result);
@@ -317,7 +321,7 @@
map = new HashMap<String, Set<NamedInputStream>>();
findFiles(jartoScan, filePatterns, map, result);
if (cacheNewResults)
- files.put(jartoScan, map);
+ files.put(path, map);
}
return result;
}
@@ -412,17 +416,17 @@
this.cacheNewResults = cacheNewResults;
}
- Map<URL, Set<Package>> getPackages()
+ Map<String, Set<Package>> getPackages()
{
return packages;
}
- Map<URL, Map<Class<? extends Annotation>, Set<String>>> getClasses()
+ Map<String, Map<Class<? extends Annotation>, Set<String>>> getClasses()
{
return classes;
}
- Map<URL, Map<String, Set<NamedInputStream>>> getFiles()
+ Map<String, Map<String, Set<NamedInputStream>>> getFiles()
{
return files;
}
More information about the jboss-cvs-commits
mailing list