Updated Branches: refs/heads/master ba08604dc -> 1e513ecf0
Polished. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1e513ecf Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1e513ecf Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1e513ecf Branch: refs/heads/master Commit: 1e513ecf0268edb1a0e24a18d21622110d4e2b50 Parents: ba08604 Author: Babak Vahdat <bvah...@apache.org> Authored: Wed Jul 10 22:06:28 2013 +0200 Committer: Babak Vahdat <bvah...@apache.org> Committed: Wed Jul 10 22:06:28 2013 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/builder/xml/XPathBuilder.java | 2 +- .../main/java/org/apache/camel/impl/DefaultCamelContext.java | 2 +- .../src/main/java/org/apache/camel/impl/osgi/Activator.java | 2 +- .../org/apache/camel/processor/DefaultExchangeFormatter.java | 2 +- .../org/apache/camel/component/aws/ddb/ScanCommandTest.java | 2 +- .../apache/camel/dataformat/bindy/BindyFixedLengthFactory.java | 2 +- .../headerfooter/BindySimpleFixedLengthHeaderFooterTest.java | 5 +++-- .../skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java | 3 ++- .../org/apache/camel/component/jmx/JMXObjectPropertiesTest.java | 3 ++- .../camel/component/routebox/RouteboxDispatchMapTest.java | 3 ++- .../apache/camel/component/sjms/SjmsExchangeMessageHelper.java | 4 ++-- .../java/org/apache/camel/component/redis/RedisHashTest.java | 3 ++- .../java/org/apache/camel/component/redis/RedisKeyTest.java | 3 ++- .../java/org/apache/camel/component/redis/RedisStringTest.java | 5 +++-- 14 files changed, 24 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java index 433cd84..967aa05 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java +++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java @@ -827,7 +827,7 @@ public class XPathBuilder extends ServiceSupport implements Expression, Predicat } private void logDiscoveredNamespaces(NodeList namespaces) { - HashMap<String, HashSet<String>> map = new LinkedHashMap<String, HashSet<String>>(); + Map<String, HashSet<String>> map = new LinkedHashMap<String, HashSet<String>>(); for (int i = 0; i < namespaces.getLength(); i++) { Node n = namespaces.item(i); if (n.getNodeName().equals("xmlns:xml")) { http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java index f536bc7..9063095 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java @@ -398,7 +398,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon } public Map<String, Endpoint> getEndpointMap() { - TreeMap<String, Endpoint> answer = new TreeMap<String, Endpoint>(); + Map<String, Endpoint> answer = new TreeMap<String, Endpoint>(); for (Map.Entry<EndpointKey, Endpoint> entry : endpoints.entrySet()) { answer.put(entry.getKey().get(), entry.getValue()); } http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java index 79799a0..9efccae 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java +++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java @@ -423,7 +423,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer { } protected void doRegister(Class<?> type, String key, Object value) { - Hashtable<String, Object> props = new Hashtable<String, Object>(); + Dictionary<String, Object> props = new Hashtable<String, Object>(); props.put(key, value); doRegister(type, props); } http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java index 7666253..c67ec79 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java +++ b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java @@ -357,7 +357,7 @@ public class DefaultExchangeFormatter implements ExchangeFormatter { } private static Map<String, Object> sortMap(Map<String, Object> map) { - TreeMap<String, Object> answer = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER); + Map<String, Object> answer = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER); answer.putAll(map); return answer; } http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java index 44a7eb9..0b2379d 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java @@ -51,7 +51,7 @@ public class ScanCommandTest { @Test public void execute() { - HashMap<String, Condition> scanFilter = new HashMap<String, Condition>(); + Map<String, Condition> scanFilter = new HashMap<String, Condition>(); Condition condition = new Condition() .withComparisonOperator(ComparisonOperator.GT.toString()) .withAttributeValueList(new AttributeValue().withN("1985")); http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java index 0f9f62a..662dd18 100644 --- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java +++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java @@ -319,7 +319,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin } // Convert Map<Integer, List> into List<List> - TreeMap<Integer, List<String>> sortValues = new TreeMap<Integer, List<String>>(results); + Map<Integer, List<String>> sortValues = new TreeMap<Integer, List<String>>(results); for (Entry<Integer, List<String>> entry : sortValues.entrySet()) { // Get list of values http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java index 9f2f13c..a268a37 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.apache.camel.EndpointInject; @@ -127,7 +128,7 @@ public class BindySimpleFixedLengthHeaderFooterTest extends CamelTestSupport { calendar.set(2009, 7, 1, 0, 0, 0); order.setOrderDate(calendar.getTime()); - ArrayList<Map<String, Object>> input = new ArrayList<Map<String, Object>>(); + List<Map<String, Object>> input = new ArrayList<Map<String, Object>>(); Map<String, Object> bodyRow = new HashMap<String, Object>(); bodyRow.put(Order.class.getName(), order); input.add(createHeaderRow()); @@ -162,7 +163,7 @@ public class BindySimpleFixedLengthHeaderFooterTest extends CamelTestSupport { calendar.set(2009, 7, 1, 0, 0, 0); order.setOrderDate(calendar.getTime()); - ArrayList<Map<String, Object>> input = new ArrayList<Map<String, Object>>(); + List<Map<String, Object>> input = new ArrayList<Map<String, Object>>(); Map<String, Object> bodyRow = new HashMap<String, Object>(); bodyRow.put(Order.class.getName(), order); http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java index 868718c..4feaa3a 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.apache.camel.EndpointInject; @@ -109,7 +110,7 @@ public class BindyFixedLengthHeaderFooterSkipHeaderTest extends CamelTestSupport calendar.set(2009, 7, 1); order.setOrderDate(calendar.getTime()); - ArrayList<Map<String, Object>> input = new ArrayList<Map<String, Object>>(); + List<Map<String, Object>> input = new ArrayList<Map<String, Object>>(); Map<String, Object> bodyRow = new HashMap<String, Object>(); bodyRow.put(Order.class.getName(), order); input.add(createHeaderRow()); http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXObjectPropertiesTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXObjectPropertiesTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXObjectPropertiesTest.java index ed96547..7760d52 100644 --- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXObjectPropertiesTest.java +++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXObjectPropertiesTest.java @@ -17,6 +17,7 @@ package org.apache.camel.component.jmx; import java.util.Hashtable; +import java.util.Map; import org.apache.camel.component.jmx.beans.ISimpleMXBean; import org.junit.Test; @@ -40,7 +41,7 @@ public class JMXObjectPropertiesTest extends SimpleBeanFixture { @Override protected void initRegistry() { - Hashtable<String, String> ht = new Hashtable<String, String>(); + Map<String, String> ht = new Hashtable<String, String>(); ht.put("name", "simpleBean"); getRegistry().put("myTable", ht); } http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java ---------------------------------------------------------------------- diff --git a/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java b/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java index f4fec9d..86b06b2 100644 --- a/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java +++ b/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java @@ -19,6 +19,7 @@ package org.apache.camel.component.routebox; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; @@ -49,7 +50,7 @@ public class RouteboxDispatchMapTest extends RouteboxDemoTestSupport { registry.bind("routes", routes); // Wire a dispatch map to registry - HashMap<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<String, String>(); map.put("addToCatalog", "seda:addToCatalog"); map.put("findBook", "seda:findBook"); registry.bind("map", map); http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java index a5637fc..d492183 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java @@ -93,7 +93,7 @@ public final class SjmsExchangeMessageHelper { bodyMessage.setBody(result); break; case Map: - HashMap<String, Object> body = new HashMap<String, Object>(); + Map<String, Object> body = new HashMap<String, Object>(); MapMessage mapMessage = (MapMessage)message; Enumeration<String> names = mapMessage.getMapNames(); while (names.hasMoreElements()) { @@ -428,7 +428,7 @@ public final class SjmsExchangeMessageHelper { @SuppressWarnings("unchecked") public static Exchange setJmsMessageHeaders(final Message jmsMessage, final Exchange exchange, boolean out) throws JMSException { - HashMap<String, Object> headers = new HashMap<String, Object>(); + Map<String, Object> headers = new HashMap<String, Object>(); if (jmsMessage != null) { // lets populate the standard JMS message headers try { http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java index aa0a2dd..4d14205 100755 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import org.apache.camel.impl.JndiRegistry; @@ -109,7 +110,7 @@ public class RedisHashTest extends RedisTestSupport { @Test public void shouldExecuteHMSET() throws Exception { - HashMap<String, String> values = new HashMap<String, String>(); + Map<String, String> values = new HashMap<String, String>(); values.put("field1", "value1"); values.put("field2", "value"); http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java index 30949ba..a8decce 100755 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.HashSet; +import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -210,7 +211,7 @@ public class RedisKeyTest extends RedisTestSupport { @Test public void shouldExecuteSORT() throws Exception { - ArrayList<Integer> list = new ArrayList<Integer>(); + List<Integer> list = new ArrayList<Integer>(); list.add(5); when(redisTemplate.sort(any(SortQuery.class))).thenReturn(list); http://git-wip-us.apache.org/repos/asf/camel/blob/1e513ecf/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java index 43b74b4..a68c3e5 100755 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java @@ -19,6 +19,7 @@ package org.apache.camel.component.redis; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; import org.apache.camel.impl.JndiRegistry; @@ -249,7 +250,7 @@ public class RedisStringTest extends RedisTestSupport { @Test public void shouldExecuteMSET() throws Exception { - HashMap<String, String> values = new HashMap<String, String>(); + Map<String, String> values = new HashMap<String, String>(); values.put("field1", "valu1"); sendHeaders( @@ -262,7 +263,7 @@ public class RedisStringTest extends RedisTestSupport { @Test public void shouldExecuteMSETNX() throws Exception { - HashMap<String, String> values = new HashMap<String, String>(); + Map<String, String> values = new HashMap<String, String>(); values.put("field1", "valu1"); sendHeaders(
