Author: hadrian
Date: Wed Nov 11 00:19:53 2009
New Revision: 834723

URL: http://svn.apache.org/viewvc?rev=834723&view=rev
Log:
Long running effort to remove warnings

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/DefaultPackageScanClassResolverTest.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/PatternBasedPackageScanFilterTest.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/ScanTestSupport.java
    
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
    
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/AnnotationModelLoader.java
    
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/util/AnnotationModuleLoaderTest.java
    
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoader.java
    
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java
    
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java
    
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/RouteBuilderFinder.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
 Wed Nov 11 00:19:53 2009
@@ -85,7 +85,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    public Set<Class> findAnnotated(Class<? extends Annotation> annotation, 
String... packageNames) {
+    public Set<Class<?>> findAnnotated(Class<? extends Annotation> annotation, 
String... packageNames) {
         if (packageNames == null) {
             return Collections.EMPTY_SET;
         }
@@ -95,7 +95,7 @@
         }
 
         PackageScanFilter test = getCompositeFilter(new 
AnnotatedWithPackageScanFilter(annotation, true));
-        Set<Class> classes = new LinkedHashSet<Class>();
+        Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
         for (String pkg : packageNames) {
             find(test, pkg, classes);
         }
@@ -108,7 +108,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    public Set<Class> findAnnotated(Set<Class<? extends Annotation>> 
annotations, String... packageNames) {
+    public Set<Class<?>> findAnnotated(Set<Class<? extends Annotation>> 
annotations, String... packageNames) {
         if (packageNames == null) {
             return Collections.EMPTY_SET;
         }
@@ -118,7 +118,7 @@
         }
 
         PackageScanFilter test = getCompositeFilter(new 
AnnotatedWithAnyPackageScanFilter(annotations, true));
-        Set<Class> classes = new LinkedHashSet<Class>();
+        Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
         for (String pkg : packageNames) {
             find(test, pkg, classes);
         }
@@ -131,7 +131,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    public Set<Class> findImplementations(Class parent, String... 
packageNames) {
+    public Set<Class<?>> findImplementations(Class parent, String... 
packageNames) {
         if (packageNames == null) {
             return Collections.EMPTY_SET;
         }
@@ -141,7 +141,7 @@
         }
 
         PackageScanFilter test = getCompositeFilter(new 
AssignableToPackageScanFilter(parent));
-        Set<Class> classes = new LinkedHashSet<Class>();
+        Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
         for (String pkg : packageNames) {
             find(test, pkg, classes);
         }
@@ -154,12 +154,12 @@
     }
 
     @SuppressWarnings("unchecked")
-    public Set<Class> findByFilter(PackageScanFilter filter, String... 
packageNames) {
+    public Set<Class<?>> findByFilter(PackageScanFilter filter, String... 
packageNames) {
         if (packageNames == null) {
             return Collections.EMPTY_SET;
         }
 
-        Set<Class> classes = new LinkedHashSet<Class>();
+        Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
         for (String pkg : packageNames) {
             find(filter, pkg, classes);
         }
@@ -171,7 +171,7 @@
         return classes;
     }
 
-    protected void find(PackageScanFilter test, String packageName, Set<Class> 
classes) {
+    protected void find(PackageScanFilter test, String packageName, 
Set<Class<?>> classes) {
         packageName = packageName.replace('.', '/');
 
         Set<ClassLoader> set = getClassLoaders();
@@ -181,7 +181,7 @@
         }
     }
 
-    protected void find(PackageScanFilter test, String packageName, 
ClassLoader loader, Set<Class> classes) {
+    protected void find(PackageScanFilter test, String packageName, 
ClassLoader loader, Set<Class<?>> classes) {
         if (log.isTraceEnabled()) {
             log.trace("Searching for: " + test + " in package: " + packageName 
+ " using classloader: "
                     + loader.getClass().getName());
@@ -329,7 +329,7 @@
      *                 <i>parent</i> would be <i>org/apache</i>
      * @param location a File object representing a directory
      */
-    private void loadImplementationsInDirectory(PackageScanFilter test, String 
parent, File location, Set<Class> classes) {
+    private void loadImplementationsInDirectory(PackageScanFilter test, String 
parent, File location, Set<Class<?>> classes) {
         File[] files = location.listFiles();
         StringBuilder builder = null;
 
@@ -361,7 +361,7 @@
      * @param stream  the inputstream of the jar file to be examined for 
classes
      * @param urlPath the url of the jar file to be examined for classes
      */
-    private void loadImplementationsInJar(PackageScanFilter test, String 
parent, InputStream stream, String urlPath, Set<Class> classes) {
+    private void loadImplementationsInJar(PackageScanFilter test, String 
parent, InputStream stream, String urlPath, Set<Class<?>> classes) {
         JarInputStream jarStream = null;
         try {
             jarStream = new JarInputStream(stream);
@@ -392,7 +392,7 @@
      * @param test the test used to determine if the class matches
      * @param fqn  the fully qualified name of a class
      */    
-    protected void addIfMatching(PackageScanFilter test, String fqn, 
Set<Class> classes) {
+    protected void addIfMatching(PackageScanFilter test, String fqn, 
Set<Class<?>> classes) {
         try {
             String externalName = fqn.substring(0, 
fqn.indexOf('.')).replace('/', '.');
             Set<ClassLoader> set = getClassLoaders();

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
 Wed Nov 11 00:19:53 2009
@@ -59,7 +59,7 @@
     @SuppressWarnings("unchecked")
     public void load(TypeConverterRegistry registry) throws Exception {
         String[] packageNames = findPackageNames();
-        Set<Class> classes = resolver.findAnnotated(Converter.class, 
packageNames);
+        Set<Class<?>> classes = resolver.findAnnotated(Converter.class, 
packageNames);
         for (Class type : classes) {
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Loading converter class: " + 
ObjectHelper.name(type));

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java
 Wed Nov 11 00:19:53 2009
@@ -53,7 +53,7 @@
      * @param packageNames one or more package names to scan (including 
subpackages) for classes
      * @return the classes found, returns an empty set if none found
      */
-    Set<Class> findAnnotated(Class<? extends Annotation> annotation, String... 
packageNames);
+    Set<Class<?>> findAnnotated(Class<? extends Annotation> annotation, 
String... packageNames);
 
     /**
      * Attempts to discover classes that are annotated with to the annotation.
@@ -62,7 +62,7 @@
      * @param packageNames one or more package names to scan (including 
subpackages) for classes
      * @return the classes found, returns an empty set if none found
      */
-    Set<Class> findAnnotated(Set<Class<? extends Annotation>> annotations, 
String... packageNames);
+    Set<Class<?>> findAnnotated(Set<Class<? extends Annotation>> annotations, 
String... packageNames);
 
     /**
      * Attempts to discover classes that are assignable to the type provided. 
In
@@ -74,7 +74,7 @@
      * @param packageNames one or more package names to scan (including 
subpackages) for classes
      * @return the classes found, returns an empty set if none found
      */
-    Set<Class> findImplementations(Class parent, String... packageNames);
+    Set<Class<?>> findImplementations(Class<?> parent, String... packageNames);
 
     /**
      * Attemsp to discover classes filter by the provided filter
@@ -83,7 +83,7 @@
      * @param packageNames one or more package names to scan (including 
subpackages) for classes
      * @return the classes found, returns an empty set if none found
      */
-    Set<Class> findByFilter(PackageScanFilter fiter, String... packageNames);
+    Set<Class<?>> findByFilter(PackageScanFilter fiter, String... 
packageNames);
     
     /**
      * Add a filter that will be applied to all scan operations
@@ -91,5 +91,4 @@
      * @param filter filter to filter desired classes in all scan operations
      */
     void addFilter(PackageScanFilter filter);
-
 }

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/DefaultPackageScanClassResolverTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/DefaultPackageScanClassResolverTest.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/DefaultPackageScanClassResolverTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/DefaultPackageScanClassResolverTest.java
 Wed Nov 11 00:19:53 2009
@@ -43,7 +43,7 @@
     }
 
     public void testFindByAnnotationWithoutExtraFilters() {
-        Set<Class> scanned = resolver.findAnnotated(ScannableOne.class, 
scanPackage);
+        Set<Class<?>> scanned = resolver.findAnnotated(ScannableOne.class, 
scanPackage);
         validateMatchingSetContains(scanned, ScanTargetOne.class, 
ScanTargetTwo.class);
 
         scanned = resolver.findAnnotated(ScannableTwo.class, scanPackage);
@@ -51,12 +51,12 @@
     }
 
     public void testFindByAnnotationsWithoutExtraFilters() {
-        Set<Class> scanned = resolver.findAnnotated(annotations, scanPackage);
+        Set<Class<?>> scanned = resolver.findAnnotated(annotations, 
scanPackage);
         validateMatchingSetContains(scanned, ScanTargetOne.class, 
ScanTargetTwo.class, ScanTargetThree.class);
     }
 
     public void testFindImplementationsWithoutExtraFilters() {
-        Set<Class> scanned = resolver.findImplementations(ScanTargetOne.class, 
scanPackage);
+        Set<Class<?>> scanned = 
resolver.findImplementations(ScanTargetOne.class, scanPackage);
         validateMatchingSetContains(scanned, ScanTargetOne.class, 
ScanTargetTwo.class);
     }
     
@@ -64,7 +64,7 @@
         filter.addIncludePattern(scanPackage + ".b.*");
         resolver.addFilter(filter);
 
-        Set<Class> scanned = resolver.findAnnotated(ScannableOne.class, 
scanPackage);
+        Set<Class<?>> scanned = resolver.findAnnotated(ScannableOne.class, 
scanPackage);
         validateMatchingSetContains(scanned, ScanTargetTwo.class);
 
         scanned = resolver.findAnnotated(ScannableTwo.class, scanPackage);
@@ -76,7 +76,7 @@
         filter.addIncludePattern(scanPackage + ".c.*");
         resolver.addFilter(filter);
 
-        Set<Class> scanned = resolver.findAnnotated(annotations, 
"org.apache.camel.impl.scan");
+        Set<Class<?>> scanned = resolver.findAnnotated(annotations, 
"org.apache.camel.impl.scan");
         validateMatchingSetContains(scanned, ScanTargetTwo.class, 
ScanTargetThree.class);
     }
 
@@ -85,7 +85,7 @@
         filter.addExcludePattern(scanPackage + ".c.*");
         resolver.addFilter(filter);
 
-        Set<Class> scanned = resolver.findAnnotated(ScannableOne.class, 
scanPackage);
+        Set<Class<?>> scanned = resolver.findAnnotated(ScannableOne.class, 
scanPackage);
         validateMatchingSetContains(scanned, ScanTargetOne.class);
 
         scanned = resolver.findAnnotated(ScannableTwo.class, scanPackage);
@@ -95,7 +95,7 @@
     public void testFindByAnnotationsWithExcludePackageFilter() {
         filter.addExcludePattern(scanPackage + ".a.*");
 
-        Set<Class> scanned = resolver.findAnnotated(annotations, 
"org.apache.camel.impl.scan");
+        Set<Class<?>> scanned = resolver.findAnnotated(annotations, 
"org.apache.camel.impl.scan");
         validateMatchingSetContains(scanned, ScanTargetTwo.class, 
ScanTargetThree.class);
     }
 
@@ -103,7 +103,7 @@
         filter.addIncludePattern(scanPackage + ".**.ScanTarget*");
         resolver.addFilter(filter);
 
-        Set<Class> scanned = resolver.findByFilter(filter, 
"org.apache.camel.impl.scan");
+        Set<Class<?>> scanned = resolver.findByFilter(filter, 
"org.apache.camel.impl.scan");
         validateMatchingSetContains(scanned, ScanTargetOne.class, 
ScanTargetTwo.class, ScanTargetThree.class);
     }
     
@@ -111,7 +111,7 @@
         filter.addIncludePattern(scanPackage + ".b.*");
         resolver.addFilter(filter);
         
-        Set<Class> scanned = resolver.findImplementations(ScanTargetOne.class, 
scanPackage);
+        Set<Class<?>> scanned = 
resolver.findImplementations(ScanTargetOne.class, scanPackage);
         validateMatchingSetContains(scanned,  ScanTargetTwo.class);
     }
     
@@ -119,7 +119,7 @@
         filter.addExcludePattern(scanPackage + ".a.*");
         resolver.addFilter(filter);
         
-        Set<Class> scanned = resolver.findImplementations(ScanTargetOne.class, 
scanPackage);
+        Set<Class<?>> scanned = 
resolver.findImplementations(ScanTargetOne.class, scanPackage);
         validateMatchingSetContains(scanned,  ScanTargetTwo.class);
     }
     
@@ -136,7 +136,7 @@
 
             filter.addIncludePattern("a.*.c.*");
             resolver.addFilter(filter);
-            Set<Class> scanned = resolver.findByFilter(filter, "a.b.c");
+            Set<Class<?>> scanned = resolver.findByFilter(filter, "a.b.c");
             assertEquals(1, scanned.size());
             assertEquals("class a.b.c.Test", 
scanned.iterator().next().toString());            
         } finally {
@@ -159,7 +159,7 @@
 
             filter.addIncludePattern("a.*.c.*");
             resolver.addFilter(filter);
-            Set<Class> scanned = resolver.findByFilter(filter, "a.b.c");
+            Set<Class<?>> scanned = resolver.findByFilter(filter, "a.b.c");
             assertEquals(1, scanned.size());
             assertEquals("class a.b.c.Test", 
scanned.iterator().next().toString());
         } finally {
@@ -168,5 +168,4 @@
             }
         }
     }
-
 }

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/PatternBasedPackageScanFilterTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/PatternBasedPackageScanFilterTest.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/PatternBasedPackageScanFilterTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/PatternBasedPackageScanFilterTest.java
 Wed Nov 11 00:19:53 2009
@@ -31,11 +31,11 @@
 @SuppressWarnings("unchecked")
 public class PatternBasedPackageScanFilterTest extends ScanTestSupport {
 
-    private Set<Class> allClasses;
+    private Set<Class<?>> allClasses;
 
     public void setUp() throws Exception {
         // use classes that are pretty much constants
-        allClasses = new HashSet<Class>();
+        allClasses = new HashSet<Class<?>>();
         allClasses.add(List.class);
         allClasses.add(ArrayList.class);
         allClasses.add(LinkedList.class);

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/ScanTestSupport.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/ScanTestSupport.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/ScanTestSupport.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/ScanTestSupport.java
 Wed Nov 11 00:19:53 2009
@@ -30,7 +30,7 @@
         filter = new PatternBasedPackageScanFilter();
     }
 
-    protected void validateMatchingSetContains(Set<Class> scannedClasses, 
Class... matchingClasses) {
+    protected void validateMatchingSetContains(Set<Class<?>> scannedClasses, 
Class... matchingClasses) {
         HashSet<Class> expectedSet = new HashSet<Class>();
         for (Class expected : matchingClasses) {
             expectedSet.add(expected);
@@ -38,7 +38,7 @@
         validateMatchingSetContains(scannedClasses, expectedSet);
     }
 
-    protected void validateMatchingSetContains(Set<Class> scannedClasses, 
Set<Class> matchingClasses) {
+    protected void validateMatchingSetContains(Set<Class<?>> scannedClasses, 
Set<Class> matchingClasses) {
         Set<Class> matching = getMatchingClasses(scannedClasses, filter);
         assertEquals("Incorrect number of classes matched", 
matchingClasses.size(), matching.size());
 
@@ -59,7 +59,7 @@
         }
     }
 
-    public Set<Class> getMatchingClasses(Set<Class> scannedClasses, 
PatternBasedPackageScanFilter filter) {
+    public Set<Class> getMatchingClasses(Set<Class<?>> scannedClasses, 
PatternBasedPackageScanFilter filter) {
         Set<Class> matching = new HashSet<Class>();
 
         for (Class candidate : scannedClasses) {
@@ -70,5 +70,4 @@
 
         return matching;
     }
-
 }

Modified: 
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
 (original)
+++ 
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
 Wed Nov 11 00:19:53 2009
@@ -37,7 +37,7 @@
  */
 public abstract class BindyAbstractFactory implements BindyFactory {
     private static final transient Log LOG = 
LogFactory.getLog(BindyAbstractFactory.class);
-    protected Set<Class> models;
+    protected Set<Class<?>> models;
     protected Map<String, List<Field>> annotedLinkFields = new 
LinkedHashMap<String, List<Field>>();
     protected List<Field> linkFields = new ArrayList<Field>();
     protected String crlf;

Modified: 
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/AnnotationModelLoader.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/AnnotationModelLoader.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/AnnotationModelLoader.java
 (original)
+++ 
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/AnnotationModelLoader.java
 Wed Nov 11 00:19:53 2009
@@ -44,8 +44,7 @@
         annotations.add(Section.class);
     }
 
-    public Set<Class> loadModels(String... packageNames) throws Exception {
+    public Set<Class<?>> loadModels(String... packageNames) throws Exception {
         return resolver.findAnnotated(annotations, packageNames);
     }
-
 }

Modified: 
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/util/AnnotationModuleLoaderTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/util/AnnotationModuleLoaderTest.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/util/AnnotationModuleLoaderTest.java
 (original)
+++ 
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/util/AnnotationModuleLoaderTest.java
 Wed Nov 11 00:19:53 2009
@@ -30,7 +30,7 @@
     @Test 
     public void testLoadModels() throws Exception {
         AnnotationModelLoader loader = new AnnotationModelLoader(new 
DefaultPackageScanClassResolver());
-        Set<Class> classes = 
loader.loadModels("org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink");
+        Set<Class<?>> classes = 
loader.loadModels("org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink");
         assertNotNull("The find classes should not be null ", classes);
         assertEquals("There should have 3 classes", 3, classes.size());
         assertTrue(classes.contains(Client.class));

Modified: 
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoader.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoader.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoader.java
 (original)
+++ 
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoader.java
 Wed Nov 11 00:19:53 2009
@@ -39,8 +39,8 @@
         for (Activator.TypeConverterEntry entry : 
Activator.getTypeConverterEntries()) {
             OsgiPackageScanClassResolver resolver = new 
OsgiPackageScanClassResolver(entry.bundle);
             String[] packages = entry.converterPackages.toArray(new 
String[entry.converterPackages.size()]);
-            Set<Class> classes = resolver.findAnnotated(Converter.class, 
packages);           
-            for (Class type : classes) {
+            Set<Class<?>> classes = resolver.findAnnotated(Converter.class, 
packages);           
+            for (Class<?> type : classes) {
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("Loading converter class: " + 
ObjectHelper.name(type));
                 }

Modified: 
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java
 (original)
+++ 
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java
 Wed Nov 11 00:19:53 2009
@@ -49,7 +49,7 @@
         return classLoaders;
     }
     
-    public void find(PackageScanFilter test, String packageName, Set<Class> 
classes) {
+    public void find(PackageScanFilter test, String packageName, Set<Class<?>> 
classes) {
         packageName = packageName.replace('.', '/');
         Set<ClassLoader> set = getClassLoaders();
         ClassLoader osgiClassLoader = getOsgiClassLoader(set);
@@ -71,9 +71,9 @@
         }
     }
 
-    private void findInOsgiClassLoader(PackageScanFilter test, String 
packageName, ClassLoader osgiClassLoader, Set<Class> classes) {
+    private void findInOsgiClassLoader(PackageScanFilter test, String 
packageName, ClassLoader osgiClassLoader, Set<Class<?>> classes) {
         try {
-            Method mth = osgiClassLoader.getClass().getMethod("getBundle", new 
Class[]{});
+            Method mth = osgiClassLoader.getClass().getMethod("getBundle", new 
Class<?>[]{});
             if (mth != null) {
                 if (log.isDebugEnabled()) {
                     log.debug("Loading from osgi bundle using classloader: " + 
osgiClassLoader);
@@ -112,7 +112,7 @@
         return false;
     }
     
-    private void loadImplementationsInBundle(PackageScanFilter test, String 
packageName, ClassLoader loader, Method mth, Set<Class> classes) {
+    private void loadImplementationsInBundle(PackageScanFilter test, String 
packageName, ClassLoader loader, Method mth, Set<Class<?>> classes) {
         // Use an inner class to avoid a NoClassDefFoundError when used in a 
non-osgi env
         Set<String> urls = OsgiUtil.getImplementationsInBundle(test, 
packageName, loader, mth);
         if (urls != null) {

Modified: 
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java
 (original)
+++ 
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java
 Wed Nov 11 00:19:53 2009
@@ -34,7 +34,7 @@
         OsgiPackageScanClassResolver resolver  = new 
OsgiPackageScanClassResolver(context);
              
         String[] packageNames = {"org.apache.camel.osgi.test"};
-        Set<Class> classes = resolver.findAnnotated(Converter.class, 
packageNames);
+        Set<Class<?>> classes = resolver.findAnnotated(Converter.class, 
packageNames);
         assertEquals("There should find a class", classes.size(), 1);
         assertTrue("Find a wrong class", 
classes.contains(MyTypeConverter.class));
     }
@@ -44,7 +44,7 @@
         BundleContext  context = getActivator().getBundle().getBundleContext();
         OsgiPackageScanClassResolver resolver  = new 
OsgiPackageScanClassResolver(context);
         String[] packageNames = {"org.apache.camel.osgi.test"};
-        Set<Class> classes = resolver.findImplementations(RoutesBuilder.class, 
packageNames);
+        Set<Class<?>> classes = 
resolver.findImplementations(RoutesBuilder.class, packageNames);
         assertEquals("There should find a class", classes.size(), 1);
         assertTrue("Find a wrong class", 
classes.contains(MyRouteBuilder.class));
     }

Modified: 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/RouteBuilderFinder.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/RouteBuilderFinder.java?rev=834723&r1=834722&r2=834723&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/RouteBuilderFinder.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/RouteBuilderFinder.java
 Wed Nov 11 00:19:53 2009
@@ -54,7 +54,7 @@
      * Appends all the {...@link org.apache.camel.builder.RouteBuilder} 
instances that can be found on the classpath
      */
     public void appendBuilders(List<RoutesBuilder> list) throws 
IllegalAccessException, InstantiationException {
-        Set<Class> classes = resolver.findImplementations(RoutesBuilder.class, 
packages);
+        Set<Class<?>> classes = 
resolver.findImplementations(RoutesBuilder.class, packages);
         for (Class aClass : classes) {
             if (shouldIgnoreBean(aClass)) {
                 continue;


Reply via email to