You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/15 11:38:45 UTC
svn commit: r1231645 [2/4] - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/component/bean/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/managem...
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java Sun Jan 15 10:38:40 2012
@@ -123,7 +123,7 @@ public class CamelContextAddRouteDefinit
// should be prepared, check parents has been set
assertNotNull("Parent should be set on outputs");
route = context.getRouteDefinition("foo");
- for (ProcessorDefinition output : route.getOutputs()) {
+ for (ProcessorDefinition<?> output : route.getOutputs()) {
assertNotNull("Parent should be set on output", output.getParent());
assertEquals(route, output.getParent());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java Sun Jan 15 10:38:40 2012
@@ -30,11 +30,11 @@ public class RegistryTest extends TestCa
protected JndiRegistry registry;
public void testBind() throws Exception {
- List foo = Arrays.asList("a", "b", "c");
+ List<?> foo = Arrays.asList("a", "b", "c");
registry.bind("foo", foo);
- List list = registry.lookup("foo", List.class);
+ List<?> list = registry.lookup("foo", List.class);
assertEquals("Should be same!", foo, list);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java Sun Jan 15 10:38:40 2012
@@ -55,7 +55,7 @@ public class SimpleRegistryTest extends
}
public void testLookupByType() {
- Map map = registry.lookupByType(String.class);
+ Map<?, ?> map = registry.lookupByType(String.class);
assertEquals(1, map.size());
assertEquals("b", map.get("a"));
map = registry.lookupByType(Object.class);
@@ -65,7 +65,7 @@ public class SimpleRegistryTest extends
}
public void testLookupByWrongType() {
- Map map = registry.lookupByType(Float.class);
+ Map<?, ?> map = registry.lookupByType(Float.class);
assertEquals(0, map.size());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionPolicyIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionPolicyIssueTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionPolicyIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionPolicyIssueTest.java Sun Jan 15 10:38:40 2012
@@ -50,6 +50,8 @@ public class ExceptionPolicyIssueTest ex
private static final class MyUnmarshalException extends Exception {
+ private static final long serialVersionUID = 1L;
+
private MyUnmarshalException(String message, Throwable cause) {
super(message, cause);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java Sun Jan 15 10:38:40 2012
@@ -39,7 +39,7 @@ public class SplitterUsingBeanReturningM
}
public static class MyOtherSplitterBean {
- public List split(Exchange exchange) {
+ public List<?> split(Exchange exchange) {
Message in = exchange.getIn();
assertNotNull(in.toString());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java Sun Jan 15 10:38:40 2012
@@ -59,7 +59,7 @@ public class TwoTimerWithJMXIssue extend
private static class MyTracer implements InterceptStrategy {
- public Processor wrapProcessorInInterceptors(CamelContext context, ProcessorDefinition definition,
+ public Processor wrapProcessorInInterceptors(CamelContext context, ProcessorDefinition<?> definition,
Processor target, Processor nextTarget) throws Exception {
assertNotNull(target);
counter++;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java Sun Jan 15 10:38:40 2012
@@ -27,7 +27,6 @@ import org.apache.camel.builder.RouteBui
*/
public class SimpleOgnlMapIssueTest extends ContextTestSupport {
- @SuppressWarnings("unchecked")
public void testSimpleOgnlIssueKing() throws Exception {
getMockEndpoint("mock:king").expectedMessageCount(1);
getMockEndpoint("mock:other").expectedMessageCount(0);
@@ -39,7 +38,6 @@ public class SimpleOgnlMapIssueTest exte
assertMockEndpointsSatisfied();
}
- @SuppressWarnings("unchecked")
public void testSimpleOgnlIssueOther() throws Exception {
getMockEndpoint("mock:king").expectedMessageCount(0);
getMockEndpoint("mock:other").expectedMessageCount(1);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java Sun Jan 15 10:38:40 2012
@@ -34,7 +34,7 @@ public class TokenizerTest extends Excha
public void testTokenizeHeader() throws Exception {
Expression exp = TokenizeLanguage.tokenize("names", ",");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(3, names.size());
assertEquals("Claus", names.get(0));
@@ -47,7 +47,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("Hadrian,Charles");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(2, names.size());
assertEquals("Hadrian", names.get(0));
@@ -59,7 +59,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("The little fox");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(3, names.size());
assertEquals("The", names.get(0));
@@ -72,7 +72,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setHeader("quote", "Camel rocks");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(2, names.size());
assertEquals("Camel", names.get(0));
@@ -86,7 +86,7 @@ public class TokenizerTest extends Excha
lan.setToken(",");
Expression exp = lan.createExpression();
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(3, names.size());
assertEquals("Claus", names.get(0));
@@ -104,7 +104,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("2011-11-11\n!James@!Claus@\n2 records");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(2, names.size());
assertEquals("James", names.get(0));
@@ -116,7 +116,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("2011-11-11\n[START]James[END]\n[START]Claus[END]\n2 records");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(2, names.size());
assertEquals("James", names.get(0));
@@ -128,7 +128,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("2011-11-11\n[START]James[END]\n[START]Claus[END]\n2 records");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(2, names.size());
assertEquals("[START]James[END]", names.get(0));
@@ -140,7 +140,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<persons><person>James</person><person>Claus</person><person>Jonathan</person><person>Hadrian</person></persons>");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(4, names.size());
assertEquals("<person>James</person>", names.get(0));
@@ -154,7 +154,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<persons><person>James</person><person>Claus</person><person>Jonathan</person><person>Hadrian</person></persons>");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(4, names.size());
assertEquals("<person>James</person>", names.get(0));
@@ -169,7 +169,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<?xml version=\"1.0\"?><!-- bla bla --><persons>\n<person>James</person>\n<person>Claus</person>\n"
+ "<!-- more bla bla --><person>Jonathan</person>\n<person>Hadrian</person>\n</persons> ");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(4, names.size());
assertEquals("<person>James</person>", names.get(0));
@@ -183,7 +183,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<?xml version=\"1.0\"?><!-- bla bla --><persons></persons> ");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(0, names.size());
}
@@ -192,7 +192,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(0, names.size());
}
@@ -201,7 +201,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody(null);
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertNull(names);
}
@@ -211,7 +211,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<?xml version=\"1.0\"?><persons xmlns=\"http:acme.com/persons\">\n<person>James</person>\n<person>Claus</person>\n"
+ "<person>Jonathan</person>\n<person>Hadrian</person>\n</persons>\n");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(4, names.size());
assertEquals("<person xmlns=\"http:acme.com/persons\">James</person>", names.get(0));
@@ -226,7 +226,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<?xml version=\"1.0\"?><persons xmlns=\"http:acme.com/persons\">\n<person>James</person>\n<person>Claus</person>\n"
+ "<person>Jonathan</person>\n<person>Hadrian</person>\n</persons>\n");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(4, names.size());
assertEquals("<person>James</person>", names.get(0));
@@ -241,7 +241,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<?xml version=\"1.0\"?><persons xmlns=\"http:acme.com/persons\" xmlns:foo=\"http:foo.com\">\n<person>James</person>\n<person>Claus</person>\n"
+ "<person>Jonathan</person>\n<person>Hadrian</person>\n</persons>\n");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(4, names.size());
assertEquals("<person xmlns=\"http:acme.com/persons\" xmlns:foo=\"http:foo.com\">James</person>", names.get(0));
@@ -256,7 +256,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<?xml version=\"1.0\"?><persons>\n<person xmlns=\"http:acme.com/persons\">James</person>\n<person xmlns=\"http:acme.com/persons\">Claus</person>\n"
+ "<person xmlns=\"http:acme.com/persons\">Jonathan</person>\n<person xmlns=\"http:acme.com/persons\">Hadrian</person>\n</persons>\n");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(4, names.size());
assertEquals("<person xmlns=\"http:acme.com/persons\">James</person>", names.get(0));
@@ -271,7 +271,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<?xml version=\"1.0\"?><persons xmlns=\"http:acme.com/persons\">\n<person xmlns:foo=\"http:foo.com\">James</person>\n<person>Claus</person>\n"
+ "<person>Jonathan</person>\n<person xmlns:bar=\"http:bar.com\">Hadrian</person>\n</persons>\n");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(4, names.size());
assertEquals("<person xmlns:foo=\"http:foo.com\" xmlns=\"http:acme.com/persons\">James</person>", names.get(0));
@@ -286,7 +286,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<?xml version=\"1.0\"?><persons xmlns=\"http:acme.com/persons\">\n<person xmlns:foo=\"http:foo.com\">James</person>\n"
+ "<person>Claus</person>\n<person>Jonathan</person>\n<person xmlns:bar=\"http:bar.com\">Hadrian</person>\n</persons>\n");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(4, names.size());
assertEquals("<person xmlns:foo=\"http:foo.com\">James</person>", names.get(0));
@@ -301,7 +301,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<persons><person id=\"1\">James</person><person id=\"2\">Claus</person><person id=\"3\">Jonathan</person>"
+ "<person id=\"4\">Hadrian</person></persons>");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(4, names.size());
assertEquals("<person id=\"1\">James</person>", names.get(0));
@@ -316,7 +316,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<persons xmlns=\"http:acme.com/persons\"><person id=\"1\">James</person><person id=\"2\">Claus</person>"
+ "<person id=\"3\">Jonathan</person><person id=\"4\">Hadrian</person></persons>");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(4, names.size());
assertEquals("<person id=\"1\" xmlns=\"http:acme.com/persons\">James</person>", names.get(0));
@@ -331,7 +331,7 @@ public class TokenizerTest extends Excha
exchange.getIn().setBody("<persons riders=\"true\" xmlns=\"http:acme.com/persons\"><person id=\"1\">James</person><person id=\"2\">Claus</person>"
+ "<person id=\"3\">Jonathan</person><person id=\"4\">Hadrian</person></persons>");
- List names = exp.evaluate(exchange, List.class);
+ List<?> names = exp.evaluate(exchange, List.class);
assertEquals(4, names.size());
assertEquals("<person id=\"1\" xmlns=\"http:acme.com/persons\">James</person>", names.get(0));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java Sun Jan 15 10:38:40 2012
@@ -142,7 +142,7 @@ public class SimpleTest extends Language
map.put("dude", "Hey dude");
map.put("code", 4321);
- List<Map> lines = new ArrayList<Map>();
+ List<Map<String, Object>> lines = new ArrayList<Map<String, Object>>();
lines.add(map);
exchange.getIn().setBody(lines);
@@ -158,7 +158,7 @@ public class SimpleTest extends Language
map.put("camel", new OrderLine(123, "Camel in Action"));
map.put("amq", new OrderLine(456, "ActiveMQ in Action"));
- List<Map> lines = new ArrayList<Map>();
+ List<Map<String, Object>> lines = new ArrayList<Map<String, Object>>();
lines.add(map);
exchange.getIn().setBody(lines);
@@ -414,7 +414,7 @@ public class SimpleTest extends Language
}
public void testHeaders() throws Exception {
- Map headers = exchange.getIn().getHeaders();
+ Map<String, Object> headers = exchange.getIn().getHeaders();
assertEquals(2, headers.size());
assertExpression("headers", headers);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java Sun Jan 15 10:38:40 2012
@@ -40,7 +40,7 @@ public class JmxInstrumentationOnlyRegis
}
public void testCustomId() throws Exception {
- Set s = server.queryNames(new ObjectName(domainName + ":type=endpoints,*"), null);
+ Set<ObjectName> s = server.queryNames(new ObjectName(domainName + ":type=endpoints,*"), null);
assertEquals("Could not find 2 endpoints: " + s, 6, s.size());
s = server.queryNames(new ObjectName(domainName + ":type=context,*"), null);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java Sun Jan 15 10:38:40 2012
@@ -66,7 +66,9 @@ public class JmxNotificationEventNotifie
MyNotificationListener listener = new MyNotificationListener();
context.getManagementStrategy().getManagementAgent().getMBeanServer().addNotificationListener(on,
listener,
- new NotificationFilter() {
+ new NotificationFilter() {
+ private static final long serialVersionUID = 1L;
+
public boolean isNotificationEnabled(Notification notification) {
return notification.getSource().equals("MyCamel");
}
@@ -90,6 +92,8 @@ public class JmxNotificationEventNotifie
MyNotificationListener listener = new MyNotificationListener();
context.getManagementStrategy().getManagementAgent().getMBeanServer().addNotificationListener(on,
listener, new NotificationFilter() {
+ private static final long serialVersionUID = 1L;
+
public boolean isNotificationEnabled(Notification notification) {
return true;
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java Sun Jan 15 10:38:40 2012
@@ -27,7 +27,6 @@ import org.apache.camel.ServiceStatus;
*/
public class ManagedUnregisterCamelContextTest extends ManagementTestSupport {
- @SuppressWarnings("unchecked")
public void testUnregisterCamelContext() throws Exception {
// The camel context already started by ContextTestSupport in the startup method
@@ -45,7 +44,7 @@ public class ManagedUnregisterCamelConte
String version = (String) mbeanServer.getAttribute(on, "CamelVersion");
assertNotNull(version);
- Map<String, String> properties = (Map) mbeanServer.getAttribute(on, "Properties");
+ Map<?, ?> properties = (Map<?, ?>) mbeanServer.getAttribute(on, "Properties");
assertNull(properties);
Integer num = (Integer) mbeanServer.getAttribute(on, "InflightExchanges");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/model/ChoiceDefinitionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/ChoiceDefinitionTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/model/ChoiceDefinitionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/model/ChoiceDefinitionTest.java Sun Jan 15 10:38:40 2012
@@ -51,7 +51,7 @@ public class ChoiceDefinitionTest extend
assertEquals(3, choice.getOutputs().size());
int i = 0;
- for (ProcessorDefinition def : choice.getOutputs()) {
+ for (ProcessorDefinition<?> def : choice.getOutputs()) {
if (i == 0) {
assertEquals(when1, def);
} else if (i == 1) {
@@ -90,7 +90,7 @@ public class ChoiceDefinitionTest extend
assertEquals(2, choice.getOutputs().size());
int i = 0;
- for (ProcessorDefinition def : choice.getOutputs()) {
+ for (ProcessorDefinition<?> def : choice.getOutputs()) {
if (i == 0) {
assertEquals(when1, def);
} else if (i == 1) {
@@ -137,7 +137,7 @@ public class ChoiceDefinitionTest extend
assertEquals(3, choice.getOutputs().size());
int i = 0;
- for (ProcessorDefinition def : choice.getOutputs()) {
+ for (ProcessorDefinition<?> def : choice.getOutputs()) {
if (i == 0) {
assertEquals(when1, def);
} else if (i == 1) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java Sun Jan 15 10:38:40 2012
@@ -75,7 +75,7 @@ public class XmlParseTest extends XmlTes
public void testParseRecipientListXml() throws Exception {
RouteDefinition route = assertOneRoute("dynamicRecipientList.xml");
assertFrom(route, "seda:a");
- RecipientListDefinition node = assertOneProcessorInstanceOf(RecipientListDefinition.class, route);
+ RecipientListDefinition<?> node = assertOneProcessorInstanceOf(RecipientListDefinition.class, route);
assertExpression(node.getExpression(), "header", "foo");
}
@@ -149,7 +149,7 @@ public class XmlParseTest extends XmlTes
public void testParseRoutingSlipXml() throws Exception {
RouteDefinition route = assertOneRoute("routingSlip.xml");
assertFrom(route, "seda:a");
- RoutingSlipDefinition node = assertOneProcessorInstanceOf(RoutingSlipDefinition.class, route);
+ RoutingSlipDefinition<?> node = assertOneProcessorInstanceOf(RoutingSlipDefinition.class, route);
assertEquals("destinations", node.getExpression().getExpression());
assertEquals(RoutingSlipDefinition.DEFAULT_DELIMITER, node.getUriDelimiter());
}
@@ -157,7 +157,7 @@ public class XmlParseTest extends XmlTes
public void testParseRoutingSlipWithHeaderSetXml() throws Exception {
RouteDefinition route = assertOneRoute("routingSlipHeaderSet.xml");
assertFrom(route, "seda:a");
- RoutingSlipDefinition node = assertOneProcessorInstanceOf(RoutingSlipDefinition.class, route);
+ RoutingSlipDefinition<?> node = assertOneProcessorInstanceOf(RoutingSlipDefinition.class, route);
assertEquals("theRoutingSlipHeader", node.getExpression().getExpression());
assertEquals(RoutingSlipDefinition.DEFAULT_DELIMITER, node.getUriDelimiter());
}
@@ -165,7 +165,7 @@ public class XmlParseTest extends XmlTes
public void testParseRoutingSlipWithHeaderAndDelimiterSetXml() throws Exception {
RouteDefinition route = assertOneRoute("routingSlipHeaderAndDelimiterSet.xml");
assertFrom(route, "seda:a");
- RoutingSlipDefinition node = assertOneProcessorInstanceOf(RoutingSlipDefinition.class, route);
+ RoutingSlipDefinition<?> node = assertOneProcessorInstanceOf(RoutingSlipDefinition.class, route);
assertEquals("theRoutingSlipHeader", node.getExpression().getExpression());
assertEquals("#", node.getUriDelimiter());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Animal.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Animal.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Animal.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Animal.java Sun Jan 15 10:38:40 2012
@@ -23,7 +23,7 @@ import java.io.Serializable;
*/
// START SNIPPET: e1
public class Animal implements Serializable {
-
+ private static final long serialVersionUID = 1L;
private int id;
private String name;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java Sun Jan 15 10:38:40 2012
@@ -34,8 +34,8 @@ public class ChoiceWithEndTest extends C
// use navigate to find that the end works as expected
Navigate<Processor> nav = getRoute("direct://start").navigate();
List<Processor> node = nav.next();
- node = ((Navigate) node.get(0)).next();
- node = ((Navigate) node.get(0)).next();
+ node = ((Navigate<Processor>) node.get(0)).next();
+ node = ((Navigate<Processor>) node.get(0)).next();
// there should be 4 outputs as the end in the otherwise should
// ensure that the transform and last send is not within the choice
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java Sun Jan 15 10:38:40 2012
@@ -83,11 +83,11 @@ public class CustomProcessorFactoryTest
// START SNIPPET: e3
public static class MyFactory implements ProcessorFactory {
- public Processor createChildProcessor(RouteContext routeContext, ProcessorDefinition definition, boolean mandatory) throws Exception {
+ public Processor createChildProcessor(RouteContext routeContext, ProcessorDefinition<?> definition, boolean mandatory) throws Exception {
return null;
}
- public Processor createProcessor(RouteContext routeContext, ProcessorDefinition definition) throws Exception {
+ public Processor createProcessor(RouteContext routeContext, ProcessorDefinition<?> definition) throws Exception {
if (definition instanceof SplitDefinition) {
// add additional output to the splitter
SplitDefinition split = (SplitDefinition) definition;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java Sun Jan 15 10:38:40 2012
@@ -64,6 +64,7 @@ public class DataFormatTest extends Cont
}
protected static class MyBean implements Serializable {
+ private static final long serialVersionUID = 1L;
public String name;
public int counter;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledExampleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledExampleTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledExampleTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledExampleTest.java Sun Jan 15 10:38:40 2012
@@ -103,8 +103,7 @@ public class DeadLetterChannelHandledExa
* @return the out payload
* @throws OrderFailedException is thrown if the order cannot be processed
*/
- @SuppressWarnings("unchecked")
- public Object handleOrder(@Headers Map in, @Body String payload, @OutHeaders Map out)
+ public Object handleOrder(@Headers Map<?, ?> in, @Body String payload, @OutHeaders Map<String, Object> out)
throws OrderFailedException {
out.put("customerid", in.get("customerid"));
if ("Order: kaboom".equals(payload)) {
@@ -122,8 +121,7 @@ public class DeadLetterChannelHandledExa
* @param out the out headers
* @return the out payload
*/
- @SuppressWarnings("unchecked")
- public Object orderFailed(@Headers Map in, @Body String payload, @OutHeaders Map out) {
+ public Object orderFailed(@Headers Map<?, ?> in, @Body String payload, @OutHeaders Map<String, Object> out) {
out.put("customerid", in.get("customerid"));
out.put("orderid", "failed");
return "Order ERROR";
@@ -137,6 +135,8 @@ public class DeadLetterChannelHandledExa
*/
public static class OrderFailedException extends Exception {
+ private static final long serialVersionUID = 1L;
+
public OrderFailedException(String message) {
super(message);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DualPipelineTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DualPipelineTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DualPipelineTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DualPipelineTest.java Sun Jan 15 10:38:40 2012
@@ -47,13 +47,13 @@ public class DualPipelineTest extends Co
assertEquals(3, pd1.getOutputs().size());
assertEquals(4, pd2.getOutputs().size());
- SendDefinition send1 = assertIsInstanceOf(SendDefinition.class, pd1.getOutputs().get(2));
+ SendDefinition<?> send1 = assertIsInstanceOf(SendDefinition.class, pd1.getOutputs().get(2));
assertEquals("mock:b", send1.getUri());
- SendDefinition send2 = assertIsInstanceOf(SendDefinition.class, pd2.getOutputs().get(3));
+ SendDefinition<?> send2 = assertIsInstanceOf(SendDefinition.class, pd2.getOutputs().get(3));
assertEquals("mock:e", send2.getUri());
- SendDefinition send = assertIsInstanceOf(SendDefinition.class, context.getRouteDefinitions().get(0).getOutputs().get(1));
+ SendDefinition<?> send = assertIsInstanceOf(SendDefinition.class, context.getRouteDefinitions().get(0).getOutputs().get(1));
assertEquals("mock:result", send.getUri());
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java Sun Jan 15 10:38:40 2012
@@ -75,9 +75,11 @@ public class ErrorHandlerSupportTest ext
}
private static class ParentException extends Exception {
+ private static final long serialVersionUID = 1L;
}
private static class ChildException extends ParentException {
+ private static final long serialVersionUID = 1L;
}
private static class ShuntErrorHandlerSupport extends ErrorHandlerSupport {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceTest.java Sun Jan 15 10:38:40 2012
@@ -41,9 +41,11 @@ public class FailOverLoadBalanceTest ext
}
public static class MyException extends Exception {
+ private static final long serialVersionUID = 1L;
}
public static class MyAnotherException extends Exception {
+ private static final long serialVersionUID = 1L;
}
public static class MyExceptionProcessor implements Processor {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java Sun Jan 15 10:38:40 2012
@@ -66,7 +66,7 @@ public class NavigateRouteTest extends C
// navigate children
if (child instanceof Navigate) {
- navigateRoute((Navigate) child);
+ navigateRoute((Navigate<Processor>) child);
}
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java Sun Jan 15 10:38:40 2012
@@ -82,18 +82,17 @@ public class RandomLoadBalanceJavaDSLBui
if (child instanceof DefaultChannel) {
DefaultChannel channel = (DefaultChannel) child;
- ProcessorDefinition def = channel.getProcessorDefinition();
+ ProcessorDefinition<?> def = channel.getProcessorDefinition();
navigateDefinition(def, sb);
}
}
}
- @SuppressWarnings("unchecked")
private void navigateDefinition(ProcessorDefinition<?> def, StringBuilder sb) {
// must do this ugly cast to avoid compiler error on HP-UX
- ProcessorDefinition defn = (ProcessorDefinition) def;
+ ProcessorDefinition<?> defn = (ProcessorDefinition<?>) def;
if (defn instanceof LoadBalanceDefinition) {
sb.append(".loadBalance()");
@@ -106,16 +105,17 @@ public class RandomLoadBalanceJavaDSLBui
}
if (defn instanceof SendDefinition) {
- SendDefinition send = (SendDefinition) defn;
+ SendDefinition<?> send = (SendDefinition<?>) defn;
sb.append(".to(\"" + send.getUri() + "\")");
}
+ @SuppressWarnings("rawtypes")
List<ProcessorDefinition> children = defn.getOutputs();
if (children == null || children.isEmpty()) {
return;
}
- for (ProcessorDefinition child : children) {
+ for (ProcessorDefinition<?> child : children) {
navigateDefinition(child, sb);
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SortBodyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SortBodyTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SortBodyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SortBodyTest.java Sun Jan 15 10:38:40 2012
@@ -33,7 +33,7 @@ public class SortBodyTest extends Contex
assertMockEndpointsSatisfied();
- List list = mock.getExchanges().get(0).getIn().getBody(List.class);
+ List<?> list = mock.getExchanges().get(0).getIn().getBody(List.class);
assertEquals("Claus", list.get(0));
assertEquals("Hadrian", list.get(1));
assertEquals("William", list.get(2));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java Sun Jan 15 10:38:40 2012
@@ -35,8 +35,8 @@ public class SplitWithEndTest extends Co
// use navigate to find that the end works as expected
Navigate<Processor> nav = context.getRoutes().get(0).navigate();
List<Processor> node = nav.next();
- node = ((Navigate) node.get(0)).next();
- node = ((Navigate) node.get(0)).next();
+ node = ((Navigate<Processor>) node.get(0)).next();
+ node = ((Navigate<Processor>) node.get(0)).next();
// there should be 4 outputs as the end in the otherwise should
// ensure that the transform and last send is not within the choice
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java Sun Jan 15 10:38:40 2012
@@ -57,7 +57,7 @@ public class SplitterWithCustomThreadPoo
return result;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
protected SplitDefinition firstSplitterType(List<ProcessorDefinition> outputs) {
SplitDefinition result = null;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncTraceHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncTraceHandlerTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncTraceHandlerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncTraceHandlerTest.java Sun Jan 15 10:38:40 2012
@@ -78,12 +78,12 @@ public class AsyncTraceHandlerTest exten
private static class MyTraceHandler implements TraceEventHandler {
@Override
- public void traceExchange(ProcessorDefinition node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
+ public void traceExchange(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
// noop
}
@Override
- public Object traceExchangeIn(ProcessorDefinition node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
+ public Object traceExchangeIn(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
if (node.getId().equals("async")) {
beforeThreadName = Thread.currentThread().getName();
}
@@ -91,7 +91,7 @@ public class AsyncTraceHandlerTest exten
}
@Override
- public void traceExchangeOut(ProcessorDefinition node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange, Object traceState) throws Exception {
+ public void traceExchangeOut(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange, Object traceState) throws Exception {
if (node.getId().equals("async")) {
afterThreadName = Thread.currentThread().getName();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java Sun Jan 15 10:38:40 2012
@@ -36,6 +36,7 @@ public class CustomExceptionPolicyStrate
private static final String ERROR_QUEUE = "mock:error";
public static class MyPolicyException extends Exception {
+ private static final long serialVersionUID = 1L;
}
// START SNIPPET e2
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java Sun Jan 15 10:38:40 2012
@@ -31,6 +31,7 @@ public class DefaultExceptionPolicyStrat
private static final String ERROR_USER_QUEUE = "mock:usererror";
public static class MyUserException extends Exception {
+ private static final long serialVersionUID = 1L;
public MyUserException(String message) {
super(message);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java Sun Jan 15 10:38:40 2012
@@ -31,6 +31,7 @@ public class DefaultExceptionPolicyStrat
private static final String ERROR_USER_QUEUE = "mock:usererror";
public static class MyUserException extends Exception {
+ private static final long serialVersionUID = 1L;
public MyUserException(String message) {
super(message);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/ParentChildInterceptStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/ParentChildInterceptStrategyTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/ParentChildInterceptStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/ParentChildInterceptStrategyTest.java Sun Jan 15 10:38:40 2012
@@ -85,7 +85,7 @@ public class ParentChildInterceptStrateg
public Processor wrapProcessorInInterceptors(final CamelContext context, final ProcessorDefinition<?> definition,
final Processor target, final Processor nextTarget) throws Exception {
String targetId = definition.hasCustomIdAssigned() ? definition.getId() : definition.getLabel();
- ProcessorDefinition parent = definition.getParent();
+ ProcessorDefinition<?> parent = definition.getParent();
String parentId = "";
if (parent != null) {
parentId = parent.hasCustomIdAssigned() ? parent.getId() : parent.getLabel();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/CustomInterceptorRouteWithChildOutputTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/CustomInterceptorRouteWithChildOutputTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/CustomInterceptorRouteWithChildOutputTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/CustomInterceptorRouteWithChildOutputTest.java Sun Jan 15 10:38:40 2012
@@ -71,6 +71,7 @@ public class CustomInterceptorRouteWithC
};
}
+ @SuppressWarnings("rawtypes")
private static class MyInterceptor implements InterceptStrategy {
private final List<ProcessorDefinition> defs = new ArrayList<ProcessorDefinition>();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionBreakpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionBreakpointTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionBreakpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionBreakpointTest.java Sun Jan 15 10:38:40 2012
@@ -45,7 +45,7 @@ public class DebugExceptionBreakpointTes
breakpoint = new BreakpointSupport() {
@Override
- public void afterProcess(Exchange exchange, Processor processor, ProcessorDefinition definition, long timeTaken) {
+ public void afterProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition, long timeTaken) {
Exception e = exchange.getException();
logs.add("Breakpoint at " + definition.getShortName() + " caused by: " + e.getClass().getSimpleName() + "[" + e.getMessage() + "]");
}
@@ -53,7 +53,7 @@ public class DebugExceptionBreakpointTes
exceptionCondition = new ConditionSupport() {
@Override
- public boolean matchProcess(Exchange exchange, Processor processor, ProcessorDefinition definition) {
+ public boolean matchProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition) {
return exchange.getException() != null;
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionEventBreakpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionEventBreakpointTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionEventBreakpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionEventBreakpointTest.java Sun Jan 15 10:38:40 2012
@@ -46,7 +46,7 @@ public class DebugExceptionEventBreakpoi
super.setUp();
breakpoint = new BreakpointSupport() {
- public void onEvent(Exchange exchange, EventObject event, ProcessorDefinition definition) {
+ public void onEvent(Exchange exchange, EventObject event, ProcessorDefinition<?> definition) {
AbstractExchangeEvent aee = (AbstractExchangeEvent) event;
Exception e = aee.getExchange().getException();
logs.add("Breakpoint at " + definition + " caused by: " + e.getClass().getSimpleName() + "[" + e.getMessage() + "]");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepConditionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepConditionTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepConditionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepConditionTest.java Sun Jan 15 10:38:40 2012
@@ -44,14 +44,14 @@ public class DebugSingleStepConditionTes
super.setUp();
breakpoint = new BreakpointSupport() {
- public void beforeProcess(Exchange exchange, Processor processor, ProcessorDefinition definition) {
+ public void beforeProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition) {
String body = exchange.getIn().getBody(String.class);
logs.add("Single stepping at " + definition.getLabel() + " with body: " + body);
}
};
beerCondition = new ConditionSupport() {
- public boolean matchProcess(Exchange exchange, Processor processor, ProcessorDefinition definition) {
+ public boolean matchProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition) {
return "beer".equals(exchange.getFromRouteId());
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepTest.java Sun Jan 15 10:38:40 2012
@@ -41,7 +41,7 @@ public class DebugSingleStepTest extends
super.setUp();
breakpoint = new BreakpointSupport() {
- public void beforeProcess(Exchange exchange, Processor processor, ProcessorDefinition definition) {
+ public void beforeProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition) {
String body = exchange.getIn().getBody(String.class);
logs.add("Single stepping at " + definition.getLabel() + " with body: " + body);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java Sun Jan 15 10:38:40 2012
@@ -49,25 +49,25 @@ public class DebugTest extends ContextTe
super.setUp();
breakpoint = new BreakpointSupport() {
- public void beforeProcess(Exchange exchange, Processor processor, ProcessorDefinition definition) {
+ public void beforeProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition) {
String body = exchange.getIn().getBody(String.class);
logs.add("Breakpoint at " + definition + " with body: " + body);
}
- public void onEvent(Exchange exchange, EventObject event, ProcessorDefinition definition) {
+ public void onEvent(Exchange exchange, EventObject event, ProcessorDefinition<?> definition) {
String body = exchange.getIn().getBody(String.class);
logs.add("Breakpoint event " + event.getClass().getSimpleName() + " with body: " + body);
}
};
camelCondition = new ConditionSupport() {
- public boolean matchProcess(Exchange exchange, Processor processor, ProcessorDefinition definition) {
+ public boolean matchProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition) {
return body().contains("Camel").matches(exchange);
}
};
mockCondition = new ConditionSupport() {
- public boolean matchProcess(Exchange exchange, Processor processor, ProcessorDefinition definition) {
+ public boolean matchProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition) {
// match when sending to mocks
if (definition instanceof ToDefinition) {
ToDefinition to = (ToDefinition) definition;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceHandlerTestHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceHandlerTestHandler.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceHandlerTestHandler.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceHandlerTestHandler.java Sun Jan 15 10:38:40 2012
@@ -57,19 +57,19 @@ public class TraceHandlerTestHandler imp
eventMessages.add(message);
}
- public static void recordComplete(StringBuilder message, ProcessorDefinition node, Exchange exchange) {
+ public static void recordComplete(StringBuilder message, ProcessorDefinition<?> node, Exchange exchange) {
message.append("Complete: ");
message.append(node.getLabel() + ": ");
message.append(exchange.getIn().getBody());
}
- public static void recordIn(StringBuilder message, ProcessorDefinition node, Exchange exchange) {
+ public static void recordIn(StringBuilder message, ProcessorDefinition<?> node, Exchange exchange) {
message.append("In: ");
message.append(node.getLabel() + ": ");
message.append(exchange.getIn().getBody());
}
- public static void recordOut(StringBuilder message, ProcessorDefinition node, Exchange exchange) {
+ public static void recordOut(StringBuilder message, ProcessorDefinition<?> node, Exchange exchange) {
message.append("Out: ");
message.append(node.getLabel() + ": ");
if (null != exchange.getOut()) {
@@ -83,7 +83,7 @@ public class TraceHandlerTestHandler imp
}
}
- public void traceExchange(ProcessorDefinition node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
+ public void traceExchange(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
if (traceAllNodes || !node.getLabel().contains("TraceTestProcessor")) {
StringBuilder message = new StringBuilder();
recordComplete(message, node, exchange);
@@ -91,7 +91,7 @@ public class TraceHandlerTestHandler imp
}
}
- public Object traceExchangeIn(ProcessorDefinition node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
+ public Object traceExchangeIn(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
if (traceAllNodes || !node.getLabel().contains("TraceTestProcessor")) {
StringBuilder message = new StringBuilder();
recordIn(message, node, exchange);
@@ -101,7 +101,7 @@ public class TraceHandlerTestHandler imp
}
}
- public void traceExchangeOut(ProcessorDefinition node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange, Object traceState) throws Exception {
+ public void traceExchangeOut(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange, Object traceState) throws Exception {
if (traceAllNodes || !node.getLabel().contains("TraceTestProcessor")) {
if (StringBuilder.class.equals(traceState.getClass())) {
StringBuilder message = (StringBuilder) traceState;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorFactoryCreatesHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorFactoryCreatesHandlerTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorFactoryCreatesHandlerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorFactoryCreatesHandlerTest.java Sun Jan 15 10:38:40 2012
@@ -36,7 +36,7 @@ public class TraceInterceptorFactoryCrea
}
@SuppressWarnings("deprecation")
- public Processor createTraceInterceptor(ProcessorDefinition node, Processor target, TraceFormatter formatter, Tracer tracer) {
+ public Processor createTraceInterceptor(ProcessorDefinition<?> node, Processor target, TraceFormatter formatter, Tracer tracer) {
TraceInterceptor interceptor = new TraceInterceptor(node, target, formatter, tracer);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorSubclassFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorSubclassFactory.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorSubclassFactory.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorSubclassFactory.java Sun Jan 15 10:38:40 2012
@@ -31,7 +31,7 @@ public class TraceInterceptorSubclassFac
this.eventMessages = eventMessages;
}
- public TraceInterceptor createTraceInterceptor(ProcessorDefinition node, Processor target, TraceFormatter formatter, Tracer tracer) {
+ public TraceInterceptor createTraceInterceptor(ProcessorDefinition<?> node, Processor target, TraceFormatter formatter, Tracer tracer) {
return new TracerInterceptorSubclass(node, target, formatter, tracer, eventMessages, this);
}
@@ -48,7 +48,7 @@ public class TraceInterceptorSubclassFac
private boolean traceThisNode = true;
private TraceInterceptorSubclassFactory factory;
- public TracerInterceptorSubclass(ProcessorDefinition node, Processor target, TraceFormatter formatter,
+ public TracerInterceptorSubclass(ProcessorDefinition<?> node, Processor target, TraceFormatter formatter,
Tracer tracer, List<StringBuilder> eventMessages, TraceInterceptorSubclassFactory factory) {
super(node, target, formatter, tracer);
this.eventMessages = eventMessages;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/MyFunctionalException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/MyFunctionalException.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/MyFunctionalException.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/MyFunctionalException.java Sun Jan 15 10:38:40 2012
@@ -17,6 +17,7 @@
package org.apache.camel.processor.onexception;
public class MyFunctionalException extends Exception {
+ private static final long serialVersionUID = 1L;
public MyFunctionalException(String message) {
super(message);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/MyTechnicalException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/MyTechnicalException.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/MyTechnicalException.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/MyTechnicalException.java Sun Jan 15 10:38:40 2012
@@ -17,6 +17,7 @@
package org.apache.camel.processor.onexception;
public class MyTechnicalException extends Exception {
+ private static final long serialVersionUID = 1L;
public MyTechnicalException(String message) {
super(message);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWhenSimpleOgnlTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWhenSimpleOgnlTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWhenSimpleOgnlTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWhenSimpleOgnlTest.java Sun Jan 15 10:38:40 2012
@@ -50,6 +50,7 @@ public class OnExceptionWhenSimpleOgnlTe
}
public static final class MyException extends Exception {
+ private static final long serialVersionUID = 1L;
private final MyExceptionInfo info;
public MyException(int state) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java Sun Jan 15 10:38:40 2012
@@ -487,7 +487,7 @@ public class CaseInsensitiveMapTest exte
// retain maps so we can profile that the map doesn't duplicate
// camel keys as they are intern
- List<Map> maps = new ArrayList<Map>();
+ List<Map<?, ?>> maps = new ArrayList<Map<?, ?>>();
for (int i = 0; i < 10000; i++) {
Map<String, Object> copy = new CaseInsensitiveMap(map);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java Sun Jan 15 10:38:40 2012
@@ -29,7 +29,6 @@ import org.apache.camel.Ordered;
*/
public class OrderedComparatorTest extends TestCase {
- @SuppressWarnings("unchecked")
public void testOrderedComparator() throws Exception {
List<Ordered> answer = new ArrayList<Ordered>();
answer.add(new MyOrder(0));
@@ -47,7 +46,6 @@ public class OrderedComparatorTest exten
assertEquals(5, answer.get(4).getOrder());
}
- @SuppressWarnings("unchecked")
public void testOrderedComparatorReverse() throws Exception {
List<Ordered> answer = new ArrayList<Ordered>();
answer.add(new MyOrder(0));
@@ -65,7 +63,6 @@ public class OrderedComparatorTest exten
assertEquals(0, answer.get(4).getOrder());
}
- @SuppressWarnings("unchecked")
public void testOrderedComparatorHigh() throws Exception {
List<Ordered> answer = new ArrayList<Ordered>();
answer.add(new MyOrder(0));
@@ -85,7 +82,6 @@ public class OrderedComparatorTest exten
assertEquals(200, answer.get(5).getOrder());
}
- @SuppressWarnings("unchecked")
public void testOrderedComparatorHighReverse() throws Exception {
List<Ordered> answer = new ArrayList<Ordered>();
answer.add(new MyOrder(0));
@@ -105,7 +101,6 @@ public class OrderedComparatorTest exten
assertEquals(Ordered.HIGHEST, answer.get(5).getOrder());
}
- @SuppressWarnings("unchecked")
public void testOrderedComparatorLow() throws Exception {
List<Ordered> answer = new ArrayList<Ordered>();
answer.add(new MyOrder(0));
@@ -125,7 +120,6 @@ public class OrderedComparatorTest exten
assertEquals(Ordered.LOWEST, answer.get(5).getOrder());
}
- @SuppressWarnings("unchecked")
public void testOrderedComparatorLowReverse() throws Exception {
List<Ordered> answer = new ArrayList<Ordered>();
answer.add(new MyOrder(0));
Modified: camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java (original)
+++ camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java Sun Jan 15 10:38:40 2012
@@ -22,6 +22,7 @@ import java.lang.reflect.Type;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
+import org.apache.camel.RuntimeCamelException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.transaction.TransactionStatus;
@@ -74,7 +75,6 @@ public abstract class BamProcessorSuppor
this.correlationKeyExpression = correlationKeyExpression;
}
- @SuppressWarnings("unchecked")
public void process(final Exchange exchange) {
for (int i = 1; i <= retryCount; i++) {
if (i > 1) {
@@ -86,8 +86,8 @@ public abstract class BamProcessorSuppor
}
}
try {
- transactionTemplate.execute(new TransactionCallback() {
- public Object doInTransaction(TransactionStatus status) {
+ transactionTemplate.execute(new TransactionCallback<T>() {
+ public T doInTransaction(TransactionStatus status) {
try {
Object key = getCorrelationKey(exchange);
@@ -98,7 +98,8 @@ public abstract class BamProcessorSuppor
return entity;
} catch (Exception e) {
- return onError(status, e);
+ onError(status, e);
+ return null;
}
}
});
@@ -144,7 +145,7 @@ public abstract class BamProcessorSuppor
return value;
}
- protected Object onError(TransactionStatus status, Exception e) {
+ protected void onError(TransactionStatus status, Exception e) throws RuntimeCamelException {
status.setRollbackOnly();
LOG.error("Caught: " + e, e);
throw wrapRuntimeCamelException(e);
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java Sun Jan 15 10:38:40 2012
@@ -195,9 +195,9 @@ public abstract class BindyAbstractFacto
}
/**
- * Format the object into a string according to the format rue defined
+ * Format the object into a string according to the format rule defined
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public String formatString(Format format, Object value) throws Exception {
String strValue = "";
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java Sun Jan 15 10:38:40 2012
@@ -51,7 +51,7 @@ public class BindyCarQuoteAndCommaDelimi
assertMockEndpointsSatisfied();
- Map map1 = (Map) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
+ Map<?, ?> map1 = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
Car rec1 = (Car) map1.values().iterator().next();
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java Sun Jan 15 10:38:40 2012
@@ -55,7 +55,7 @@ public class BindyInlinedQuotesCsvUnmars
result.expectedMessageCount(1);
result.assertIsSatisfied();
- Map map = (Map) result.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
+ Map<?, ?> map = (Map<?, ?>) result.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
BindyDoubleQuotesCsvUnmarshallTest.Order order = (BindyDoubleQuotesCsvUnmarshallTest.Order) map.values().iterator().next();
Assert.assertEquals(10, order.getOrderNr());
Assert.assertEquals("Pauline", order.getFirstName());
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java Sun Jan 15 10:38:40 2012
@@ -40,8 +40,8 @@ public class BindyPipeDelimiterTest exte
assertMockEndpointsSatisfied();
- Map map1 = (Map) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
- Map map2 = (Map) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(1);
+ Map<?, ?> map1 = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
+ Map<?, ?> map2 = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(1);
MyData rec1 = (MyData) map1.values().iterator().next();
MyData rec2 = (MyData) map2.values().iterator().next();
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java Sun Jan 15 10:38:40 2012
@@ -41,8 +41,8 @@ public class BindyTabSeparatorTest exten
assertMockEndpointsSatisfied();
- List<Map> rows = CastUtils.cast(mock.getReceivedExchanges().get(0).getIn().getBody(List.class));
- PurchaseOrder order = (PurchaseOrder) rows.get(0).get(PurchaseOrder.class.getName());
+ List<Map<?, PurchaseOrder>> rows = CastUtils.cast(mock.getReceivedExchanges().get(0).getIn().getBody(List.class));
+ PurchaseOrder order = rows.get(0).get(PurchaseOrder.class.getName());
assertEquals(123, order.getId());
assertEquals("Camel in Action", order.getName());
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java Sun Jan 15 10:38:40 2012
@@ -40,7 +40,7 @@ public class BindyUnmarshalCommaIssueTes
assertMockEndpointsSatisfied();
- Map map = (Map) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
+ Map<?, ?> map = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
WeatherModel model = (WeatherModel) map.values().iterator().next();
assertEquals(123, model.getId());
@@ -58,7 +58,7 @@ public class BindyUnmarshalCommaIssueTes
assertMockEndpointsSatisfied();
- Map map = (Map) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
+ Map<?, ?> map = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
WeatherModel model = (WeatherModel) map.values().iterator().next();
assertEquals(123, model.getId());
@@ -76,7 +76,7 @@ public class BindyUnmarshalCommaIssueTes
assertMockEndpointsSatisfied();
- Map map = (Map) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
+ Map<?, ?> map = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
WeatherModel model = (WeatherModel) map.values().iterator().next();
assertEquals(123, model.getId());
@@ -94,7 +94,7 @@ public class BindyUnmarshalCommaIssueTes
assertMockEndpointsSatisfied();
- Map map = (Map) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
+ Map<?, ?> map = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
WeatherModel model = (WeatherModel) map.values().iterator().next();
assertEquals(123, model.getId());
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java Sun Jan 15 10:38:40 2012
@@ -61,7 +61,7 @@ public class BindySimpleFixedLengthUnmar
result.assertIsSatisfied();
// check the model
- Map map = (Map) result.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
+ Map<?, ?> map = (Map<?, ?>) result.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
BindySimpleFixedLengthUnmarshallTest.Order order = (BindySimpleFixedLengthUnmarshallTest.Order) map.values().iterator().next();
Assert.assertEquals(10, order.getOrderNr());
// the field is not trimmed
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java Sun Jan 15 10:38:40 2012
@@ -61,7 +61,7 @@ public class BindySimpleFixedLengthUnmar
result.assertIsSatisfied();
// check the model
- Map map = (Map) result.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
+ Map<?, ?> map = (Map<?, ?>) result.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0);
BindySimpleFixedLengthUnmarshallTrimFieldTest.Order order = (BindySimpleFixedLengthUnmarshallTrimFieldTest.Order) map.values().iterator().next();
Assert.assertEquals(10, order.getOrderNr());
// the field is not trimmed
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java Sun Jan 15 10:38:40 2012
@@ -732,7 +732,7 @@ public class CamelNamespaceHandler imple
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void findOutputComponents(List<ProcessorDefinition> defs, Set<String> components, Set<String> languages, Set<String> dataformats) {
if (defs != null) {
for (ProcessorDefinition def : defs) {
Modified: camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java (original)
+++ camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java Sun Jan 15 10:38:40 2012
@@ -64,7 +64,7 @@ public class CacheConfiguration implemen
setCacheName(uri.getHost());
- Map cacheSettings = URISupport.parseParameters(uri);
+ Map<String, Object> cacheSettings = URISupport.parseParameters(uri);
if (cacheSettings.containsKey("maxElementsInMemory")) {
setMaxElementsInMemory(Integer.valueOf((String) cacheSettings.get("maxElementsInMemory")).intValue());
}