You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/11/13 05:14:14 UTC

svn commit: r835732 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/impl/ main/java/org/apache/camel/management/mbean/ main/java/org/apache/camel/model/language/ main/java/org/apache/camel/processor/exceptionpolicy/ main/java/org/apache/ca...

Author: hadrian
Date: Fri Nov 13 04:14:12 2009
New Revision: 835732

URL: http://svn.apache.org/viewvc?rev=835732&view=rev
Log:
More cleanup of warnings, api, generics. Under 2500 now.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/LoggingExceptionHandler.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/NoMessageIdException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DelayInterceptor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Delayer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceFormatterTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java Fri Nov 13 04:14:12 2009
@@ -17,6 +17,7 @@
 package org.apache.camel.impl;
 
 import java.lang.reflect.Method;
+
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.apache.camel.CamelContext;
@@ -127,6 +128,7 @@
     /**
      * Creates the object to be injected for an {@link org.apache.camel.EndpointInject} or {@link org.apache.camel.Produce} injection point
      */
+    @SuppressWarnings("unchecked")
     public Object getInjectionValue(Class<?> type, String endpointUri, String endpointRef, String injectionPointName) {
         if (type.isAssignableFrom(ProducerTemplate.class)) {
             return createInjectionProducerTemplate(endpointUri, endpointRef, injectionPointName);

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Fri Nov 13 04:14:12 2009
@@ -80,6 +80,7 @@
 import org.apache.camel.spi.RouteContext;
 import org.apache.camel.spi.ServicePool;
 import org.apache.camel.spi.TypeConverterRegistry;
+import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.EventHelper;
 import org.apache.camel.util.LRUCache;
 import org.apache.camel.util.ObjectHelper;
@@ -359,16 +360,16 @@
                     strategy.onEndpointRemove(oldEndpoint);
                 }
             } else {
-                Collection<Map.Entry> worklist = new ArrayList<Map.Entry>();
-                for (Map.Entry entry : endpoints.entrySet()) {
-                    oldEndpoint = (Endpoint) entry.getValue();
+                Collection<Map.Entry<String, Endpoint>> worklist = new ArrayList<Map.Entry<String, Endpoint>>();
+                for (Map.Entry<String, Endpoint> entry : endpoints.entrySet()) {
+                    oldEndpoint = entry.getValue();
                     if (!oldEndpoint.isSingleton() && uri.equals(oldEndpoint.getEndpointUri())) {
                         // add to worklist to avoid concurrent modification exception
                         worklist.add(entry);
                     }
                 }
-                for (Map.Entry entry : worklist) {
-                    oldEndpoint = (Endpoint) entry.getValue();
+                for (Map.Entry<String, Endpoint> entry : worklist) {
+                    oldEndpoint = entry.getValue();
                     answer.add(oldEndpoint);
                     stopServices(oldEndpoint);
                     endpoints.remove(entry.getKey());
@@ -1089,16 +1090,15 @@
         }
     }
 
-    private void stopServices(Collection services) throws Exception {
+    private void stopServices(Collection<?> services) throws Exception {
         // reverse stopping by default
         stopServices(services, true);
     }
 
-    @SuppressWarnings("unchecked")
-    private void stopServices(Collection services, boolean reverse) throws Exception {
-        Collection list = services;
+    private void stopServices(Collection<?> services, boolean reverse) throws Exception {
+        Collection<Object> list = CastUtils.cast(services);
         if (reverse) {
-            ArrayList reverseList = new ArrayList(services);
+            ArrayList<Object> reverseList = new ArrayList<Object>(services);
             Collections.reverse(reverseList);
             list = reverseList;
         }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java Fri Nov 13 04:14:12 2009
@@ -20,6 +20,7 @@
 import java.net.URL;
 
 import org.apache.camel.spi.ClassResolver;
+import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.ObjectHelper;
 
 /**
@@ -27,28 +28,26 @@
  */
 public class DefaultClassResolver implements ClassResolver {
 
-    public Class resolveClass(String name) {
+    public Class<?> resolveClass(String name) {
         return loadClass(name, DefaultClassResolver.class.getClassLoader());
     }
 
-    @SuppressWarnings("unchecked")
     public <T> Class<T> resolveClass(String name, Class<T> type) {
-        Class answer = loadClass(name, DefaultClassResolver.class.getClassLoader());
+        Class<T> answer = CastUtils.cast(loadClass(name, DefaultClassResolver.class.getClassLoader()));
         return (Class<T>) answer;
     }
 
-    public Class resolveClass(String name, ClassLoader loader) {
+    public Class<?> resolveClass(String name, ClassLoader loader) {
         return loadClass(name, loader);
     }
 
-    @SuppressWarnings("unchecked")
     public <T> Class<T> resolveClass(String name, Class<T> type, ClassLoader loader) {
-        Class answer = loadClass(name, loader);
-        return (Class<T>) answer;
+        Class<T> answer = CastUtils.cast(loadClass(name, loader));
+        return answer;
     }
 
-    public Class resolveMandatoryClass(String name) throws ClassNotFoundException {
-        Class answer = resolveClass(name);
+    public Class<?> resolveMandatoryClass(String name) throws ClassNotFoundException {
+        Class<?> answer = resolveClass(name);
         if (answer == null) {
             throw new ClassNotFoundException(name);
         }
@@ -63,8 +62,8 @@
         return answer;
     }
 
-    public Class resolveMandatoryClass(String name, ClassLoader loader) throws ClassNotFoundException {
-        Class answer = resolveClass(name, loader);
+    public Class<?> resolveMandatoryClass(String name, ClassLoader loader) throws ClassNotFoundException {
+        Class<?> answer = resolveClass(name, loader);
         if (answer == null) {
             throw new ClassNotFoundException(name);
         }
@@ -89,9 +88,8 @@
         return ObjectHelper.loadResourceAsURL(uri);
     }
 
-    protected Class loadClass(String name, ClassLoader loader) {
+    protected Class<?> loadClass(String name, ClassLoader loader) {
         ObjectHelper.notEmpty(name, "name");
         return ObjectHelper.loadClass(name, loader);
     }
-
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java Fri Nov 13 04:14:12 2009
@@ -85,7 +85,7 @@
         }
     }
 
-    private Class findComponent(String name, CamelContext context) throws ClassNotFoundException, IOException {
+    private Class<?> findComponent(String name, CamelContext context) throws ClassNotFoundException, IOException {
         if (factoryFinder == null) {
             factoryFinder = context.getFactoryFinder(RESOURCE_PATH);
         }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java Fri Nov 13 04:14:12 2009
@@ -37,7 +37,7 @@
     public DataFormat resolveDataFormat(String name, CamelContext context) {
         DataFormat dataFormat = lookup(context, name, DataFormat.class);
         if (dataFormat == null) {
-            Class type = null;
+            Class<?> type = null;
             try {
                 if (dataformatFactory == null) {
                     dataformatFactory = context.getFactoryFinder(DATAFORMAT_RESOURCE_PATH);
@@ -82,5 +82,4 @@
             return null;
         }
     }
-
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java Fri Nov 13 04:14:12 2009
@@ -29,6 +29,7 @@
 import org.apache.camel.spi.ClassResolver;
 import org.apache.camel.spi.FactoryFinder;
 import org.apache.camel.spi.Injector;
+import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.ObjectHelper;
 
 /**
@@ -36,7 +37,7 @@
  */
 public class DefaultFactoryFinder implements FactoryFinder {
 
-    protected final ConcurrentHashMap<String, Class> classMap = new ConcurrentHashMap<String, Class>();
+    protected final ConcurrentHashMap<String, Class<?>> classMap = new ConcurrentHashMap<String, Class<?>>();
     private final ClassResolver classResolver;
     private final String path;
 
@@ -58,20 +59,20 @@
     }
 
     public <T> List<T> newInstances(String key, Injector injector, Class<T> type) throws ClassNotFoundException, IOException {
-        List<Class> list = findClasses(key);
+        List<Class<T>> list = CastUtils.cast(findClasses(key));
         List<T> answer = new ArrayList<T>(list.size());
         answer.add(newInstance(key, injector, type));
         return answer;
     }
 
-    public Class findClass(String key) throws ClassNotFoundException, IOException {
+    public Class<?> findClass(String key) throws ClassNotFoundException, IOException {
         return findClass(key, null);
     }
 
-    public Class findClass(String key, String propertyPrefix) throws ClassNotFoundException, IOException {
+    public Class<?> findClass(String key, String propertyPrefix) throws ClassNotFoundException, IOException {
         String prefix = propertyPrefix != null ? propertyPrefix : "";
 
-        Class clazz = classMap.get(prefix + key);
+        Class<?> clazz = classMap.get(prefix + key);
         if (clazz == null) {
             clazz = newInstance(doFindFactoryProperties(key), prefix);
             if (clazz != null) {
@@ -83,7 +84,7 @@
 
     private Object newInstance(String key, String propertyPrefix) throws IllegalAccessException,
         InstantiationException, IOException, ClassNotFoundException {
-        Class clazz = findClass(key, propertyPrefix);
+        Class<?> clazz = findClass(key, propertyPrefix);
         return clazz.newInstance();
     }
 
@@ -103,23 +104,23 @@
         }
     }
 
-    private List<Class> findClasses(String key) throws ClassNotFoundException, IOException {
+    private List<Class<?>> findClasses(String key) throws ClassNotFoundException, IOException {
         return findClasses(key, null);
     }
 
-    private List<Class> findClasses(String key, String propertyPrefix) throws ClassNotFoundException, IOException {
+    private List<Class<?>> findClasses(String key, String propertyPrefix) throws ClassNotFoundException, IOException {
         // TODO change to support finding multiple classes on the classpath!
-        Class type = findClass(key, propertyPrefix);
-        return Collections.singletonList(type);
+        Class<?> type = findClass(key, propertyPrefix);
+        return CastUtils.cast(Collections.singletonList(type));
     }
 
-    private Class newInstance(Properties properties, String propertyPrefix) throws ClassNotFoundException, IOException {
+    private Class<?> newInstance(Properties properties, String propertyPrefix) throws ClassNotFoundException, IOException {
         String className = properties.getProperty(propertyPrefix + "class");
         if (className == null) {
             throw new IOException("Expected property is missing: " + propertyPrefix + "class");
         }
 
-        Class clazz = classResolver.resolveClass(className);
+        Class<?> clazz = classResolver.resolveClass(className);
         if (clazz == null) {
             throw new ClassNotFoundException(className);
         }
@@ -146,6 +147,4 @@
             ObjectHelper.close(in, key, null);
         }
     }
-
-
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java Fri Nov 13 04:14:12 2009
@@ -101,14 +101,14 @@
         throw new NoSuchLanguageException(name);
     }
     
-    protected Class findLanguage(String name, CamelContext context) throws Exception {
+    protected Class<?> findLanguage(String name, CamelContext context) throws Exception {
         if (languageFactory == null) {
             languageFactory = context.getFactoryFinder(LANGUAGE_RESOURCE_PATH);
         }
         return languageFactory.findClass(name);
     }
     
-    protected Class findLanguageResolver(String name, CamelContext context) throws Exception {
+    protected Class<?> findLanguageResolver(String name, CamelContext context) throws Exception {
         if (languageResolver == null) {
             languageResolver = context.getFactoryFinder(LANGUAGE_RESOLVER_RESOURCE_PATH);
         }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java Fri Nov 13 04:14:12 2009
@@ -98,7 +98,7 @@
         return camelContext;
     }
 
-    public Processor createProcessor(ProcessorDefinition node) throws Exception {
+    public Processor createProcessor(ProcessorDefinition<?> node) throws Exception {
         return node.createOutputsProcessor(this);
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java Fri Nov 13 04:14:12 2009
@@ -32,14 +32,14 @@
 
     private Expression expression;
     private Processor processor;
-    private ProcessorDefinition processorDefinition;
+    private ProcessorDefinition<?> processorDefinition;
 
-    public DefaultRouteNode(ProcessorDefinition processorDefinition, Processor processor) {
+    public DefaultRouteNode(ProcessorDefinition<?> processorDefinition, Processor processor) {
         this.processor = processor;
         this.processorDefinition = processorDefinition;
     }
 
-    public DefaultRouteNode(ProcessorDefinition processorDefinition, Expression expression) {
+    public DefaultRouteNode(ProcessorDefinition<?> processorDefinition, Expression expression) {
         this.processorDefinition = processorDefinition;
         this.expression = expression;
     }
@@ -48,7 +48,7 @@
         return processor;
     }
 
-    public ProcessorDefinition getProcessorDefinition() {
+    public ProcessorDefinition<?> getProcessorDefinition() {
         return processorDefinition;
     }
 
@@ -77,5 +77,4 @@
     public String toString() {
         return "RouteNode[" + processorDefinition + "]";
     }
-
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java Fri Nov 13 04:14:12 2009
@@ -46,7 +46,7 @@
     private String id;
     private List<Synchronization> synchronizations;
     private List<RouteNode> routeNodes;
-    private Map<ProcessorDefinition, AtomicInteger> routeIndex = new HashMap<ProcessorDefinition, AtomicInteger>();
+    private Map<ProcessorDefinition<?>, AtomicInteger> routeIndex = new HashMap<ProcessorDefinition<?>, AtomicInteger>();
     private Message originalInMessage;
 
     public DefaultUnitOfWork(Exchange exchange) {
@@ -181,7 +181,7 @@
         return originalInMessage;
     }
 
-    public int getAndIncrement(ProcessorDefinition node) {
+    public int getAndIncrement(ProcessorDefinition<?> node) {
         AtomicInteger count = routeIndex.get(node);
         if (count == null) {
             count = new AtomicInteger();
@@ -189,5 +189,4 @@
         }
         return count.getAndIncrement();
     }
-
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/LoggingExceptionHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/LoggingExceptionHandler.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/LoggingExceptionHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/LoggingExceptionHandler.java Fri Nov 13 04:14:12 2009
@@ -31,7 +31,7 @@
 public class LoggingExceptionHandler implements ExceptionHandler {
     private final Logger logger;
 
-    public LoggingExceptionHandler(Class ownerType) {
+    public LoggingExceptionHandler(Class<?> ownerType) {
         this(new Logger(LogFactory.getLog(ownerType), LoggingLevel.ERROR));
     }
 
@@ -58,5 +58,4 @@
 
         return false;
     }
-
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java Fri Nov 13 04:14:12 2009
@@ -25,6 +25,8 @@
  * @version $Revision$
  */
 public class ProxyInstantiationException extends RuntimeCamelException {
+    private static final long serialVersionUID = -2050115486047385507L;
+
     private final Class<?> type;
     private final Endpoint endpoint;
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java Fri Nov 13 04:14:12 2009
@@ -39,7 +39,7 @@
     private final AtomicBoolean starting = new AtomicBoolean(false);
     private final AtomicBoolean stopping = new AtomicBoolean(false);
     private final AtomicBoolean stopped = new AtomicBoolean(false);
-    private Collection childServices;
+    private Collection<Object> childServices;
     private String version;
 
     public void start() throws Exception {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java Fri Nov 13 04:14:12 2009
@@ -33,7 +33,7 @@
 
     private Delayer delayer;
 
-    public ManagedDelayer(CamelContext context, Delayer delayer, ProcessorDefinition definition) {
+    public ManagedDelayer(CamelContext context, Delayer delayer, ProcessorDefinition<?> definition) {
         super(context, delayer, definition);
         this.delayer = delayer;
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java Fri Nov 13 04:14:12 2009
@@ -34,11 +34,11 @@
 
     private final CamelContext context;
     private final Processor processor;
-    private final ProcessorDefinition definition;
+    private final ProcessorDefinition<?> definition;
     private final String id;
     private Route route;
 
-    public ManagedProcessor(CamelContext context, Processor processor, ProcessorDefinition definition) {
+    public ManagedProcessor(CamelContext context, Processor processor, ProcessorDefinition<?> definition) {
         this.context = context;
         this.processor = processor;
         this.definition = definition;
@@ -56,7 +56,7 @@
         return processor;
     }
 
-    public ProcessorDefinition getDefinition() {
+    public ProcessorDefinition<?> getDefinition() {
         return definition;
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java Fri Nov 13 04:14:12 2009
@@ -32,7 +32,7 @@
 
     private SendProcessor processor;
 
-    public ManagedSendProcessor(CamelContext context, SendProcessor processor, ProcessorDefinition definition) {
+    public ManagedSendProcessor(CamelContext context, SendProcessor processor, ProcessorDefinition<?> definition) {
         super(context, processor, definition);
         this.processor = processor;
     }
@@ -60,5 +60,4 @@
         Endpoint endpoint = getContext().getEndpoint(uri);
         processor.setDestination(endpoint);
     }
-
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java Fri Nov 13 04:14:12 2009
@@ -30,7 +30,7 @@
 
     private Throttler throttler;
 
-    public ManagedThrottler(CamelContext context, Throttler throttler, ProcessorDefinition definition) {
+    public ManagedThrottler(CamelContext context, Throttler throttler, ProcessorDefinition<?> definition) {
         super(context, throttler, definition);
         this.throttler = throttler;
     }
@@ -58,5 +58,4 @@
     public void setTimePeriodMillis(long timePeriodMillis) {
         getThrottler().setTimePeriodMillis(timePeriodMillis);
     }
-
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java Fri Nov 13 04:14:12 2009
@@ -43,7 +43,7 @@
     private String method;
     @XmlTransient
     // we don't need to support the beanType class in Spring
-    private Class beanType;
+    private Class<?> beanType;
     
 
     public MethodCallExpression() {
@@ -58,12 +58,12 @@
         this.method = method;
     }
     
-    public MethodCallExpression(Class type) {
+    public MethodCallExpression(Class<?> type) {
         super(type.toString());
         this.beanType = type;        
     }
     
-    public MethodCallExpression(Class type, String method) {
+    public MethodCallExpression(Class<?> type, String method) {
         super(type.toString());
         this.beanType = type;
         this.method = method;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java Fri Nov 13 04:14:12 2009
@@ -34,7 +34,7 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 public class XPathExpression extends NamespaceAwareExpression {
     @XmlAttribute(required = false)
-    private Class resultType;
+    private Class<?> resultType;
 
     public XPathExpression() {
     }
@@ -47,11 +47,11 @@
         return "xpath";
     }
 
-    public Class getResultType() {
+    public Class<?> getResultType() {
         return resultType;
     }
 
-    public void setResultType(Class resultType) {
+    public void setResultType(Class<?> resultType) {
         this.resultType = resultType;
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java Fri Nov 13 04:14:12 2009
@@ -40,7 +40,7 @@
     @XmlAttribute(required = false)
     private String type;
     @XmlTransient
-    private Class resultType;
+    private Class<?> resultType;
 
     public XQueryExpression() {
     }
@@ -61,11 +61,11 @@
         this.type = type;
     }
 
-    public Class getResultType() {
+    public Class<?> getResultType() {
         return resultType;
     }
 
-    public void setResultType(Class resultType) {
+    public void setResultType(Class<?> resultType) {
         this.resultType = resultType;
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java Fri Nov 13 04:14:12 2009
@@ -101,7 +101,7 @@
         // loop through all the entries and find the best candidates to use
         Set<Map.Entry<ExceptionPolicyKey, OnExceptionDefinition>> entries = exceptionPolicies.entrySet();
         for (Map.Entry<ExceptionPolicyKey, OnExceptionDefinition> entry : entries) {
-            Class clazz = entry.getKey().getExceptionClass();
+            Class<?> clazz = entry.getKey().getExceptionClass();
             OnExceptionDefinition type = entry.getValue();
 
             if (filter(type, clazz, exception)) {
@@ -165,7 +165,7 @@
      * @param exception      the thrown exception
      * @return <tt>true</tt> if the to current exception class is a candidate, <tt>false</tt> to skip it.
      */
-    protected boolean filter(OnExceptionDefinition type, Class exceptionClass, Throwable exception) {
+    protected boolean filter(OnExceptionDefinition type, Class<?> exceptionClass, Throwable exception) {
         // must be instance of check to ensure that the exceptionClass is one type of the thrown exception
         return exceptionClass.isInstance(exception);
     }
@@ -205,11 +205,10 @@
         return ObjectHelper.createExceptionIterator(exception);
     }
 
-    private static int getInheritanceLevel(Class clazz) {
+    private static int getInheritanceLevel(Class<?> clazz) {
         if (clazz == null || "java.lang.Object".equals(clazz.getName())) {
             return 0;
         }
         return 1 + getInheritanceLevel(clazz.getSuperclass());
     }
-
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java Fri Nov 13 04:14:12 2009
@@ -26,15 +26,15 @@
  */
 public final class ExceptionPolicyKey {
 
-    private final Class exceptionClass;
+    private final Class<?> exceptionClass;
     private final WhenDefinition when;
 
-    public ExceptionPolicyKey(Class exceptionClass, WhenDefinition when) {
+    public ExceptionPolicyKey(Class<?> exceptionClass, WhenDefinition when) {
         this.exceptionClass = exceptionClass;
         this.when = when;
     }
 
-    public Class getExceptionClass() {
+    public Class<?> getExceptionClass() {
         return exceptionClass;
     }
 
@@ -42,11 +42,11 @@
         return when;
     }
 
-    public static ExceptionPolicyKey newInstance(Class exceptionClass) {
+    public static ExceptionPolicyKey newInstance(Class<?> exceptionClass) {
         return new ExceptionPolicyKey(exceptionClass, null);
     }
 
-    public static ExceptionPolicyKey newInstance(Class exceptionClass, WhenDefinition when) {
+    public static ExceptionPolicyKey newInstance(Class<?> exceptionClass, WhenDefinition when) {
         return new ExceptionPolicyKey(exceptionClass, when);
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java Fri Nov 13 04:14:12 2009
@@ -39,11 +39,11 @@
     private static final transient Log LOG = LogFactory.getLog(IdempotentConsumer.class);
     private final Expression messageIdExpression;
     private final Processor processor;
-    private final IdempotentRepository idempotentRepository;
+    private final IdempotentRepository<String> idempotentRepository;
     private final boolean eager;
 
-    public IdempotentConsumer(Expression messageIdExpression, IdempotentRepository idempotentRepository,
-                              boolean eager, Processor processor) {
+    public IdempotentConsumer(Expression messageIdExpression, 
+            IdempotentRepository<String> idempotentRepository, boolean eager, Processor processor) {
         this.messageIdExpression = messageIdExpression;
         this.idempotentRepository = idempotentRepository;
         this.eager = eager;
@@ -103,7 +103,7 @@
         return messageIdExpression;
     }
 
-    public IdempotentRepository getIdempotentRepository() {
+    public IdempotentRepository<String> getIdempotentRepository() {
         return idempotentRepository;
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java Fri Nov 13 04:14:12 2009
@@ -33,11 +33,11 @@
  */
 public class IdempotentOnCompletion implements Synchronization {
     private static final transient Log LOG = LogFactory.getLog(IdempotentOnCompletion.class);
-    private final IdempotentRepository idempotentRepository;
+    private final IdempotentRepository<String> idempotentRepository;
     private final String messageId;
     private final boolean eager;
 
-    public IdempotentOnCompletion(IdempotentRepository idempotentRepository, String messageId, boolean eager) {
+    public IdempotentOnCompletion(IdempotentRepository<String> idempotentRepository, String messageId, boolean eager) {
         this.idempotentRepository = idempotentRepository;
         this.messageId = messageId;
         this.eager = eager;
@@ -92,5 +92,4 @@
     public String toString() {
         return "IdempotentOnCompletion[" + messageId + ']';
     }
-
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/NoMessageIdException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/NoMessageIdException.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/NoMessageIdException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/NoMessageIdException.java Fri Nov 13 04:14:12 2009
@@ -27,6 +27,8 @@
  * @version $Revision$
  */
 public class NoMessageIdException extends RuntimeCamelException {
+    private static final long serialVersionUID = 5755929795399134568L;
+
     private final Exchange exchange;
     private final Expression expression;
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java Fri Nov 13 04:14:12 2009
@@ -30,6 +30,7 @@
  * Default {@link TraceEventMessage}.
  */
 public final class DefaultTraceEventMessage implements Serializable, TraceEventMessage {
+    private static final long serialVersionUID = -4549012920528941202L;
 
     private Date timestamp;
     private String fromEndpointUri;
@@ -54,7 +55,7 @@
      * @param toNode the node where this trace is intercepted
      * @param exchange the current {@link Exchange}
      */
-    public DefaultTraceEventMessage(final Date timestamp, final ProcessorDefinition toNode, final Exchange exchange) {
+    public DefaultTraceEventMessage(final Date timestamp, final ProcessorDefinition<?> toNode, final Exchange exchange) {
         Message in = exchange.getIn();
 
         // need to use defensive copies to avoid Exchange altering after the point of interception

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java Fri Nov 13 04:14:12 2009
@@ -44,7 +44,7 @@
     private boolean showException = true;
     private int maxChars;
 
-    public Object format(final TraceInterceptor interceptor, final ProcessorDefinition node, final Exchange exchange) {
+    public Object format(final TraceInterceptor interceptor, final ProcessorDefinition<?> node, final Exchange exchange) {
         Message in = exchange.getIn();
         Message out = null;
         if (exchange.hasOut()) {
@@ -245,7 +245,7 @@
      * <br/>or
      * <br/><tt>ID-mojo/39713-1225468755256/2-0 -> transform(body)</tt>
      */
-    protected String extractBreadCrumb(TraceInterceptor interceptor, ProcessorDefinition currentNode, Exchange exchange) {
+    protected String extractBreadCrumb(TraceInterceptor interceptor, ProcessorDefinition<?> currentNode, Exchange exchange) {
         String id = "";
         String result;
         

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DelayInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DelayInterceptor.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DelayInterceptor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DelayInterceptor.java Fri Nov 13 04:14:12 2009
@@ -26,10 +26,10 @@
  */
 public class DelayInterceptor extends DelayProcessorSupport {
 
-    private final ProcessorDefinition node;
+    private final ProcessorDefinition<?> node;
     private Delayer delayer;
 
-    public DelayInterceptor(ProcessorDefinition node, Processor target, Delayer delayer) {
+    public DelayInterceptor(ProcessorDefinition<?> node, Processor target, Delayer delayer) {
         super(target);
         this.node = node;
         this.delayer = delayer;
@@ -46,5 +46,4 @@
             waitUntil(time, exchange);
         }
     }
-
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Delayer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Delayer.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Delayer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Delayer.java Fri Nov 13 04:14:12 2009
@@ -51,8 +51,9 @@
         return null;
     }
 
-    public Processor wrapProcessorInInterceptors(CamelContext context, ProcessorDefinition definition,
-                                                 Processor target, Processor nextTarget) throws Exception {
+    public Processor wrapProcessorInInterceptors(CamelContext context, 
+            ProcessorDefinition<?> definition, Processor target, Processor nextTarget) throws Exception {
+        
         return new DelayInterceptor(definition, target, this);
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java Fri Nov 13 04:14:12 2009
@@ -28,8 +28,9 @@
  */
 public final class HandleFault implements InterceptStrategy {
 
-    public Processor wrapProcessorInInterceptors(CamelContext context, ProcessorDefinition definition,
-                                                 Processor target, Processor nextTarget) throws Exception {
+    public Processor wrapProcessorInInterceptors(CamelContext context, 
+            ProcessorDefinition<?> definition, Processor target, Processor nextTarget) throws Exception {
+
         return new HandleFaultInterceptor(target);
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java Fri Nov 13 04:14:12 2009
@@ -28,8 +28,9 @@
  */
 public final class StreamCaching implements InterceptStrategy {
     
-    public Processor wrapProcessorInInterceptors(CamelContext context, ProcessorDefinition definition,
-                                                 Processor target, Processor nextTarget) throws Exception {
+    public Processor wrapProcessorInInterceptors(CamelContext context, 
+            ProcessorDefinition<?> definition, Processor target, Processor nextTarget) throws Exception {
+
         return new StreamCachingInterceptor(target);
     }
     

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java Fri Nov 13 04:14:12 2009
@@ -32,5 +32,5 @@
      * @param exchange       the current exchange
      * @return the log message
      */
-    Object format(TraceInterceptor interceptor, ProcessorDefinition node, Exchange exchange);
+    Object format(TraceInterceptor interceptor, ProcessorDefinition<?> node, Exchange exchange);
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java Fri Nov 13 04:14:12 2009
@@ -53,13 +53,13 @@
     private static final String JPA_TRACE_EVENT_MESSAGE = "org.apache.camel.processor.interceptor.jpa.JpaTraceEventMessage";
     private Logger logger;
     private Producer traceEventProducer;
-    private final ProcessorDefinition node;
+    private final ProcessorDefinition<?> node;
     private final Tracer tracer;
     private TraceFormatter formatter;
-    private Class jpaTraceEventMessageClass;
+    private Class<?> jpaTraceEventMessageClass;
     private RouteContext routeContext;
 
-    public TraceInterceptor(ProcessorDefinition node, Processor target, TraceFormatter formatter, Tracer tracer) {
+    public TraceInterceptor(ProcessorDefinition<?> node, Processor target, TraceFormatter formatter, Tracer tracer) {
         super(target);
         this.tracer = tracer;
         this.node = node;
@@ -162,7 +162,7 @@
 
     // Properties
     //-------------------------------------------------------------------------
-    public ProcessorDefinition getNode() {
+    public ProcessorDefinition<?> getNode() {
         return node;
     }
 
@@ -376,7 +376,7 @@
     /**
      * Returns true if the given node should be logged in the trace list
      */
-    protected boolean shouldLogNode(ProcessorDefinition node) {
+    protected boolean shouldLogNode(ProcessorDefinition<?> node) {
         if (node == null) {
             return false;
         }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java Fri Nov 13 04:14:12 2009
@@ -96,8 +96,9 @@
         return logger;
     }
 
-    public Processor wrapProcessorInInterceptors(CamelContext context, ProcessorDefinition definition,
-                                                 Processor target, Processor nextTarget) throws Exception {
+    public Processor wrapProcessorInInterceptors(CamelContext context, 
+            ProcessorDefinition<?> definition, Processor target, Processor nextTarget) throws Exception {
+
         // Force the creation of an id, otherwise the id is not available when the trace formatter is
         // outputting trace information
         definition.idOrCreate(context.getNodeIdFactory());

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceFormatterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceFormatterTest.java?rev=835732&r1=835731&r2=835732&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceFormatterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceFormatterTest.java Fri Nov 13 04:14:12 2009
@@ -112,10 +112,9 @@
     // as this is a test we just create a simple string with * around the body
     class MyTraceFormatter implements TraceFormatter {
 
-        public Object format(TraceInterceptor interceptor, ProcessorDefinition node, Exchange exchange) {
+        public Object format(TraceInterceptor interceptor, ProcessorDefinition<?> node, Exchange exchange) {
             return "***" + exchange.getIn().getBody(String.class) + "***";
         }
     }
     // END SNIPPET: e2
-
 }
\ No newline at end of file