Author: hadrian
Date: Wed Nov 11 06:15:26 2009
New Revision: 834779
URL: http://svn.apache.org/viewvc?rev=834779&view=rev
Log:
Long running effort to remove warnings. Just shy of 3300.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.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/ObjectHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/PatternBasedPackageScanFilterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/ScanTestSupport.java
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomComponent.java
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedComponent.java
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapComponent.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java
camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java
camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisComponent.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptEvaluationException.java
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/DirectComponent.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
Wed Nov 11 06:15:26 2009
@@ -50,7 +50,7 @@
* Converts a collection to an array
*/
@Converter
- public static Object[] toArray(Collection value) {
+ public static Object[] toArray(Collection<?> value) {
if (value == null) {
return null;
}
@@ -61,7 +61,7 @@
* Converts an array to a collection
*/
@Converter
- public static List toList(Object[] array) {
+ public static List<Object> toList(Object[] array) {
return Arrays.asList(array);
}
@@ -69,18 +69,16 @@
* Converts a collection to a List if it is not already
*/
@Converter
- @SuppressWarnings("unchecked")
- public static List toList(Collection collection) {
- return new ArrayList(collection);
+ public static <T> List<T> toList(Collection<T> collection) {
+ return new ArrayList<T>(collection);
}
/**
* Converts an {...@link Iterator} to a {...@link ArrayList}
*/
@Converter
- @SuppressWarnings("unchecked")
- public static ArrayList toArrayList(Iterator it) {
- ArrayList list = new ArrayList();
+ public static <T> ArrayList<T> toArrayList(Iterator<T> it) {
+ ArrayList<T> list = new ArrayList<T>();
while (it.hasNext()) {
list.add(it.next());
}
@@ -88,42 +86,37 @@
}
@Converter
- @SuppressWarnings("unchecked")
- public static Set toSet(Object[] array) {
- Set answer = new HashSet();
+ public static Set<Object> toSet(Object[] array) {
+ Set<Object> answer = new HashSet<Object>();
answer.addAll(Arrays.asList(array));
return answer;
}
@Converter
- @SuppressWarnings("unchecked")
- public static Set toSet(Collection collection) {
- return new HashSet(collection);
+ public static <T> Set<T> toSet(Collection<T> collection) {
+ return new HashSet<T>(collection);
}
@Converter
- public static Set toSet(Map map) {
+ public static <K, V> Set<Map.Entry<K, V>> toSet(Map<K, V> map) {
return map.entrySet();
}
@Converter
- @SuppressWarnings("unchecked")
- public static Properties toProperties(Map map) {
+ public static Properties toProperties(Map<Object, Object> map) {
Properties answer = new Properties();
answer.putAll(map);
return answer;
}
@Converter
- @SuppressWarnings("unchecked")
- public static Hashtable toHashtable(Map map) {
- return new Hashtable(map);
+ public static <K, V> Hashtable<K, V> toHashtable(Map<? extends K, ?
extends V> map) {
+ return new Hashtable<K, V>(map);
}
@Converter
- @SuppressWarnings("unchecked")
- public static HashMap toHashMap(Map map) {
- return new HashMap(map);
+ public static <K, V> HashMap<K, V> toHashMap(Map<? extends K, ? extends
V> map) {
+ return new HashMap<K, V> (map);
}
/**
@@ -131,12 +124,12 @@
*/
@Converter
@SuppressWarnings("unchecked")
- public static List toList(Iterable iterable) {
+ public static <T> List<T> toList(Iterable<T> iterable) {
if (iterable instanceof List) {
return (List) iterable;
}
- List result = new LinkedList();
- for (Object value : iterable) {
+ List<T> result = new LinkedList<T>();
+ for (T value : iterable) {
result.add(value);
}
return result;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
Wed Nov 11 06:15:26 2009
@@ -68,7 +68,7 @@
if (idx > 0) {
path = path.substring(0, idx);
}
- Map parameters = URISupport.parseParameters(u);
+ Map<String, Object> parameters = URISupport.parseParameters(u);
validateURI(uri, path, parameters);
@@ -107,7 +107,7 @@
* @param parameters the remaining parameters after the endpoint has been
created and parsed the parameters
* @throws Exception can be thrown to indicate error creating the endpoint
*/
- protected void afterConfiguration(String uri, String remaining, Endpoint
endpoint, Map parameters) throws Exception {
+ protected void afterConfiguration(String uri, String remaining, Endpoint
endpoint, Map<String, Object> parameters) throws Exception {
// noop
}
@@ -214,7 +214,7 @@
* @return a newly created endpoint or null if the endpoint cannot be
* created based on the inputs
*/
- protected abstract Endpoint createEndpoint(String uri, String remaining,
Map parameters)
+ protected abstract Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters)
throws Exception;
/**
@@ -223,7 +223,7 @@
* @param bean the bean
* @param parameters properties to set
*/
- protected void setProperties(Object bean, Map parameters) throws Exception
{
+ protected void setProperties(Object bean, Map<String, Object> parameters)
throws Exception {
// set reference properties first as they use # syntax that fools the
regular properties setter
EndpointHelper.setReferenceProperties(getCamelContext(), bean,
parameters);
EndpointHelper.setProperties(getCamelContext(), bean, parameters);
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/HeaderFilterStrategyComponent.java
Wed Nov 11 06:15:26 2009
@@ -45,5 +45,4 @@
((HeaderFilterStrategyAware)endpoint).setHeaderFilterStrategy(headerFilterStrategy);
}
}
-
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
Wed Nov 11 06:15:26 2009
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -126,5 +127,4 @@
return sb.toString();
}
-
}
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=834779&r1=834778&r2=834779&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
Wed Nov 11 06:15:26 2009
@@ -148,7 +148,7 @@
* @param parameters parameters
* @throws Exception is thrown if setting property fails
*/
- public static void setProperties(CamelContext context, Object bean, Map
parameters) throws Exception {
+ public static void setProperties(CamelContext context, Object bean,
Map<String, Object> parameters) throws Exception {
IntrospectionSupport.setProperties(context.getTypeConverter(), bean,
parameters);
}
@@ -164,16 +164,15 @@
* @throws Exception is thrown if setting property fails
*/
@SuppressWarnings("unchecked")
- public static void setReferenceProperties(CamelContext context, Object
bean, Map parameters) throws Exception {
- Iterator<Map.Entry> it = parameters.entrySet().iterator();
+ public static void setReferenceProperties(CamelContext context, Object
bean, Map<String, Object> parameters) throws Exception {
+ Iterator<Map.Entry<String, Object>> it =
parameters.entrySet().iterator();
while (it.hasNext()) {
- Map.Entry entry = it.next();
- Object key = entry.getKey();
+ Map.Entry<String, Object> entry = it.next();
+ String name = entry.getKey();
Object v = entry.getValue();
String value = v != null ? v.toString() : null;
if (value != null && isReferenceParameter(value)) {
Object ref = resolveReferenceParameter(context, value,
Object.class);
- String name = key.toString();
if (ref != null) {
boolean hit =
IntrospectionSupport.setProperty(context.getTypeConverter(), bean, name, ref);
if (hit) {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
Wed Nov 11 06:15:26 2009
@@ -854,8 +854,8 @@
* Converts primitive types such as int to its wrapper type like
* {...@link Integer}
*/
- public static Class convertPrimitiveTypeToWrapperType(Class type) {
- Class rc = type;
+ public static Class<?> convertPrimitiveTypeToWrapperType(Class<?> type) {
+ Class<?> rc = type;
if (type.isPrimitive()) {
if (type == int.class) {
rc = Integer.class;
@@ -944,8 +944,8 @@
try {
return toType.cast(value);
} catch (ClassCastException e) {
- throw new IllegalArgumentException("Failed to convert: " + value +
" to type: "
- + toType.getName() + " due to:
" + e, e);
+ throw new IllegalArgumentException("Failed to convert: "
+ + value + " to type: " + toType.getName() + " due to: " + e,
e);
}
}
@@ -1197,5 +1197,4 @@
it.remove();
}
}
-
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
Wed Nov 11 06:15:26 2009
@@ -41,10 +41,10 @@
}
@SuppressWarnings("unchecked")
- public static Map parseQuery(String uri) throws URISyntaxException {
+ public static Map<String, Object> parseQuery(String uri) throws
URISyntaxException {
try {
// use a linked map so the parameters is in the same order
- Map rc = new LinkedHashMap();
+ Map<String, Object> rc = new LinkedHashMap<String, Object>();
if (uri != null) {
String[] parameters = uri.split("&");
for (String parameter : parameters) {
@@ -66,13 +66,13 @@
}
}
- public static Map parseParameters(URI uri) throws URISyntaxException {
+ public static Map<String, Object> parseParameters(URI uri) throws
URISyntaxException {
String query = uri.getQuery();
if (query == null) {
String schemeSpecificPart = uri.getSchemeSpecificPart();
int idx = schemeSpecificPart.lastIndexOf('?');
if (idx < 0) {
- return Collections.EMPTY_MAP;
+ return Collections.emptyMap();
} else {
query = schemeSpecificPart.substring(idx + 1);
}
@@ -97,7 +97,7 @@
return value;
}
- public static String createQueryString(Map options) throws
URISyntaxException {
+ public static String createQueryString(Map<Object, Object> options) throws
URISyntaxException {
try {
if (options.size() > 0) {
StringBuffer rc = new StringBuffer();
@@ -134,7 +134,7 @@
* <p/>
* Used by various Camel components
*/
- public static URI createRemainingURI(URI originalURI, Map params) throws
URISyntaxException {
+ public static URI createRemainingURI(URI originalURI, Map<Object, Object>
params) throws URISyntaxException {
String s = createQueryString(params);
if (s.length() == 0) {
s = null;
@@ -181,7 +181,7 @@
List<String> keys = new ArrayList<String>(parameters.keySet());
Collections.sort(keys);
- Map<String, Object> sorted = new LinkedHashMap<String,
Object>(parameters.size());
+ Map<Object, Object> sorted = new LinkedHashMap<Object,
Object>(parameters.size());
for (String key : keys) {
sorted.put(key, parameters.get(key));
}
@@ -196,5 +196,4 @@
// must include :// to do a correct URI all components can work with
return scheme + "://" + path + (query != null ? "?" + query : "");
}
-
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/PatternBasedPackageScanFilterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/PatternBasedPackageScanFilterTest.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/PatternBasedPackageScanFilterTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/PatternBasedPackageScanFilterTest.java
Wed Nov 11 06:15:26 2009
@@ -170,12 +170,11 @@
validateMatchingSetContains();
}
- protected void validateMatchingSetContains(Class... matchingClasses) {
+ protected void validateMatchingSetContains(Class<?>... matchingClasses) {
super.validateMatchingSetContains(allClasses, matchingClasses);
}
- protected void validateMatchingSetContains(Set<Class> matchingClasses) {
+ protected void validateMatchingSetContains(Set<Class<?>> matchingClasses) {
super.validateMatchingSetContains(allClasses, matchingClasses);
}
-
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/ScanTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/ScanTestSupport.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/ScanTestSupport.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/scan/ScanTestSupport.java
Wed Nov 11 06:15:26 2009
@@ -30,19 +30,19 @@
filter = new PatternBasedPackageScanFilter();
}
- protected void validateMatchingSetContains(Set<Class<?>> scannedClasses,
Class... matchingClasses) {
- HashSet<Class> expectedSet = new HashSet<Class>();
+ protected void validateMatchingSetContains(Set<Class<?>> scannedClasses,
Class<?>... matchingClasses) {
+ HashSet<Class<?>> expectedSet = new HashSet<Class<?>>();
for (Class expected : matchingClasses) {
expectedSet.add(expected);
}
validateMatchingSetContains(scannedClasses, expectedSet);
}
- protected void validateMatchingSetContains(Set<Class<?>> scannedClasses,
Set<Class> matchingClasses) {
- Set<Class> matching = getMatchingClasses(scannedClasses, filter);
+ protected void validateMatchingSetContains(Set<Class<?>> scannedClasses,
Set<Class<?>> matchingClasses) {
+ Set<Class<?>> matching = getMatchingClasses(scannedClasses, filter);
assertEquals("Incorrect number of classes matched",
matchingClasses.size(), matching.size());
- for (Class expected : matchingClasses) {
+ for (Class<?> expected : matchingClasses) {
assertTrue("Expected matching class '" + expected + "' is not
present", matching.contains(expected));
}
}
@@ -59,8 +59,8 @@
}
}
- public Set<Class> getMatchingClasses(Set<Class<?>> scannedClasses,
PatternBasedPackageScanFilter filter) {
- Set<Class> matching = new HashSet<Class>();
+ public Set<Class<?>> getMatchingClasses(Set<Class<?>> scannedClasses,
PatternBasedPackageScanFilter filter) {
+ Set<Class<?>> matching = new HashSet<Class<?>>();
for (Class candidate : scannedClasses) {
if (filter.matches(candidate)) {
Modified:
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomComponent.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomComponent.java
(original)
+++
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomComponent.java
Wed Nov 11 06:15:26 2009
@@ -22,6 +22,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.component.feed.FeedComponent;
import org.apache.camel.component.feed.FeedEndpoint;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.URISupport;
/**
@@ -34,12 +35,12 @@
public class AtomComponent extends FeedComponent {
@Override
- protected FeedEndpoint createEndpoint(String uri, String remaining, Map
parameters) throws Exception {
+ protected FeedEndpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
return new AtomEndpoint(uri, this, null);
}
@Override
- protected void afterConfiguration(String uri, String remaining, Endpoint
endpoint, Map parameters) throws Exception {
+ protected void afterConfiguration(String uri, String remaining, Endpoint
endpoint, Map<String, Object> parameters) throws Exception {
AtomEndpoint atom = (AtomEndpoint) endpoint;
if (atom.getFeedUri() != null) {
// already set so do not change it
@@ -50,7 +51,8 @@
// for the http feed
String feedUri;
if (!parameters.isEmpty()) {
- URI remainingUri = URISupport.createRemainingURI(new
URI(remaining), parameters);
+ Map<Object, Object> params = CastUtils.cast(parameters);
+ URI remainingUri = URISupport.createRemainingURI(new
URI(remaining), params);
feedUri = remainingUri.toString();
} else {
feedUri = remaining;
Modified:
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedComponent.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedComponent.java
(original)
+++
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedComponent.java
Wed Nov 11 06:15:26 2009
@@ -25,6 +25,6 @@
*/
public abstract class FeedComponent extends DefaultComponent {
- protected abstract FeedEndpoint createEndpoint(String uri, String
remaining, Map parameters) throws Exception;
+ protected abstract FeedEndpoint createEndpoint(String uri, String
remaining, Map<String, Object> parameters) throws Exception;
}
Modified:
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
(original)
+++
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
Wed Nov 11 06:15:26 2009
@@ -73,9 +73,8 @@
public CometdComponent() {
}
- @SuppressWarnings("unchecked")
@Override
- protected Endpoint createEndpoint(String uri, String remaining, Map
parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
setProperties(this, parameters);
return new CometdEndpoint(this, uri, remaining, parameters);
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
Wed Nov 11 06:15:26 2009
@@ -46,7 +46,7 @@
*/
@Override
protected Endpoint createEndpoint(String uri, String remaining,
- Map parameters) throws Exception {
+ Map<String, Object> parameters) throws Exception {
CxfEndpoint result = null;
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapComponent.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapComponent.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapComponent.java
Wed Nov 11 06:15:26 2009
@@ -21,6 +21,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.util.CamelContextHelper;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.URISupport;
@@ -35,10 +36,11 @@
}
@Override
- protected Endpoint createEndpoint(String uri, String remaining, Map
parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
Map soapProps = IntrospectionSupport.extractProperties(parameters,
"soap.");
if (parameters.size() > 0) {
- remaining += "?" + URISupport.createQueryString(parameters);
+ Map<Object, Object> options = CastUtils.cast(parameters);
+ remaining += "?" + URISupport.createQueryString(options);
}
Endpoint endpoint =
CamelContextHelper.getMandatoryEndpoint(getCamelContext(), remaining);
CxfSoapEndpoint soapEndpoint = new CxfSoapEndpoint(endpoint);
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
Wed Nov 11 06:15:26 2009
@@ -25,6 +25,7 @@
import org.apache.camel.component.cxf.CxfConstants;
import org.apache.camel.impl.HeaderFilterStrategyComponent;
import org.apache.camel.util.CamelContextHelper;
+import org.apache.camel.util.CastUtils;
import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean;
/**
@@ -41,7 +42,7 @@
@SuppressWarnings("unchecked")
@Override
- protected Endpoint createEndpoint(String uri, String remaining, Map
parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
CxfRsEndpoint answer = null;
if (remaining.startsWith(CxfConstants.SPRING_CONTEXT_ENDPOINT)) {
// Get the bean from the Spring context
@@ -69,10 +70,9 @@
// endpoint URI does not specify a bean
answer = new CxfRsEndpoint(remaining, this);
}
- answer.setParameters((Map<String, String>)parameters);
+ Map<String, String> params = CastUtils.cast(parameters);
+ answer.setParameters(params);
setEndpointHeaderFilterStrategy(answer);
return answer;
}
-
-
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
Wed Nov 11 06:15:26 2009
@@ -154,7 +154,6 @@
}
writer.writeEndElement();
-
}
private static void visitNodesForNameSpace(Node node, Map<String, String>
namespaces) {
@@ -170,7 +169,5 @@
}
}
}
-
}
-
}
Modified:
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java
(original)
+++
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java
Wed Nov 11 06:15:26 2009
@@ -34,7 +34,7 @@
public static final String HEADER_ID = "header";
public static final String TRAILER_ID = "trailer";
- protected Endpoint createEndpoint(String uri, String remaining, Map
parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
boolean fixed = false;
if (remaining.startsWith("fixed:")) {
fixed = true;
Modified:
camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java
(original)
+++
camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerComponent.java
Wed Nov 11 06:15:26 2009
@@ -33,7 +33,7 @@
private Configuration configuration;
private Configuration noCacheConfiguration;
- protected Endpoint createEndpoint(String uri, String remaining, Map
parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
FreemarkerEndpoint endpoint = new FreemarkerEndpoint(uri, this,
remaining);
// should we use regular configuration or no cache (content cache is
default true)
Modified:
camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisComponent.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisComponent.java
(original)
+++
camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisComponent.java
Wed Nov 11 06:15:26 2009
@@ -78,7 +78,7 @@
* Creates an IbatisEndpoint for use by an IbatisConsumer or
IbatisProducer.
*/
@Override
- protected IBatisEndpoint createEndpoint(String uri, String remaining, Map
parameters) throws Exception {
+ protected IBatisEndpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
IBatisEndpoint answer = new IBatisEndpoint(uri, this, remaining);
setProperties(answer, parameters);
return answer;
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
Wed Nov 11 06:15:26 2009
@@ -196,9 +196,9 @@
return;
}
- Map<String, String> parameters = URISupport.parseQuery(queryString);
- for (Map.Entry<String, String> entry : parameters.entrySet()) {
- httpExchange.setRequestHeader(entry.getKey(), entry.getValue());
+ Map<String, Object> parameters = URISupport.parseQuery(queryString);
+ for (Map.Entry<String, Object> entry : parameters.entrySet()) {
+ httpExchange.setRequestHeader(entry.getKey(),
entry.getValue().toString());
}
}
Modified:
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptEvaluationException.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptEvaluationException.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptEvaluationException.java
(original)
+++
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptEvaluationException.java
Wed Nov 11 06:15:26 2009
@@ -24,6 +24,7 @@
* @version $Revision$
*/
public class ScriptEvaluationException extends RuntimeCamelException {
+ private static final long serialVersionUID = 2487032913316865381L;
public ScriptEvaluationException(String message) {
super(message);
Modified:
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java
(original)
+++
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java
Wed Nov 11 06:15:26 2009
@@ -16,14 +16,11 @@
*/
package org.apache.camel.builder.script;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import junit.framework.TestCase;
+
import org.apache.camel.ScriptTestHelper;
/**
Modified:
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/DirectComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/DirectComponent.java?rev=834779&r1=834778&r2=834779&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/DirectComponent.java
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/DirectComponent.java
Wed Nov 11 06:15:26 2009
@@ -30,7 +30,7 @@
*/
public class DirectComponent extends DefaultComponent {
- protected Endpoint createEndpoint(String uri, String remaining, Map
parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
Endpoint endpoint = new DirectEndpoint(uri, this);
setProperties(endpoint, parameters);
return endpoint;