camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject svn commit: r1297170 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/camel/model/ camel-core/src/main/java/org/apache/camel/processor/loadbalancer/ camel-core/src/main/java/org/apache/camel/util/ c...
Date Mon, 05 Mar 2012 18:53:29 GMT
Author: bvahdat
Date: Mon Mar  5 18:53:28 2012
New Revision: 1297170

URL: http://svn.apache.org/viewvc?rev=1297170&view=rev
Log:
CAMEL-5062: Refer the Java Collection API classes by their interfaces and not through a specific given implementation. Also cleaned up some unused imports.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.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/DefaultInflightRepository.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateUnknownExecutorServiceRefTest.java
    camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
    camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContainerBeanManagerTest.java
    camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
    camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
    camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/CamelServlet.java
    camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
    camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteKeyOrderingTest.java
    camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java
    camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteUsingSqlSelectAliasTest.java
    camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
    camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
    camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
    camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java
    camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java
    camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java
    camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java
    camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
    camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
    camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java
    camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialService.java
    camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java
    camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
    camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java

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=1297170&r1=1297169&r2=1297170&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 Mon Mar  5 18:53:28 2012
@@ -1696,7 +1696,7 @@ public class DefaultCamelContext extends
     private void shutdownServices(Collection<?> services, boolean reverse) {
         Collection<Object> list = CastUtils.cast(services);
         if (reverse) {
-            ArrayList<Object> reverseList = new ArrayList<Object>(services);
+            List<Object> reverseList = new ArrayList<Object>(services);
             Collections.reverse(reverseList);
             list = reverseList;
         }

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=1297170&r1=1297169&r2=1297170&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 Mon Mar  5 18:53:28 2012
@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import org.apache.camel.NoFactoryAvailableException;
 import org.apache.camel.spi.ClassResolver;
@@ -37,7 +38,7 @@ import org.apache.camel.util.IOHelper;
  */
 public class DefaultFactoryFinder implements FactoryFinder {
 
-    protected final ConcurrentHashMap<String, Class<?>> classMap = new ConcurrentHashMap<String, Class<?>>();
+    protected final ConcurrentMap<String, Class<?>> classMap = new ConcurrentHashMap<String, Class<?>>();
     private final ClassResolver classResolver;
     private final String path;
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java Mon Mar  5 18:53:28 2012
@@ -17,6 +17,7 @@
 package org.apache.camel.impl;
 
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.camel.Endpoint;
@@ -36,7 +37,7 @@ public class DefaultInflightRepository e
     private static final transient Logger LOG = LoggerFactory.getLogger(DefaultInflightRepository.class);
     private final AtomicInteger totalCount = new AtomicInteger();
     // use endpoint key as key so endpoints with lenient properties is registered using the same key (eg dynamic http endpoints)
-    private final ConcurrentHashMap<String, AtomicInteger> endpointCount = new ConcurrentHashMap<String, AtomicInteger>();
+    private final ConcurrentMap<String, AtomicInteger> endpointCount = new ConcurrentHashMap<String, AtomicInteger>();
 
     public void add(Exchange exchange) {
         int count = totalCount.incrementAndGet();

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java Mon Mar  5 18:53:28 2012
@@ -21,6 +21,7 @@ import java.util.Collection;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import org.apache.camel.spi.ServicePool;
 import org.apache.camel.support.ServiceSupport;
@@ -35,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public abstract class DefaultServicePool<Key, Service> extends ServiceSupport implements ServicePool<Key, Service> {
     protected final Logger log = LoggerFactory.getLogger(getClass());
-    protected final ConcurrentHashMap<Key, BlockingQueue<Service>> pool = new ConcurrentHashMap<Key, BlockingQueue<Service>>();
+    protected final ConcurrentMap<Key, BlockingQueue<Service>> pool = new ConcurrentHashMap<Key, BlockingQueue<Service>>();
     protected int capacity = 100;
 
     protected DefaultServicePool() {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java Mon Mar  5 18:53:28 2012
@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.spi.ExecutorServiceManager;
 import org.apache.camel.spi.RouteContext;
 import org.apache.camel.spi.ThreadPoolProfile;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java Mon Mar  5 18:53:28 2012
@@ -21,7 +21,7 @@ import java.util.List;
 
 public abstract class WeightedLoadBalancer extends QueueLoadBalancer {
     private List<Integer> distributionRatioList = new ArrayList<Integer>();
-    private ArrayList<DistributionRatio> runtimeRatios = new ArrayList<DistributionRatio>();
+    private List<DistributionRatio> runtimeRatios = new ArrayList<DistributionRatio>();
     
     public WeightedLoadBalancer(List<Integer> distributionRatios) {
         deepCloneDistributionRatios(distributionRatios);
@@ -77,7 +77,7 @@ public abstract class WeightedLoadBalanc
         this.distributionRatioList = distributionRatioList;
     }
 
-    public ArrayList<DistributionRatio> getRuntimeRatios() {
+    public List<DistributionRatio> getRuntimeRatios() {
         return runtimeRatios;
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java Mon Mar  5 18:53:28 2012
@@ -338,7 +338,7 @@ public final class EndpointHelper {
                 return Arrays.asList(elementType.cast(bean));
             }
         } else { // more than one list element
-            ArrayList<T> result = new ArrayList<T>(elements.size());
+            List<T> result = new ArrayList<T>(elements.size());
             for (String element : elements) {
                 result.add(resolveReferenceParameter(context, element.trim(), elementType));
             }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java Mon Mar  5 18:53:28 2012
@@ -25,7 +25,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -272,7 +271,7 @@ public final class IntrospectionSupport 
     public static Map<String, Object> extractProperties(Map<String, Object> properties, String optionPrefix) {
         ObjectHelper.notNull(properties, "properties");
 
-        HashMap<String, Object> rc = new LinkedHashMap<String, Object>(properties.size());
+        Map<String, Object> rc = new LinkedHashMap<String, Object>(properties.size());
 
         for (Iterator<Map.Entry<String, Object>> it = properties.entrySet().iterator(); it.hasNext();) {
             Map.Entry<String, Object> entry = it.next();

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java Mon Mar  5 18:53:28 2012
@@ -17,6 +17,7 @@
 package org.apache.camel.builder;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
@@ -33,7 +34,7 @@ import org.apache.camel.processor.Delega
  */
 public class BuilderWithScopesTest extends TestSupport {
 
-    final ArrayList<String> order = new ArrayList<String>();
+    final List<String> order = new ArrayList<String>();
     final DelegateProcessor interceptor1 = new DelegateProcessor() {
         @Override
         public void process(Exchange exchange) throws Exception {
@@ -82,11 +83,11 @@ public class BuilderWithScopesTest exten
         }
     };
 
-    protected void runTest(RouteBuilder builder, ArrayList<String> expected) throws Exception {
+    protected void runTest(RouteBuilder builder, List<String> expected) throws Exception {
         runTest(builder, expected, null);
     }
 
-    protected void runTest(RouteBuilder builder, ArrayList<String> expected, String header) throws Exception {
+    protected void runTest(RouteBuilder builder, List<String> expected, String header) throws Exception {
 
         order.clear();
         CamelContext container = new DefaultCamelContext();
@@ -110,7 +111,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithFilterEnd() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("TO");
 
         runTest(new RouteBuilder() {
@@ -124,7 +125,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithFilterNoEnd() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
 
         runTest(new RouteBuilder() {
             public void configure() {
@@ -149,7 +150,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithChoice1() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("INVOKED");
         expected.add("TO");
 
@@ -157,7 +158,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithChoice2() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("INVOKED2");
         expected.add("TO");
 
@@ -165,14 +166,14 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithChoice3() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("TO");
 
         runTest(createChoiceBuilder(), expected, "banana");
     }
 
     public void testRouteWithChoiceNoEnd() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("INVOKED");
 
         runTest(new RouteBuilder() {
@@ -198,7 +199,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithChoiceOtherwise1() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("INVOKED");
         expected.add("TO");
 
@@ -206,7 +207,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithChoiceOtherwise2() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("INVOKED2");
         expected.add("TO");
 
@@ -214,14 +215,14 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithChoiceOtherwise3() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("INVOKED3");
         expected.add("TO");
         runTest(createChoiceWithOtherwiseBuilder(), expected, "banana");
     }
 
     public void testRouteWithChoiceOtherwiseNoEnd() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("INVOKED");
 
         runTest(new RouteBuilder() {
@@ -251,7 +252,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithTryCatchNoEndNoException() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("VALIDATE");
         expected.add("TO");
 
@@ -259,7 +260,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithTryCatchNoEndWithCaughtException() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("VALIDATE");
         expected.add("INVOKED");
         expected.add("INVOKED3");
@@ -268,7 +269,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithTryCatchNoEndWithUncaughtException() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("VALIDATE");
 
         runTest(createTryCatchNoEnd(), expected);
@@ -284,7 +285,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithTryCatchEndNoException() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("VALIDATE");
         expected.add("TO");
         expected.add("INVOKED3");
@@ -293,7 +294,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithTryCatchEndWithCaughtException() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("VALIDATE");
         expected.add("INVOKED");
         expected.add("INVOKED3");
@@ -302,7 +303,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithTryCatchEndWithUncaughtException() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("VALIDATE");
 
         runTest(createTryCatchEnd(), expected);
@@ -319,7 +320,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithTryCatchFinallyNoEndNoException() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("VALIDATE");
         expected.add("TO");
         expected.add("INVOKED2");
@@ -329,7 +330,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithTryCatchFinallyNoEndWithCaughtException() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("VALIDATE");
         expected.add("INVOKED");
         expected.add("INVOKED2");
@@ -339,7 +340,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithTryCatchFinallyNoEndWithUncaughtException() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("VALIDATE");
         expected.add("INVOKED2");
         expected.add("INVOKED3");
@@ -358,7 +359,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithTryCatchFinallyEndNoException() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("VALIDATE");
         expected.add("TO");
         expected.add("INVOKED2");
@@ -368,7 +369,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithTryCatchFinallyEndWithCaughtException() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("VALIDATE");
         expected.add("INVOKED");
         expected.add("INVOKED2");
@@ -378,7 +379,7 @@ public class BuilderWithScopesTest exten
     }
 
     public void testRouteWithTryCatchFinallyEndWithUncaughtException() throws Exception {
-        ArrayList<String> expected = new ArrayList<String>();
+        List<String> expected = new ArrayList<String>();
         expected.add("VALIDATE");
         expected.add("INVOKED2");
 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java Mon Mar  5 18:53:28 2012
@@ -19,6 +19,7 @@ package org.apache.camel.builder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -43,7 +44,7 @@ public class ExpressionBuilderTest exten
     
     public void testRegexTokenize() throws Exception {
         Expression expression = regexTokenizeExpression(headerExpression("location"), ",");
-        ArrayList<String> expected = new ArrayList<String>(Arrays.asList(new String[] {"Islington", "London", "UK"}));
+        List<String> expected = new ArrayList<String>(Arrays.asList(new String[] {"Islington", "London", "UK"}));
         assertExpression(expression, exchange, expected);
 
         Predicate predicate = contains(regexTokenizeExpression(headerExpression("location"), ","),
@@ -67,7 +68,7 @@ public class ExpressionBuilderTest exten
     public void testTokenize() throws Exception {
         Expression expression = tokenizeExpression(headerExpression("location"), ",");
 
-        ArrayList<String> expected = new ArrayList<String>(Arrays.asList(new String[] {"Islington", "London", "UK"}));
+        List<String> expected = new ArrayList<String>(Arrays.asList(new String[] {"Islington", "London", "UK"}));
         assertExpression(expression, exchange, expected);
 
         Predicate predicate = contains(tokenizeExpression(headerExpression("location"), ","),
@@ -83,7 +84,7 @@ public class ExpressionBuilderTest exten
         Expression expression = regexTokenizeExpression(bodyExpression(), "[\r|\n]");
         exchange.getIn().setBody("Hello World\nBye World\rSee you again");
 
-        ArrayList<String> expected = new ArrayList<String>(Arrays.asList(new String[] {"Hello World", "Bye World", "See you again"}));
+        List<String> expected = new ArrayList<String>(Arrays.asList(new String[] {"Hello World", "Bye World", "See you again"}));
         assertExpression(expression, exchange, expected);
     }
 
@@ -91,7 +92,7 @@ public class ExpressionBuilderTest exten
         Expression expression = sortExpression(body().tokenize(",").getExpression(), new SortByName());
         exchange.getIn().setBody("Jonathan,Claus,James,Hadrian");
 
-        ArrayList<String> expected = new ArrayList<String>(Arrays.asList(new String[] {"Claus", "Hadrian", "James", "Jonathan"}));
+        List<String> expected = new ArrayList<String>(Arrays.asList(new String[] {"Claus", "Hadrian", "James", "Jonathan"}));
         assertExpression(expression, exchange, expected);
     }
     

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateUnknownExecutorServiceRefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateUnknownExecutorServiceRefTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateUnknownExecutorServiceRefTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateUnknownExecutorServiceRefTest.java Mon Mar  5 18:53:28 2012
@@ -18,7 +18,6 @@ package org.apache.camel.processor.aggre
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.FailedToCreateRouteException;
-import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.BodyInAggregatingStrategy;
 

Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java Mon Mar  5 18:53:28 2012
@@ -451,7 +451,7 @@ public class BindyCsvFactory extends Bin
                 // Will be used during generation of CSV
                 isOneToMany = true;
 
-                ArrayList<?> list = (ArrayList<?>)field.get(obj);
+                List<?> list = (List<?>)field.get(obj);
                 if (list != null) {
 
                     Iterator<?> it = list.iterator();

Modified: camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContainerBeanManagerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContainerBeanManagerTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContainerBeanManagerTest.java (original)
+++ camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContainerBeanManagerTest.java Mon Mar  5 18:53:28 2012
@@ -80,7 +80,7 @@ public class CdiContainerBeanManagerTest
 
         Exchange exchange = resultEndpoint.getExchanges().get(0);
         List<?> results = exchange.getIn().getBody(List.class);
-        ArrayList<Item> expected = itemsExpected();
+        List<Item> expected = itemsExpected();
         assertNotNull(results);
         assertNotNull(expected);
         assertEquals(expected.size(), results.size());
@@ -98,8 +98,8 @@ public class CdiContainerBeanManagerTest
         assertNotNull(results);
     }
 
-    private ArrayList<Item> itemsExpected() {
-        ArrayList<Item> products = new ArrayList<Item>();
+    private List<Item> itemsExpected() {
+        List<Item> products = new ArrayList<Item>();
         for (int i = 1; i < 10; i++) {
             products.add(new Item("Item-" + i, 1500L * i));
         }

Modified: camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java (original)
+++ camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java Mon Mar  5 18:53:28 2012
@@ -171,7 +171,7 @@ public class DozerTypeConverterLoader im
         mapper.addMapping(beanMappingBuilder);
         MappingFileData mappingFileData = beanMappingBuilder.build();
         TypeConverterRegistry registry = camelContext.getTypeConverterRegistry();
-        ArrayList<ClassMap> classMaps = new ArrayList<ClassMap>();
+        List<ClassMap> classMaps = new ArrayList<ClassMap>();
         classMaps.addAll(mappingFileData.getClassMaps());
         registerClassMaps(registry, mapper, classMaps);
     }

Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java Mon Mar  5 18:53:28 2012
@@ -18,6 +18,7 @@ package org.apache.camel.component.http;
 
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -45,7 +46,7 @@ public class CamelServlet extends HttpSe
      */
     private String servletName;
 
-    private ConcurrentHashMap<String, HttpConsumer> consumers = new ConcurrentHashMap<String, HttpConsumer>();
+    private ConcurrentMap<String, HttpConsumer> consumers = new ConcurrentHashMap<String, HttpConsumer>();
    
     @Override
     public void init(ServletConfig config) throws ServletException {

Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/CamelServlet.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/CamelServlet.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/CamelServlet.java (original)
+++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/CamelServlet.java Mon Mar  5 18:53:28 2012
@@ -18,6 +18,7 @@ package org.apache.camel.component.http4
 
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -36,7 +37,7 @@ public class CamelServlet extends HttpSe
 
     private static final long serialVersionUID = -7061982839117697829L;
 
-    private ConcurrentHashMap<String, HttpConsumer> consumers = new ConcurrentHashMap<String, HttpConsumer>();
+    private ConcurrentMap<String, HttpConsumer> consumers = new ConcurrentHashMap<String, HttpConsumer>();
    
     @Override
     protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java Mon Mar  5 18:53:28 2012
@@ -405,7 +405,7 @@ public class IrcConfiguration implements
             
             // Remove unneeded '#' channel prefixes per convention
             // and replace ',' separators and merge channel and key using convention "channel!key"
-            ArrayList<String> cl = new ArrayList<String>();
+            List<String> cl = new ArrayList<String>();
             String channels = (String)parameters.get("channels");
             String keys =  (String)parameters.get("keys");
             keys = keys == null ? keys : keys + " ";    // if @keys ends with a ',' it will miss the last empty key after split(",")

Modified: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteKeyOrderingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteKeyOrderingTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteKeyOrderingTest.java (original)
+++ camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteKeyOrderingTest.java Mon Mar  5 18:53:28 2012
@@ -50,7 +50,7 @@ public class JdbcRouteKeyOrderingTest ex
             assertNotNull(out);
             assertNotNull(out.getOut());
             List<Map<String, Object>> rowList = out.getOut().getBody(List.class);
-            assertNotNull("out body could not be converted to an ArrayList - was: "
+            assertNotNull("out body could not be converted to a List - was: "
                 + out.getOut().getBody(), rowList);
             assertEquals(3, rowList.size());
             

Modified: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java (original)
+++ camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java Mon Mar  5 18:53:28 2012
@@ -16,8 +16,9 @@
  */
 package org.apache.camel.component.jdbc;
 
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
@@ -49,10 +50,10 @@ public class JdbcRouteTest extends Abstr
         // assertions of the response
         assertNotNull(out);
         assertNotNull(out.getOut());
-        ArrayList<HashMap<String, Object>> data = out.getOut().getBody(ArrayList.class);
+        List<HashMap<String, Object>> data = out.getOut().getBody(List.class);
         assertNotNull(data);
         assertEquals(3, data.size());
-        HashMap<String, Object> row = data.get(0);
+        Map<String, Object> row = data.get(0);
         assertEquals("cust1", row.get("ID"));
         assertEquals("jstrachan", row.get("NAME"));
         row = data.get(1);

Modified: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteUsingSqlSelectAliasTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteUsingSqlSelectAliasTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteUsingSqlSelectAliasTest.java (original)
+++ camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteUsingSqlSelectAliasTest.java Mon Mar  5 18:53:28 2012
@@ -16,8 +16,9 @@
  */
 package org.apache.camel.component.jdbc;
 
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
@@ -42,11 +43,11 @@ public class JdbcRouteUsingSqlSelectAlia
         // assertions of the response
         assertNotNull(out);
         assertNotNull(out.getOut());
-        ArrayList<HashMap<String, Object>> data = out.getOut().getBody(ArrayList.class);
-        assertNotNull("out body could not be converted to an ArrayList - was: "
+        List<HashMap<String, Object>> data = out.getOut().getBody(List.class);
+        assertNotNull("out body could not be converted to a List - was: "
             + out.getOut().getBody(), data);
         assertEquals(3, data.size());
-        HashMap<String, Object> row = data.get(0);
+        Map<String, Object> row = data.get(0);
         assertEquals("cust1", row.get("IDENTIFIER"));
         assertEquals("jstrachan", row.get("NAME"));
         row = data.get(1);

Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java Mon Mar  5 18:53:28 2012
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import javax.activation.DataHandler;
 import javax.activation.DataSource;
@@ -89,7 +90,7 @@ public class MailBinding {
             replyTo = endpoint.getConfiguration().getReplyTo();
         }
         if (replyTo != null) {
-            ArrayList<InternetAddress> replyToAddresses = new ArrayList<InternetAddress>();
+            List<InternetAddress> replyToAddresses = new ArrayList<InternetAddress>();
             for (String reply : splitRecipients(replyTo)) {
                 replyToAddresses.add(asEncodedInternetAddress(reply.trim(), determineCharSet(endpoint.getConfiguration(), exchange)));
             }
@@ -567,7 +568,7 @@ public class MailBinding {
 
     private static void appendRecipientToMimeMessage(MimeMessage mimeMessage, MailConfiguration configuration, Exchange exchange,
                                                      String type, String recipient) throws MessagingException, IOException {
-        ArrayList<InternetAddress> recipientsAddresses = new ArrayList<InternetAddress>();
+        List<InternetAddress> recipientsAddresses = new ArrayList<InternetAddress>();
         for (String line : splitRecipients(recipient)) {
             recipientsAddresses.add(asEncodedInternetAddress(line.trim(), determineCharSet(configuration, exchange)));
         }

Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java Mon Mar  5 18:53:28 2012
@@ -18,6 +18,7 @@ package org.apache.camel.component.mail;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.mail.Address;
 import javax.mail.Message;
@@ -44,7 +45,7 @@ public class MailRouteTest extends Camel
         MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
         resultEndpoint.expectedBodiesReceived("hello world!");
 
-        HashMap<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<String, Object>();
         headers.put("reply-to", "route-test-reply@localhost");
         template.sendBodyAndHeaders("smtp://route-test-james@localhost", "hello world!", headers);
 

Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java Mon Mar  5 18:53:28 2012
@@ -17,6 +17,7 @@
 package org.apache.camel.component.mail.security;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.net.ssl.SSLHandshakeException;
 
@@ -68,7 +69,7 @@ public class SslContextParametersMailRou
         MockEndpoint resultEndpoint = getMockEndpoint("mock:in");
         resultEndpoint.expectedBodiesReceived("Test Email Body\r\n");
 
-        HashMap<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<String, Object>();
         headers.put("To", email);
         headers.put("From", email);
         headers.put("Reply-to", email);
@@ -93,7 +94,7 @@ public class SslContextParametersMailRou
         
         context.start();
 
-        HashMap<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<String, Object>();
         headers.put("To", email);
         headers.put("From", email);
         headers.put("Reply-to", email);

Modified: camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java (original)
+++ camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java Mon Mar  5 18:53:28 2012
@@ -17,6 +17,7 @@
 package org.apache.camel.component.mongodb;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import com.mongodb.DBObject;
 import com.mongodb.WriteResult;
@@ -34,8 +35,8 @@ public class MongoDbConversionsTest exte
     public void testInsertMap() throws InterruptedException {
         assertEquals(0, testCollection.count());
         
-        HashMap<String, Object> m1 = new HashMap<String, Object>();
-        HashMap<String, String> m1Nested = new HashMap<String, String>();
+        Map<String, Object> m1 = new HashMap<String, Object>();
+        Map<String, String> m1Nested = new HashMap<String, String>();
 
         m1Nested.put("nested1", "nestedValue1");
         m1Nested.put("nested2", "nestedValue2");

Modified: camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java (original)
+++ camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java Mon Mar  5 18:53:28 2012
@@ -17,6 +17,7 @@
 package org.apache.camel.component.mongodb;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
@@ -44,7 +45,7 @@ public class MongoDbDynamicityTest exten
         assertFalse("The otherDB database should not exist", mongo.getDatabaseNames().contains("otherDB"));
 
         String body = "{\"_id\": \"testInsertDynamicityDisabled\", \"a\" : \"1\"}";
-        HashMap<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<String, Object>();
         headers.put(MongoDbConstants.DATABASE, "otherDB");
         headers.put(MongoDbConstants.COLLECTION, "otherCollection");
         Object result = template.requestBodyAndHeaders("direct:noDynamicity", body, headers);
@@ -71,7 +72,7 @@ public class MongoDbDynamicityTest exten
         assertFalse("The otherDB database should not exist", mongo.getDatabaseNames().contains("otherDB"));
 
         String body = "{\"_id\": \"testInsertDynamicityEnabledDBOnly\", \"a\" : \"1\"}";
-        HashMap<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<String, Object>();
         headers.put(MongoDbConstants.DATABASE, "otherDB");
         Object result = template.requestBodyAndHeaders("direct:dynamicityEnabled", body, headers);
         
@@ -96,7 +97,7 @@ public class MongoDbDynamicityTest exten
         assertFalse("The otherDB database should not exist", mongo.getDatabaseNames().contains("otherDB"));
 
         String body = "{\"_id\": \"testInsertDynamicityEnabledCollectionOnly\", \"a\" : \"1\"}";
-        HashMap<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<String, Object>();
         headers.put(MongoDbConstants.COLLECTION, "otherCollection");
         Object result = template.requestBodyAndHeaders("direct:dynamicityEnabled", body, headers);
         
@@ -120,7 +121,7 @@ public class MongoDbDynamicityTest exten
         assertFalse("The otherDB database should not exist", mongo.getDatabaseNames().contains("otherDB"));
 
         String body = "{\"_id\": \"testInsertDynamicityEnabledDBAndCollection\", \"a\" : \"1\"}";
-        HashMap<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<String, Object>();
         headers.put(MongoDbConstants.DATABASE, "otherDB");
         headers.put(MongoDbConstants.COLLECTION, "otherCollection");
         Object result = template.requestBodyAndHeaders("direct:dynamicityEnabled", body, headers);

Modified: camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java (original)
+++ camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java Mon Mar  5 18:53:28 2012
@@ -18,6 +18,7 @@ package org.apache.camel.component.mongo
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.mongodb.BasicDBObjectBuilder;
 import com.mongodb.DBObject;
@@ -98,7 +99,7 @@ public class MongoDbFindOperationTest ex
         int numToSkip = 0;
         final int limit = 100;
         for (int i = 0; i < 10; i++) {
-            HashMap<String, Object> headers = new HashMap<String, Object>();
+            Map<String, Object> headers = new HashMap<String, Object>();
             headers.put(MongoDbConstants.NUM_TO_SKIP, numToSkip);
             headers.put(MongoDbConstants.LIMIT, 100);
             Object result = template.requestBodyAndHeaders("direct:findAll", (Object) null, headers);

Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java Mon Mar  5 18:53:28 2012
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.routepolicy.quartz;
 
-import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.CamelContext;
@@ -109,7 +109,7 @@ public abstract class SpringScheduledRou
     @SuppressWarnings("unchecked")
     private CamelContext startRouteWithPolicy(String policyBeanName) throws Exception {
         CamelContext context = new DefaultCamelContext();
-        ArrayList<RouteDefinition> routes = (ArrayList<RouteDefinition>)applicationContext.getBean("testRouteContext");
+        List<RouteDefinition> routes = (List<RouteDefinition>)applicationContext.getBean("testRouteContext");
         RoutePolicy policy = applicationContext.getBean(policyBeanName, RoutePolicy.class);
         assertTrue(getTestType() == TestType.SIMPLE 
             ? policy instanceof SimpleScheduledRoutePolicy 

Modified: camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java (original)
+++ camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java Mon Mar  5 18:53:28 2012
@@ -19,6 +19,7 @@ package org.apache.camel.component.sip;
 import java.net.URI;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -51,7 +52,6 @@ import org.apache.camel.util.URISupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("unchecked")
 public class SipConfiguration {    
     private static final transient Logger LOG = LoggerFactory.getLogger(SipConfiguration.class);
     private static final String IMPLEMENTATION = "gov.nist";
@@ -93,7 +93,7 @@ public class SipConfiguration {    
     
     private FromHeader fromHeader;
     private ToHeader toHeader;
-    private ArrayList<ViaHeader> viaHeaders;
+    private List<ViaHeader> viaHeaders;
     private ContentTypeHeader contentTypeHeader;
     private CallIdHeader callIdHeader;
     private MaxForwardsHeader maxForwardsHeader;
@@ -229,6 +229,7 @@ public class SipConfiguration {    
         ObjectHelper.notNull(eventId, "Event Id");        
     }    
 
+    @SuppressWarnings("unchecked")
     private void createFactoriesAndHeaders(Map<String, Object> parameters, SipComponent component) throws Exception {
         headerFactory = sipFactory.createHeaderFactory();
         addressFactory = sipFactory.createAddressFactory();
@@ -244,7 +245,7 @@ public class SipConfiguration {    
                 createToHeader();
             }
         }
-        viaHeaders = component.resolveAndRemoveReferenceParameter(parameters, "viaHeaders", ArrayList.class, null);
+        viaHeaders = component.resolveAndRemoveReferenceParameter(parameters, "viaHeaders", List.class, null);
         if (viaHeaders == null) {        
             createViaHeaders();
         }
@@ -618,11 +619,11 @@ public class SipConfiguration {    
         this.toHeader = toHeader;
     }
 
-    public ArrayList<ViaHeader> getViaHeaders() {
+    public List<ViaHeader> getViaHeaders() {
         return viaHeaders;
     }
 
-    public void setViaHeaders(ArrayList<ViaHeader> viaHeaders) {
+    public void setViaHeaders(List<ViaHeader> viaHeaders) {
         this.viaHeaders = viaHeaders;
     }
 

Modified: camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java (original)
+++ camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java Mon Mar  5 18:53:28 2012
@@ -17,6 +17,8 @@
 package org.apache.camel.component.solr;
 
 import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
@@ -38,7 +40,7 @@ public class SolrComponentTestSupport ex
     protected static CommonsHttpSolrServer solrServer;
 
     protected void solrInsertTestEntry() {
-        HashMap<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<String, Object>();
         headers.put(SolrConstants.OPERATION, SolrConstants.OPERATION_INSERT);
         headers.put("SolrField.id", TEST_ID);
         template.sendBodyAndHeaders("direct:start", null, headers);

Modified: camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java (original)
+++ camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java Mon Mar  5 18:53:28 2012
@@ -19,6 +19,7 @@ package org.apache.camel.spring.javaconf
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -96,8 +97,8 @@ public class JavaConfigContextLoader imp
 
         AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 
-        ArrayList<Class<?>> configClasses = new ArrayList<Class<?>>();
-        ArrayList<String> basePackages = new ArrayList<String>();
+        List<Class<?>> configClasses = new ArrayList<Class<?>>();
+        List<String> basePackages = new ArrayList<String>();
         for (String location : locations) {
             // if the location refers to a class, use it. Otherwise assume it's a base package name
             try {

Modified: camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialService.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialService.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialService.java (original)
+++ camel/trunk/examples/camel-example-gauth/src/main/java/org/apache/camel/example/gauth/TutorialService.java Mon Mar  5 18:53:28 2012
@@ -59,7 +59,7 @@ public class TutorialService {
         URL feedUrl = new URL("http://www.google.com/calendar/feeds/default/");
         CalendarFeed resultFeed = calendarService.getFeed(feedUrl, CalendarFeed.class);
 
-        ArrayList<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<String>();
         for (int i = 0; i < resultFeed.getEntries().size(); i++) {
             CalendarEntry entry = resultFeed.getEntries().get(i);
             result.add(entry.getTitle().getPlainText());

Modified: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java (original)
+++ camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java Mon Mar  5 18:53:28 2012
@@ -43,7 +43,7 @@ public class CamelControllerImpl impleme
     }
 
     public List<CamelContext> getCamelContexts() {
-        ArrayList<CamelContext> camelContexts = new ArrayList<CamelContext>();
+        List<CamelContext> camelContexts = new ArrayList<CamelContext>();
         try {
             ServiceReference[] references = bundleContext.getServiceReferences(CamelContext.class.getName(), null);
             if (references != null) {
@@ -78,7 +78,7 @@ public class CamelControllerImpl impleme
                 return context.getRoutes();
             }
         } else {
-            ArrayList<Route> routes = new ArrayList<Route>();
+            List<Route> routes = new ArrayList<Route>();
             List<CamelContext> camelContexts = this.getCamelContexts();
             for (CamelContext camelContext : camelContexts) {
                 for (Route route : camelContext.getRoutes()) {
@@ -98,7 +98,7 @@ public class CamelControllerImpl impleme
                 return context.getRouteDefinitions();
             }
         } else {
-            ArrayList<RouteDefinition> routeDefinitions = new ArrayList<RouteDefinition>();
+            List<RouteDefinition> routeDefinitions = new ArrayList<RouteDefinition>();
             List<CamelContext> camelContexts = this.getCamelContexts();
             for (CamelContext camelContext : camelContexts) {
                 for (RouteDefinition routeDefinition : camelContext.getRouteDefinitions()) {

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java Mon Mar  5 18:53:28 2012
@@ -18,6 +18,7 @@ package org.apache.camel.itest.osgi.mail
 
 import java.io.InputStream;
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.mail.Address;
 import javax.mail.Message;
@@ -54,7 +55,7 @@ public class MailRouteTest extends OSGiI
         MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
         resultEndpoint.expectedBodiesReceived("hello world!");
 
-        HashMap<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<String, Object>();
         headers.put("reply-to", "route-test-reply@localhost");
         template.sendBodyAndHeaders("smtp://route-test-james@localhost", "hello world!", headers);
 

Modified: camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java (original)
+++ camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java Mon Mar  5 18:53:28 2012
@@ -229,7 +229,7 @@ public class EmbeddedMojo extends Abstra
 
     protected String[] createArguments() {
 
-        ArrayList<String> args = new ArrayList<String>(5);
+        List<String> args = new ArrayList<String>(5);
         if (isDotEnabled()) {
             args.add("-outdir");
             args.add(getOutputDirectory());

Modified: camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java?rev=1297170&r1=1297169&r2=1297170&view=diff
==============================================================================
--- camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java (original)
+++ camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java Mon Mar  5 18:53:28 2012
@@ -198,7 +198,7 @@ public class EmbeddedMojo extends Abstra
 
     protected String[] createArguments() {
 
-        ArrayList<String> args = new ArrayList<String>(5);
+        List<String> args = new ArrayList<String>(5);
         if (isDotEnabled()) {
             args.add("-outdir");
             args.add(getOutputDirectory());



Mime
View raw message