Author: hadrian
Date: Wed Nov 11 07:05:56 2009
New Revision: 834787
URL: http://svn.apache.org/viewvc?rev=834787&view=rev
Log:
Long running effort to remove warnings. Under 3200.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionServiceTest.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedTest.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithNoDescriptorTest.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthTest.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java
camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundFault.java
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java
camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/Main.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
Wed Nov 11 07:05:56 2009
@@ -79,7 +79,7 @@
/**
* Returns the class loader of the first interface or throws {...@link
IllegalArgumentException} if there are no interfaces specified
*/
- protected static ClassLoader getClassLoader(Class... interfaces) {
+ protected static ClassLoader getClassLoader(Class<?>... interfaces) {
if (interfaces == null || interfaces.length < 1) {
throw new IllegalArgumentException("You must provide at least 1
interface class.");
}
@@ -89,5 +89,4 @@
protected static MethodInfoCache createMethodInfoCache(Endpoint endpoint) {
return new MethodInfoCache(endpoint.getCamelContext());
}
-
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
Wed Nov 11 07:05:56 2009
@@ -70,8 +70,8 @@
private long resultWaitTime;
private long resultMinimumWaitTime;
private int expectedMinimumCount;
- private List expectedBodyValues;
- private List actualBodyValues;
+ private List<Object> expectedBodyValues;
+ private List<Object> actualBodyValues;
private String headerName;
private Object headerValue;
private Object actualHeader;
@@ -363,10 +363,10 @@
* Adds an expectation that the given body values are received by this
* endpoint in the specified order
*/
- public void expectedBodiesReceived(final List bodies) {
+ public void expectedBodiesReceived(final List<Object> bodies) {
expectedMessageCount(bodies.size());
this.expectedBodyValues = bodies;
- this.actualBodyValues = new ArrayList();
+ this.actualBodyValues = new ArrayList<Object>();
expects(new Runnable() {
public void run() {
@@ -391,7 +391,7 @@
* Sets an expectation that the given body values are received by this
endpoint
*/
public void expectedBodiesReceived(Object... bodies) {
- List bodyList = new ArrayList();
+ List<Object> bodyList = new ArrayList<Object>();
bodyList.addAll(Arrays.asList(bodies));
expectedBodiesReceived(bodyList);
}
@@ -423,14 +423,14 @@
* Adds an expectation that the given body values are received by this
* endpoint in any order
*/
- public void expectedBodiesReceivedInAnyOrder(final List bodies) {
+ public void expectedBodiesReceivedInAnyOrder(final List<Object> bodies) {
expectedMessageCount(bodies.size());
this.expectedBodyValues = bodies;
- this.actualBodyValues = new ArrayList();
+ this.actualBodyValues = new ArrayList<Object>();
expects(new Runnable() {
public void run() {
- Set actualBodyValuesSet = new HashSet(actualBodyValues);
+ Set<Object> actualBodyValuesSet = new
HashSet<Object>(actualBodyValues);
for (int i = 0; i < expectedBodyValues.size(); i++) {
Exchange exchange = getReceivedExchanges().get(i);
assertTrue("No exchange received for counter: " + i,
exchange != null);
@@ -448,9 +448,8 @@
* Adds an expectation that the given body values are received by this
* endpoint in any order
*/
- @SuppressWarnings("unchecked")
public void expectedBodiesReceivedInAnyOrder(Object... bodies) {
- List bodyList = new ArrayList();
+ List<Object> bodyList = new ArrayList<Object>();
bodyList.addAll(Arrays.asList(bodies));
expectedBodiesReceivedInAnyOrder(bodyList);
}
@@ -800,7 +799,7 @@
resultMinimumWaitTime = 0L;
expectedMinimumCount = -1;
expectedBodyValues = null;
- actualBodyValues = new ArrayList();
+ actualBodyValues = new ArrayList<Object>();
}
protected synchronized void onExchange(Exchange exchange) {
@@ -810,7 +809,7 @@
}
performAssertions(exchange);
} catch (Throwable e) {
- // must catch throwable as AssertionException extends
java.lang.Error
+ // must catch java.lang.Throwable as AssertionException extends
java.lang.Error
failures.add(e);
} finally {
// make sure latch is counted down to avoid test hanging forever
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=834787&r1=834786&r2=834787&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
Wed Nov 11 07:05:56 2009
@@ -29,6 +29,8 @@
import org.apache.camel.TestSupport;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.util.CastUtils;
+
import static org.apache.camel.builder.ExpressionBuilder.*;
import static org.apache.camel.builder.PredicateBuilder.contains;
@@ -41,7 +43,7 @@
public void testRegexTokenize() throws Exception {
Expression expression =
regexTokenizeExpression(headerExpression("location"), ",");
- ArrayList expected = new ArrayList(Arrays.asList(new String[]
{"Islington", "London", "UK"}));
+ ArrayList<String> expected = new ArrayList<String>(Arrays.asList(new
String[] {"Islington", "London", "UK"}));
assertExpression(expression, exchange, expected);
Predicate predicate =
contains(regexTokenizeExpression(headerExpression("location"), ","),
@@ -65,7 +67,7 @@
public void testTokenize() throws Exception {
Expression expression =
tokenizeExpression(headerExpression("location"), ",");
- ArrayList expected = new ArrayList(Arrays.asList(new String[]
{"Islington", "London", "UK"}));
+ ArrayList<String> expected = new ArrayList<String>(Arrays.asList(new
String[] {"Islington", "London", "UK"}));
assertExpression(expression, exchange, expected);
Predicate predicate =
contains(tokenizeExpression(headerExpression("location"), ","),
@@ -81,7 +83,7 @@
Expression expression = regexTokenizeExpression(bodyExpression(),
"[\r|\n]");
exchange.getIn().setBody("Hello World\nBye World\rSee you again");
- ArrayList expected = new ArrayList(Arrays.asList(new String[] {"Hello
World", "Bye World", "See you again"}));
+ ArrayList<String> expected = new ArrayList<String>(Arrays.asList(new
String[] {"Hello World", "Bye World", "See you again"}));
assertExpression(expression, exchange, expected);
}
@@ -89,7 +91,7 @@
Expression expression =
sortExpression(body().tokenize(",").getExpression(), new SortByName());
exchange.getIn().setBody("Jonathan,Claus,James,Hadrian");
- ArrayList expected = new ArrayList(Arrays.asList(new String[]
{"Claus", "Hadrian", "James", "Jonathan"}));
+ ArrayList<String> expected = new ArrayList<String>(Arrays.asList(new
String[] {"Claus", "Hadrian", "James", "Jonathan"}));
assertExpression(expression, exchange, expected);
}
@@ -98,7 +100,7 @@
Expression expression = camelContextPropertyExpression("CamelTestKey");
assertExpression(expression, exchange, "CamelTestValue");
expression = camelContextPropertiesExpression();
- Map<String, String> properties = (Map<String,
String>)expression.evaluate(exchange, Object.class);
+ Map<String, String> properties =
CastUtils.cast(expression.evaluate(exchange, Map.class));
assertEquals("Get a wrong properties size", properties.size(), 1);
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
Wed Nov 11 07:05:56 2009
@@ -40,7 +40,7 @@
public class BeanWithHeadersAndBodyInject2Test extends ContextTestSupport {
private static final transient Log LOG =
LogFactory.getLog(BeanWithHeadersAndBodyInject2Test.class);
private MyBean myBean = new MyBean();
- private Map users = new HashMap();
+ private Map<String, User> users = new HashMap<String, User>();
public void testCannotBindToParameter() throws Exception {
// Create hashmap for testing purpose
@@ -64,7 +64,7 @@
}
public void testBindToParameter() throws Exception {
- final List list = new ArrayList();
+ final List<String> list = new ArrayList<String>();
list.add("Charles");
list.add("Claus");
@@ -109,9 +109,9 @@
public static class MyBean {
public Object body;
- public List users;
+ public List<User> users;
- public void myMethod(@Header(value = "users") List users, Object body)
{
+ public void myMethod(@Header(value = "users") List<User> users, Object
body) {
LOG.info("myMethod() method called on " + this);
LOG.info(" users " + users);
this.body = body;
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java
Wed Nov 11 07:05:56 2009
@@ -176,9 +176,9 @@
assertEquals(0, formatter.getMaxChars());
}
- private class MyFuture extends FutureTask {
+ private class MyFuture extends FutureTask<Object> {
- public MyFuture(Callable callable) {
+ public MyFuture(Callable<Object> callable) {
super(callable);
}
@@ -201,5 +201,4 @@
return "ThisIsMyFuture";
}
}
-
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
Wed Nov 11 07:05:56 2009
@@ -37,6 +37,7 @@
import org.apache.camel.impl.DefaultFactoryFinderResolver;
import org.apache.camel.impl.DefaultPackageScanClassResolver;
import org.apache.camel.impl.converter.DefaultTypeConverter;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ReflectionInjector;
import org.apache.commons.logging.Log;
@@ -107,21 +108,21 @@
public void testArrayToListAndSetConversion() throws Exception {
String[] array = new String[]{"one", "two"};
- List list = converter.convertTo(List.class, array);
+ List<String> list = CastUtils.cast(converter.convertTo(List.class,
array));
assertEquals("List size: " + list, 2, list.size());
- Collection collection = converter.convertTo(Collection.class, array);
+ Collection<String> collection =
CastUtils.cast(converter.convertTo(Collection.class, array));
assertEquals("Collection size: " + collection, 2, collection.size());
- Set set = converter.convertTo(Set.class, array);
+ Set<String> set = CastUtils.cast(converter.convertTo(Set.class,
array));
assertEquals("Set size: " + set, 2, set.size());
- set = converter.convertTo(Set.class, list);
+ set = CastUtils.cast(converter.convertTo(Set.class, list));
assertEquals("Set size: " + set, 2, set.size());
}
public void testCollectionToArrayConversion() throws Exception {
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
list.add("one");
list.add("two");
@@ -133,7 +134,7 @@
}
public void testCollectionToPrimitiveArrayConversion() throws Exception {
- List list = new ArrayList();
+ List<Integer> list = new ArrayList<Integer>();
list.add(5);
list.add(6);
@@ -148,7 +149,7 @@
assertEquals("long[] length", 2, longArray.length);
// now lets go back to a List again
- List resultList = converter.convertTo(List.class, intArray);
+ List<Integer> resultList =
CastUtils.cast(converter.convertTo(List.class, intArray));
assertEquals("List size", 2, resultList.size());
LOG.debug("From primitive type array we've created the list: " +
resultList);
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
Wed Nov 11 07:05:56 2009
@@ -30,7 +30,7 @@
public void testIsCollection() {
assertEquals(false, ObjectConverter.isCollection("String"));
assertEquals(false, ObjectConverter.isCollection(null));
- assertEquals(true, ObjectConverter.isCollection(new ArrayList()));
+ assertEquals(true, ObjectConverter.isCollection(new
ArrayList<Object>()));
assertEquals(true, ObjectConverter.isCollection(new String[]{"foo",
"bar"}));
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
Wed Nov 11 07:05:56 2009
@@ -94,13 +94,13 @@
* @param body the payload of the incoming message
* @return a list containing each part splitted
*/
- public List splitBody(String body) {
+ public List<String> splitBody(String body) {
// since this is based on an unit test you can of couse
// use different logic for splitting as Camel have out
// of the box support for splitting a String based on comma
// but this is for show and tell, since this is java code
// you have the full power how you like to split your messages
- List answer = new ArrayList();
+ List<String> answer = new ArrayList<String>();
String[] parts = body.split(",");
for (String part : parts) {
answer.add(part);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionServiceTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionServiceTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionServiceTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionServiceTest.java
Wed Nov 11 07:05:56 2009
@@ -28,12 +28,12 @@
public class SubmitOrderedCompletionServiceTest extends TestCase {
private ExecutorService executor;
- private SubmitOrderedCompletionService service;
+ private SubmitOrderedCompletionService<Object> service;
@Override
protected void setUp() throws Exception {
executor = Executors.newFixedThreadPool(5);
- service = new SubmitOrderedCompletionService(executor);
+ service = new SubmitOrderedCompletionService<Object>(executor);
}
@Override
@@ -43,13 +43,13 @@
public void testSubmitOrdered() throws Exception {
- service.submit(new Callable() {
+ service.submit(new Callable<Object>() {
public Object call() throws Exception {
return "A";
}
});
- service.submit(new Callable() {
+ service.submit(new Callable<Object>() {
public Object call() throws Exception {
return "B";
}
@@ -64,7 +64,7 @@
public void testSubmitOrderedFirstTaskIsSlow() throws Exception {
- service.submit(new Callable() {
+ service.submit(new Callable<Object>() {
public Object call() throws Exception {
// this task should be slower than B but we should still get
it first
Thread.sleep(200);
@@ -72,7 +72,7 @@
}
});
- service.submit(new Callable() {
+ service.submit(new Callable<Object>() {
public Object call() throws Exception {
return "B";
}
@@ -87,13 +87,13 @@
public void testSubmitOrderedSecondTaskIsSlow() throws Exception {
- service.submit(new Callable() {
+ service.submit(new Callable<Object>() {
public Object call() throws Exception {
return "A";
}
});
- service.submit(new Callable() {
+ service.submit(new Callable<Object>() {
public Object call() throws Exception {
Thread.sleep(200);
return "B";
@@ -106,5 +106,4 @@
assertEquals("A", a);
assertEquals("B", b);
}
-
}
Modified:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedTest.java
(original)
+++
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedTest.java
Wed Nov 11 07:05:56 2009
@@ -23,6 +23,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -54,13 +55,11 @@
List<Exchange> list = results.getReceivedExchanges();
for (Exchange exchange : list) {
Message in = exchange.getIn();
- Map body = in.getBody(Map.class);
+ Map<String, String> body = CastUtils.cast(in.getBody(Map.class));
assertNotNull("Should have found body as a Map but was: " +
ObjectHelper.className(in.getBody()), body);
assertEquals("ITEM_DESC", expectedItemDesc[counter],
body.get("ITEM_DESC"));
LOG.info("Result: " + counter + " = " + body);
counter++;
}
-
}
-
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithNoDescriptorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithNoDescriptorTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithNoDescriptorTest.java
(original)
+++
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithNoDescriptorTest.java
Wed Nov 11 07:05:56 2009
@@ -23,6 +23,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -54,7 +55,7 @@
List<Exchange> list = results.getReceivedExchanges();
for (Exchange exchange : list) {
Message in = exchange.getIn();
- Map body = in.getBody(Map.class);
+ Map<String, String> body = CastUtils.cast(in.getBody(Map.class));
assertNotNull("Should have found body as a Map but was: " +
ObjectHelper.className(in.getBody()), body);
assertEquals("NAME", expectedItemDesc[counter], body.get("NAME"));
LOG.info("Result: " + counter + " = " + body);
Modified:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest.java
(original)
+++
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest.java
Wed Nov 11 07:05:56 2009
@@ -23,6 +23,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -54,13 +55,11 @@
List<Exchange> list = results.getReceivedExchanges();
for (Exchange exchange : list) {
Message in = exchange.getIn();
- Map body = in.getBody(Map.class);
+ Map<String, String> body = CastUtils.cast(in.getBody(Map.class));
assertNotNull("Should have found body as a Map but was: " +
ObjectHelper.className(in.getBody()), body);
assertEquals("ITEM_DESC result(" + counter + ")",
expectedItemDesc[counter], body.get("ITEM_DESC"));
LOG.info("Result: " + counter + " = " + body);
counter++;
}
-
}
-
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthTest.java
(original)
+++
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthTest.java
Wed Nov 11 07:05:56 2009
@@ -23,6 +23,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -54,13 +55,11 @@
for (Exchange exchange : list) {
Message in = exchange.getIn();
assertEquals("counter", in.getHeader("camelFlatpackCounter"),
counter);
- Map body = in.getBody(Map.class);
+ Map<String, String> body = CastUtils.cast(in.getBody(Map.class));
assertNotNull("Should have found body as a Map but was: " +
ObjectHelper.className(in.getBody()), body);
assertEquals("FIRSTNAME", expectedFirstName[counter],
body.get("FIRSTNAME"));
LOG.info("Result: " + counter + " = " + body);
counter++;
}
-
}
-
}
Modified:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest.java
(original)
+++
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest.java
Wed Nov 11 07:05:56 2009
@@ -23,6 +23,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -53,13 +54,11 @@
List<Exchange> list = results.getReceivedExchanges();
for (Exchange exchange : list) {
Message in = exchange.getIn();
- Map body = in.getBody(Map.class);
+ Map<String, String> body = CastUtils.cast(in.getBody(Map.class));
assertNotNull("Should have found body as a Map but was: " +
ObjectHelper.className(in.getBody()), body);
assertEquals("FIRSTNAME", expectedFirstName[counter],
body.get("FIRSTNAME"));
LOG.info("Result: " + counter + " = " + body);
counter++;
}
-
}
-
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java
(original)
+++
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java
Wed Nov 11 07:05:56 2009
@@ -26,6 +26,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.CastUtils;
import org.junit.Test;
import org.springframework.core.io.ClassPathResource;
@@ -41,14 +42,14 @@
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(DataSetList.class);
- String data = IOConverter.toString(new
File("src/test/data/delim/INVENTORY-CommaDelimitedWithQualifier.txt").getAbsoluteFile());
+ String data = IOConverter.toString(new
File("src/test/data/delim/INVENTORY-CommaDelimitedWithQualifier.txt").getAbsoluteFile(),
null);
template.sendBody("direct:unmarshal", data);
assertMockEndpointsSatisfied();
DataSetList list =
mock.getExchanges().get(0).getIn().getBody(DataSetList.class);
assertEquals(4, list.size());
- Map row = (Map) list.get(0);
+ Map<String, String> row = CastUtils.cast(list.get(0));
assertEquals("SOME VALVE", row.get("ITEM_DESC"));
}
Modified:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java
(original)
+++
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java
Wed Nov 11 07:05:56 2009
@@ -26,6 +26,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.CastUtils;
import org.junit.Test;
import org.springframework.core.io.ClassPathResource;
@@ -41,14 +42,14 @@
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(DataSetList.class);
- String data = IOConverter.toString(new
File("src/test/data/fixed/PEOPLE-FixedLength.txt").getAbsoluteFile());
+ String data = IOConverter.toString(new
File("src/test/data/fixed/PEOPLE-FixedLength.txt").getAbsoluteFile(), null);
template.sendBody("direct:unmarshal", data);
assertMockEndpointsSatisfied();
DataSetList list =
mock.getExchanges().get(0).getIn().getBody(DataSetList.class);
assertEquals(4, list.size());
- Map row = (Map) list.get(0);
+ Map<String, String> row = CastUtils.cast(list.get(0));
assertEquals("JOHN", row.get("FIRSTNAME"));
}
Modified:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java
(original)
+++
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java
Wed Nov 11 07:05:56 2009
@@ -23,6 +23,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.CastUtils;
import org.junit.Test;
import org.springframework.core.io.ClassPathResource;
@@ -38,7 +39,7 @@
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(DataSetList.class);
- String data = IOConverter.toString(new
File("src/test/data/headerandtrailer/PEOPLE-HeaderAndTrailer.txt").getAbsoluteFile());
+ String data = IOConverter.toString(new
File("src/test/data/headerandtrailer/PEOPLE-HeaderAndTrailer.txt").getAbsoluteFile(),
null);
template.sendBody("direct:unmarshal", data);
assertMockEndpointsSatisfied();
@@ -47,16 +48,16 @@
assertEquals(6, list.size());
// assert header
- Map header = (Map) list.get(0);
+ Map<String, String> header = CastUtils.cast(list.get(0));
assertEquals("HBT", header.get("INDICATOR"));
assertEquals("20080817", header.get("DATE"));
// assert data
- Map row = (Map) list.get(1);
+ Map<String, String> row = CastUtils.cast(list.get(1));
assertEquals("JOHN", row.get("FIRSTNAME"));
// assert trailer
- Map trailer = (Map) list.get(5);
+ Map<String, String> trailer = CastUtils.cast(list.get(5));
assertEquals("FBT", trailer.get("INDICATOR"));
assertEquals("SUCCESS", trailer.get("STATUS"));
}
Modified:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java
(original)
+++
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java
Wed Nov 11 07:05:56 2009
@@ -23,6 +23,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -54,14 +55,14 @@
List<Exchange> list = results.getReceivedExchanges();
// assert header
- Map header = list.get(0).getIn().getBody(Map.class);
+ Map<String, String> header =
CastUtils.cast(list.get(0).getIn().getBody(Map.class));
assertEquals("HBT", header.get("INDICATOR"));
assertEquals("20080817", header.get("DATE"));
// assert body
for (Exchange exchange : list.subList(1, 5)) {
Message in = exchange.getIn();
- Map body = in.getBody(Map.class);
+ Map<String, String> body = CastUtils.cast(in.getBody(Map.class));
assertNotNull("Should have found body as a Map but was: " +
ObjectHelper.className(in.getBody()), body);
assertEquals("FIRSTNAME", expectedFirstName[counter],
body.get("FIRSTNAME"));
LOG.info("Result: " + counter + " = " + body);
@@ -69,7 +70,7 @@
}
// assert trailer
- Map trailer = list.get(5).getIn().getBody(Map.class);
+ Map<String, String> trailer =
CastUtils.cast(list.get(5).getIn().getBody(Map.class));
assertEquals("FBT", trailer.get("INDICATOR"));
assertEquals("SUCCESS", trailer.get("STATUS"));
}
Modified:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java
(original)
+++
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java
Wed Nov 11 07:05:56 2009
@@ -16,20 +16,20 @@
*/
package org.apache.camel.component.flatpack;
+import static org.junit.Assert.assertEquals;
+
import java.util.List;
import java.util.Map;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.CastUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
/**
* Unit test to verify that splitRows=false option.
*
@@ -53,23 +53,23 @@
results.assertIsSatisfied();
- List<Map> data = (List)
results.getExchanges().get(0).getIn().getBody();
+ List<Map<String, String>> data =
CastUtils.cast(results.getExchanges().get(0).getIn().getBody(List.class));
// assert header
- Map header = data.get(0);
+ Map<String, String> header = data.get(0);
assertEquals("HBT", header.get("INDICATOR"));
assertEquals("20080817", header.get("DATE"));
// assert body
int counter = 0;
- for (Map row : data.subList(1, 5)) {
+ for (Map<String, String> row : data.subList(1, 5)) {
assertEquals("FIRSTNAME", expectedFirstName[counter],
row.get("FIRSTNAME"));
LOG.info("Result: " + counter + " = " + row);
counter++;
}
// assert trailer
- Map trailer = data.get(5);
+ Map<String, String> trailer = data.get(5);
assertEquals("FBT", trailer.get("INDICATOR"));
assertEquals("SUCCESS", trailer.get("STATUS"));
}
Modified:
camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java
(original)
+++
camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java
Wed Nov 11 07:05:56 2009
@@ -19,10 +19,12 @@
import java.util.ArrayList;
import java.util.List;
+import com.sun.syndication.feed.synd.SyndEntryImpl;
import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.Exchange;
import org.apache.camel.processor.aggregate.AggregationStrategy;
+import org.apache.camel.util.CastUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,9 +38,9 @@
SyndFeed oldFeed = oldExchange.getIn().getBody(SyndFeed.class);
SyndFeed newFeed = newExchange.getIn().getBody(SyndFeed.class);
if (oldFeed != null && newFeed != null) {
- List oldEntries = oldFeed.getEntries();
- List newEntries = newFeed.getEntries();
- List mergedList = new ArrayList(oldEntries.size() +
newEntries.size());
+ List<SyndEntryImpl> oldEntries =
CastUtils.cast(oldFeed.getEntries());
+ List<SyndEntryImpl> newEntries =
CastUtils.cast(newFeed.getEntries());
+ List<SyndEntryImpl> mergedList = new
ArrayList<SyndEntryImpl>(oldEntries.size() + newEntries.size());
mergedList.addAll(oldEntries);
mergedList.addAll(newEntries);
oldFeed.setEntries(mergedList);
Modified:
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java
(original)
+++
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java
Wed Nov 11 07:05:56 2009
@@ -98,7 +98,7 @@
// Mapping the request to object's invocation
private class MappingProcessor implements Processor {
- private Class beanClass;
+ private Class<?> beanClass;
private Object instance;
public MappingProcessor(Object obj) {
@@ -121,11 +121,11 @@
return beanClass.getMethod(operationName,
getParameterTypes(parameters));
}
- private Class[] getParameterTypes(Object[] parameters) {
+ private Class<?>[] getParameterTypes(Object[] parameters) {
if (parameters == null) {
return new Class[0];
}
- Class[] answer = new Class[parameters.length];
+ Class<?>[] answer = new Class[parameters.length];
int i = 0;
for (Object object : parameters) {
answer[i] = object.getClass();
@@ -133,8 +133,5 @@
}
return answer;
}
-
}
-
-
}
Modified:
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundFault.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundFault.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundFault.java
(original)
+++
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundFault.java
Wed Nov 11 07:05:56 2009
@@ -22,6 +22,8 @@
@WebFault
public class BookNotFoundFault extends Exception {
+ private static final long serialVersionUID = 1L;
+
@XmlElement
private BookNotFoundDetails details;
Modified:
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java
(original)
+++
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java
Wed Nov 11 07:05:56 2009
@@ -18,8 +18,6 @@
import java.net.MalformedURLException;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.example.cxf.CamelCxfExample.MyRouteBuilder;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
Modified:
camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
(original)
+++
camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
Wed Nov 11 07:05:56 2009
@@ -20,6 +20,7 @@
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
+import org.apache.camel.util.CastUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.orm.jpa.JpaTemplate;
@@ -59,7 +60,7 @@
* Finds a customer for the given username, or creates and inserts a new
one
*/
protected CustomerEntity findCustomerByName(JpaTemplate template, String
user) {
- List<CustomerEntity> list = template.find("select x from " +
CustomerEntity.class.getName() + " x where x.userName = ?1", user);
+ List<CustomerEntity> list = CastUtils.cast(template.find("select x
from " + CustomerEntity.class.getName() + " x where x.userName = ?1", user));
if (list.isEmpty()) {
CustomerEntity answer = new CustomerEntity();
answer.setUserName(user);
Modified:
camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/Main.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/Main.java?rev=834787&r1=834786&r2=834787&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/Main.java
(original)
+++
camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/Main.java
Wed Nov 11 07:05:56 2009
@@ -22,7 +22,7 @@
* @version $Revision$
*/
public class Main extends org.apache.camel.spring.Main {
- public static void main(String[] args) throws Exception {
+ public static void main(String... args) throws Exception {
new Main().run(args);
}
}
