Author: hadrian
Date: Wed Nov 11 21:38:25 2009
New Revision: 835082
URL: http://svn.apache.org/viewvc?rev=835082&view=rev
Log:
More warning cleanup
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/ExpectedBodyTypeException.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/ExpectedBodyTypeException.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/ExpectedBodyTypeException.java?rev=835082&r1=835081&r2=835082&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/ExpectedBodyTypeException.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/ExpectedBodyTypeException.java
Wed Nov 11 21:38:25 2009
@@ -22,10 +22,11 @@
* @version $Revision$
*/
public class ExpectedBodyTypeException extends RuntimeCamelException {
+ private static final long serialVersionUID = -7121445152234363768L;
private final transient Exchange exchange;
- private final transient Class expectedBodyType;
+ private final transient Class<?> expectedBodyType;
- public ExpectedBodyTypeException(Exchange exchange, Class
expectedBodyType) {
+ public ExpectedBodyTypeException(Exchange exchange, Class<?>
expectedBodyType) {
super("Could not extract IN message body as type: " + expectedBodyType
+ " body is: "
+ exchange.getIn().getBody());
this.exchange = exchange;
@@ -36,7 +37,7 @@
return exchange;
}
- public Class getExpectedBodyType() {
+ public Class<?> getExpectedBodyType() {
return expectedBodyType;
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java?rev=835082&r1=835081&r2=835082&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java
Wed Nov 11 21:38:25 2009
@@ -30,5 +30,5 @@
*/
public interface AnnotationExpressionFactory {
- Expression createExpression(CamelContext camelContext, Annotation
annotation, LanguageAnnotation languageAnnotation, Class expressionReturnType);
+ Expression createExpression(CamelContext camelContext, Annotation
annotation, LanguageAnnotation languageAnnotation, Class<?>
expressionReturnType);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java?rev=835082&r1=835081&r2=835082&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
Wed Nov 11 21:38:25 2009
@@ -31,7 +31,7 @@
public class BeanAnnotationExpressionFactory extends
DefaultAnnotationExpressionFactory {
@Override
- public Expression createExpression(CamelContext camelContext, Annotation
annotation, LanguageAnnotation languageAnnotation, Class expressionReturnType) {
+ public Expression createExpression(CamelContext camelContext, Annotation
annotation, LanguageAnnotation languageAnnotation, Class<?>
expressionReturnType) {
String beanName = getFromAnnotation(annotation, "ref");
String method = getFromAnnotation(annotation, "method");
@@ -59,6 +59,5 @@
+ " of the annotation: " + annotation + " as it does not have
a " + attribute + "() method");
}
}
-
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java?rev=835082&r1=835081&r2=835082&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
Wed Nov 11 21:38:25 2009
@@ -32,7 +32,7 @@
*/
public class DefaultAnnotationExpressionFactory implements
AnnotationExpressionFactory {
- public Expression createExpression(CamelContext camelContext, Annotation
annotation, LanguageAnnotation languageAnnotation, Class expressionReturnType) {
+ public Expression createExpression(CamelContext camelContext, Annotation
annotation, LanguageAnnotation languageAnnotation, Class<?>
expressionReturnType) {
String languageName = languageAnnotation.language();
if (languageName == null) {
throw new IllegalArgumentException("Cannot determine the language
from the annotation: " + annotation);
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java?rev=835082&r1=835081&r2=835082&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java
Wed Nov 11 21:38:25 2009
@@ -23,6 +23,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.EndpointHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
@@ -57,7 +58,7 @@
if (isNotEmpty(sortBy) &&
!EndpointHelper.isReferenceParameter(sortBy)) {
// we support nested sort groups so they should be chained
String[] groups = sortBy.split(";");
- Iterator<String> it = ObjectHelper.createIterator(groups);
+ Iterator<String> it =
CastUtils.cast(ObjectHelper.createIterator(groups));
Comparator<Exchange> comparator = createSortByComparator(it);
endpoint.setSortBy(comparator);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java?rev=835082&r1=835081&r2=835082&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java
Wed Nov 11 21:38:25 2009
@@ -20,6 +20,7 @@
package org.apache.camel.util;
import java.util.Collection;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -74,4 +75,8 @@
public static <T, U> Map.Entry<T, U> cast(Map.Entry<?, ?> p, Class<T> pc,
Class<U> uc) {
return (Map.Entry<T, U>)p;
}
+
+ public static <T> Enumeration<T> cast(Enumeration<?> p) {
+ return (Enumeration<T>)p;
+ }
}
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=835082&r1=835081&r2=835082&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 21:38:25 2009
@@ -421,7 +421,7 @@
* @param value the value
* @return the iterator
*/
- public static Iterator createIterator(Object value) {
+ public static Iterator<Object> createIterator(Object value) {
return createIterator(value, ",");
}
@@ -435,14 +435,14 @@
* @return the iterator
*/
@SuppressWarnings("unchecked")
- public static Iterator createIterator(Object value, String delimiter) {
+ public static Iterator<Object> createIterator(Object value, String
delimiter) {
// if its a message than we want to iterate its body
if (value instanceof Message) {
value = ((Message) value).getBody();
}
if (value == null) {
- return Collections.EMPTY_LIST.iterator();
+ return Collections.emptyList().iterator();
} else if (value instanceof Iterator) {
return (Iterator)value;
} else if (value instanceof Collection) {
@@ -455,7 +455,7 @@
} else if (value instanceof NodeList) {
// lets iterate through DOM results after performing XPaths
final NodeList nodeList = (NodeList)value;
- return new Iterator<Node>() {
+ return CastUtils.cast(new Iterator<Node>() {
int idx = -1;
public boolean hasNext() {
@@ -469,7 +469,7 @@
public void remove() {
throw new UnsupportedOperationException();
}
- };
+ });
} else if (value instanceof String) {
final String s = (String) value;
@@ -479,10 +479,10 @@
// use a scanner if it contains the delimiter
Scanner scanner = new Scanner((String)value);
scanner.useDelimiter(delimiter);
- return scanner;
+ return CastUtils.cast(scanner);
} else {
// use a plain iterator that returns the value as is as there
are only a single value
- return new Iterator<String>() {
+ return CastUtils.cast(new Iterator<String>() {
int idx = -1;
public boolean hasNext() {
@@ -497,7 +497,7 @@
public void remove() {
throw new UnsupportedOperationException();
}
- };
+ });
}
} else {
return Collections.singletonList(value).iterator();
@@ -512,7 +512,7 @@
* @return <tt>true</tt> if the first element is a boolean and its value
* is true or if the list is non empty
*/
- public static boolean matches(List list) {
+ public static boolean matches(List<Object> list) {
if (!list.isEmpty()) {
Object value = list.get(0);
if (value instanceof Boolean) {
@@ -566,7 +566,7 @@
* Returns the type name of the given type or null if the type variable is
* null
*/
- public static String name(Class type) {
+ public static String name(Class<?> type) {
return type != null ? type.getName() : null;
}
@@ -620,7 +620,7 @@
}
// try context class loader first
- Class clazz = doLoadClass(name,
Thread.currentThread().getContextClassLoader());
+ Class<?> clazz = doLoadClass(name,
Thread.currentThread().getContextClassLoader());
if (clazz == null) {
// then the provided loader
clazz = doLoadClass(name, loader);
@@ -844,7 +844,7 @@
* coercion between primitive types to deal with Java 5 primitive type
* wrapping
*/
- public static boolean isAssignableFrom(Class a, Class b) {
+ public static boolean isAssignableFrom(Class<?> a, Class<?> b) {
a = convertPrimitiveTypeToWrapperType(a);
b = convertPrimitiveTypeToWrapperType(b);
return a.isAssignableFrom(b);
@@ -1127,7 +1127,7 @@
public static Scanner getScanner(Exchange exchange, Object value) {
if (value instanceof GenericFile) {
// generic file is just a wrapper for the real file so call again
with the real file
- GenericFile gf = (GenericFile) value;
+ GenericFile<?> gf = (GenericFile<?>) value;
return getScanner(exchange, gf.getFile());
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java?rev=835082&r1=835081&r2=835082&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
Wed Nov 11 21:38:25 2009
@@ -431,12 +431,12 @@
return "<message>" + counter + "</message>";
}
- protected List<String> listOfMessages(int... counters) {
+ protected Object[] listOfMessages(int... counters) {
List<String> list = new ArrayList<String>(counters.length);
for (int counter : counters) {
list.add(createTestMessage(counter));
}
- return list;
+ return list.toArray();
}
protected void sendHeader(String name, Object value) {
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java?rev=835082&r1=835081&r2=835082&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
Wed Nov 11 21:38:25 2009
@@ -139,7 +139,7 @@
public void testCreateIteratorWithStringAndCommaSeparator() {
String s = "a,b,c";
- Iterator it = ObjectHelper.createIterator(s, ",");
+ Iterator<String> it = CastUtils.cast(ObjectHelper.createIterator(s,
","));
assertEquals("a", it.next());
assertEquals("b", it.next());
assertEquals("c", it.next());
@@ -147,7 +147,7 @@
public void testCreateIteratorWithStringAndSemiColonSeparator() {
String s = "a;b;c";
- Iterator it = ObjectHelper.createIterator(s, ";");
+ Iterator<String> it = CastUtils.cast(ObjectHelper.createIterator(s,
";"));
assertEquals("a", it.next());
assertEquals("b", it.next());
assertEquals("c", it.next());
@@ -220,7 +220,7 @@
}
public void testMatches() {
- List data = new ArrayList();
+ List<Object> data = new ArrayList<Object>();
data.add("foo");
data.add("bar");
assertEquals(true, ObjectHelper.matches(data));
@@ -246,7 +246,7 @@
Message msg = new DefaultMessage();
msg.setBody("a,b,c");
- Iterator it = ObjectHelper.createIterator(msg);
+ Iterator<String> it = CastUtils.cast(ObjectHelper.createIterator(msg));
assertEquals("a", it.next());
assertEquals("b", it.next());
assertEquals("c", it.next());
@@ -257,7 +257,7 @@
Message msg = new DefaultMessage();
msg.setBody("");
- Iterator it = ObjectHelper.createIterator(msg);
+ Iterator<Object> it = ObjectHelper.createIterator(msg);
assertFalse(it.hasNext());
}
@@ -265,8 +265,7 @@
Message msg = new DefaultMessage();
msg.setBody(null);
- Iterator it = ObjectHelper.createIterator(msg);
+ Iterator<Object> it = ObjectHelper.createIterator(msg);
assertFalse(it.hasNext());
}
-
}
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java?rev=835082&r1=835081&r2=835082&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
Wed Nov 11 21:38:25 2009
@@ -218,7 +218,7 @@
}
// Retrieve the format, pattern and precision associated to the
type
- Class type = field.getType();
+ Class<?> type = field.getType();
String pattern = keyValuePairField.pattern();
int precision = keyValuePairField.precision();
Modified:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java?rev=835082&r1=835081&r2=835082&view=diff
==============================================================================
---
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
(original)
+++
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
Wed Nov 11 21:38:25 2009
@@ -28,6 +28,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.junit.Before;
import org.junit.Test;
@@ -53,7 +54,7 @@
// need to use iterator as some mail impl returns String[] and others
a single String with comma as separator
// so we let Camel create an iterator so we can use the same code for
the test
Object to = in.getHeader("TO");
- Iterator<String> it = ObjectHelper.createIterator(to);
+ Iterator<String> it = CastUtils.cast(ObjectHelper.createIterator(to));
int i = 0;
while (it.hasNext()) {
if (i == 0) {
Modified:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java?rev=835082&r1=835081&r2=835082&view=diff
==============================================================================
---
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
(original)
+++
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
Wed Nov 11 21:38:25 2009
@@ -32,6 +32,7 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.junit.Before;
import org.junit.Test;
@@ -78,7 +79,7 @@
// need to use iterator as some mail impl returns String[] and others
a single String with comma as separator
// so we let Camel create an iterator so we can use the same code for
the test
Object to = in.getHeader("TO");
- Iterator<String> it = ObjectHelper.createIterator(to);
+ Iterator<String> it = CastUtils.cast(ObjectHelper.createIterator(to));
int i = 0;
while (it.hasNext()) {
if (i == 0) {
@@ -89,13 +90,12 @@
i++;
}
- Enumeration iter = inMessage.getAllHeaders();
+ Enumeration<Header> iter = CastUtils.cast(inMessage.getAllHeaders());
while (iter.hasMoreElements()) {
- Header header = (Header) iter.nextElement();
+ Header header = iter.nextElement();
String[] value = message.getHeader(header.getName());
log.debug("Header: " + header.getName() + " has value: " +
ObjectHelper.asString(value));
}
-
}
@Override
