Author: hadrian
Date: Wed Nov 18 07:13:58 2009
New Revision: 881690
URL: http://svn.apache.org/viewvc?rev=881690&view=rev
Log:
Compiler warnings cleanup (continued)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInfoTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanMethodHeartbeatTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/PurchaseOrder.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
Wed Nov 18 07:13:58 2009
@@ -26,6 +26,7 @@
import javax.xml.xpath.XPathFactory;
import org.apache.camel.spi.NamespaceAware;
+import org.apache.camel.util.CastUtils;
/**
* An implementation of {...@link NamespaceContext} which uses a simple Map
where
@@ -81,17 +82,16 @@
return null;
}
- @SuppressWarnings("unchecked")
- public Iterator getPrefixes(String namespaceURI) {
- Set set = new HashSet();
- for (Iterator iter = map.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
+ public Iterator<String> getPrefixes(String namespaceURI) {
+ Set<String> set = new HashSet<String>();
+ for (Iterator<Map.Entry<String, String>> iter =
map.entrySet().iterator(); iter.hasNext();) {
+ Map.Entry<String, String> entry = iter.next();
if (namespaceURI.equals(entry.getValue())) {
set.add(entry.getKey());
}
}
if (parent != null) {
- Iterator iter = parent.getPrefixes(namespaceURI);
+ Iterator<String> iter =
CastUtils.cast(parent.getPrefixes(namespaceURI));
while (iter.hasNext()) {
set.add(iter.next());
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
Wed Nov 18 07:13:58 2009
@@ -154,7 +154,7 @@
// then wrap the output with the tracer
// the tracer should have the fine grained definition so if a child is
set then use it, if not then its the original output used
- ProcessorDefinition traceDef = childDefinition != null ?
childDefinition : outputDefinition;
+ ProcessorDefinition<?> traceDef = childDefinition != null ?
childDefinition : outputDefinition;
TraceInterceptor trace = (TraceInterceptor)
getOrCreateTracer().wrapProcessorInInterceptors(routeContext.getCamelContext(),
traceDef, target, null);
// trace interceptor need to have a reference to route context so we
at runtime can enable/disable tracing on-the-fly
trace.setRouteContext(routeContext);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
Wed Nov 18 07:13:58 2009
@@ -234,6 +234,7 @@
protected RouteBuilder createTryCatchNoEnd() {
return new RouteBuilder() {
+ @SuppressWarnings("unchecked")
public void configure() {
from("direct:a")
.doTry()
@@ -273,6 +274,7 @@
protected RouteBuilder createTryCatchEnd() {
return new RouteBuilder() {
+ @SuppressWarnings("unchecked")
public void configure() {
from("direct:a").doTry().process(validator).process(toProcessor)
.doCatch(ValidationException.class).process(orderProcessor).end().process(orderProcessor3);
@@ -307,6 +309,7 @@
protected RouteBuilder createTryCatchFinallyNoEnd() {
return new RouteBuilder() {
+ @SuppressWarnings("unchecked")
public void configure() {
from("direct:a").doTry().process(validator).process(toProcessor)
.doCatch(ValidationException.class).process(orderProcessor).doFinally()
@@ -346,6 +349,7 @@
protected RouteBuilder createTryCatchFinallyEnd() {
return new RouteBuilder() {
+ @SuppressWarnings("unchecked")
public void configure() {
from("direct:a").doTry().process(validator).process(toProcessor)
.doCatch(ValidationException.class).process(orderProcessor).doFinally()
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
Wed Nov 18 07:13:58 2009
@@ -60,7 +60,7 @@
assertIsInstanceOf(LoggingErrorHandler.class,
channel.getErrorHandler());
Processor processor = unwrap(channel.getNextProcessor());
- SendProcessor sendProcessor =
assertIsInstanceOf(SendProcessor.class, processor);
+ assertIsInstanceOf(SendProcessor.class, processor);
}
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
Wed Nov 18 07:13:58 2009
@@ -151,13 +151,16 @@
}
public static class MyBaseBusinessException extends Exception {
+ private static final long serialVersionUID = 1L;
}
public static class MyBusinessException extends MyBaseBusinessException {
+ private static final long serialVersionUID = 1L;
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
+ @SuppressWarnings("unchecked")
public void configure() throws Exception {
errorHandler(deadLetterChannel("mock:error").redeliverDelay(0).maximumRedeliveries(3));
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
Wed Nov 18 07:13:58 2009
@@ -38,7 +38,7 @@
String prefix = context.getPrefix("foo");
assertNull(prefix);
- Iterator it = context.getPrefixes("foo");
+ Iterator<String> it = context.getPrefixes("foo");
assertEquals(false, it.hasNext());
}
@@ -53,7 +53,7 @@
String prefix = context.getPrefix("http://acme/cheese");
assertEquals("pre", prefix);
- Iterator it = context.getPrefixes("http://acme/cheese");
+ Iterator<String> it = context.getPrefixes("http://acme/cheese");
assertEquals(true, it.hasNext());
assertEquals("pre", it.next());
}
@@ -73,11 +73,11 @@
String prefix2 = context.getPrefix("http://acme/bar");
assertEquals("bar", prefix2);
- Iterator it = context.getPrefixes("http://acme/cheese");
+ Iterator<String> it = context.getPrefixes("http://acme/cheese");
assertEquals(true, it.hasNext());
assertEquals("pre", it.next());
- Iterator it2 = context.getPrefixes("http://acme/bar");
+ Iterator<String> it2 = context.getPrefixes("http://acme/bar");
assertEquals(true, it2.hasNext());
assertEquals("bar", it2.next());
}
@@ -91,7 +91,7 @@
assertEquals(Namespaces.IN_NAMESPACE, uri);
String prefix = context.getPrefix(Namespaces.IN_NAMESPACE);
assertEquals("in", prefix);
- Iterator it = context.getPrefixes(Namespaces.IN_NAMESPACE);
+ Iterator<String> it = context.getPrefixes(Namespaces.IN_NAMESPACE);
assertEquals(true, it.hasNext());
assertEquals("in", it.next());
@@ -114,7 +114,7 @@
}
public void testDefaultNamespaceContextAnotherCtr() throws Exception {
- Map map = new HashMap();
+ Map<String, String> map = new HashMap<String, String>();
map.put("foo", "http://acme/cheese");
DefaultNamespaceContext context = new DefaultNamespaceContext(null,
map);
@@ -125,5 +125,4 @@
String uri2 = context.getNamespaceURI("foo");
assertEquals("http://acme/cheese", uri2);
}
-
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanHandlerMethodTest.java
Wed Nov 18 07:13:58 2009
@@ -43,7 +43,7 @@
Exchange exchange = new DefaultExchange(context);
MyAmbigiousBean pojo = new MyAmbigiousBean();
try {
- MethodInvocation mi = info.createInvocation(pojo, exchange);
+ info.createInvocation(pojo, exchange);
fail("Should have thrown an exception");
} catch (AmbiguousMethodCallException e) {
assertEquals(2, e.getMethods().size());
@@ -76,7 +76,7 @@
Exchange exchange = new DefaultExchange(context);
MyReallyDummyBean pojo = new MyReallyDummyBean();
try {
- MethodInvocation mi = info.createInvocation(pojo, exchange);
+ info.createInvocation(pojo, exchange);
fail("Should throw exception");
} catch (AmbiguousMethodCallException e) {
assertEquals(2, e.getMethods().size());
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoAMoreComplexOverloadedTest.java
Wed Nov 18 07:13:58 2009
@@ -70,7 +70,7 @@
exchange.setIn(message);
try {
- MethodInvocation methodInvocation = beanInfo.createInvocation(new
Bean(), exchange);
+ beanInfo.createInvocation(new Bean(), exchange);
fail("Should have thrown an exception");
} catch (AmbiguousMethodCallException e) {
assertEquals(2, e.getMethods().size());
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java
Wed Nov 18 07:13:58 2009
@@ -65,7 +65,7 @@
exchange.getIn().setBody(new Request());
try {
- MethodInvocation mi = beanInfo.createInvocation(null, exchange);
+ beanInfo.createInvocation(null, exchange);
Assert.fail("This should be ambiguous!");
} catch (AmbiguousMethodCallException e) {
// expected (currently not supported in camel)
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
Wed Nov 18 07:13:58 2009
@@ -88,13 +88,13 @@
assertMethodPattern(info, "inOutMethod", ExchangePattern.InOut);
}
- protected BeanInfo createBeanInfo(Class type) {
+ protected BeanInfo createBeanInfo(Class<?> type) {
BeanInfo info = new BeanInfo(camelContext, type);
return info;
}
protected void assertMethodPattern(BeanInfo info, String methodName,
ExchangePattern expectedPattern) throws NoSuchMethodException {
- Class type = info.getType();
+ Class<?> type = info.getType();
Method method = type.getMethod(methodName);
assertNotNull("Could not find method: " + methodName, method);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInfoTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInfoTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInfoTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInfoTest.java
Wed Nov 18 07:13:58 2009
@@ -29,7 +29,7 @@
protected CamelContext camelContext = new DefaultCamelContext();
public void testMethodPatternUsingMethodAnnotations() throws Exception {
- Class foo = Foo.class.getClass();
+ Class<?> foo = Foo.class.getClass();
ParameterInfo info = new ParameterInfo(1, foo.getClass(),
foo.getAnnotations(), null);
assertNotNull(info);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java
Wed Nov 18 07:13:58 2009
@@ -84,10 +84,9 @@
fail("Should not invoce me");
}
- public void withAnnotations(@Headers Map headers, @Body String body) {
+ public void withAnnotations(@Headers Map<String, Object> headers,
@Body String body) {
assertEquals("Hello World from James", body);
assertEquals("James", headers.get("from"));
}
}
-
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java
Wed Nov 18 07:13:58 2009
@@ -27,6 +27,7 @@
/**
* @version $Revision$
*/
+...@suppresswarnings("unchecked")
public class BeanProxyTest extends ContextTestSupport {
public void testBeanProxyStringReturnString() throws Exception {
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
Wed Nov 18 07:13:58 2009
@@ -51,7 +51,7 @@
}
});
- Map foo = myBean.headers;
+ Map<String, Object> foo = myBean.headers;
assertNotNull("myBean.foo", foo);
assertEquals("foo.h1", "xyz", foo.get("h1"));
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanMethodHeartbeatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanMethodHeartbeatTest.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanMethodHeartbeatTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanMethodHeartbeatTest.java
Wed Nov 18 07:13:58 2009
@@ -28,6 +28,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.CastUtils;
/**
* This test shows we can poll a bean for a method and send the POJO over some
transport
@@ -49,7 +50,7 @@
Exchange exchange = list.get(0);
log.debug("In: " + exchange.getIn());
log.debug("Out: " + exchange.getOut());
- Map map = assertIsInstanceOf(Map.class, exchange.getIn().getBody());
+ Map<String, Object> map = CastUtils.cast(assertIsInstanceOf(Map.class,
exchange.getIn().getBody()));
log.debug("Received: " + map);
}
@@ -76,8 +77,8 @@
this.name = name;
}
- public Map status() {
- Map answer = new HashMap();
+ public Map<String, Object> status() {
+ Map<String, Object> answer = new HashMap<String, Object>();
answer.put("name", name);
answer.put("time", new Date());
return answer;
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=881690&r1=881689&r2=881690&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
Wed Nov 18 07:13:58 2009
@@ -91,6 +91,7 @@
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
+ @SuppressWarnings("unchecked")
@Override
public void configure() throws Exception {
MyChoiceBean bean = new MyChoiceBean();
Modified:
camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/PurchaseOrder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/PurchaseOrder.java?rev=881690&r1=881689&r2=881690&view=diff
==============================================================================
---
camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/PurchaseOrder.java
(original)
+++
camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/PurchaseOrder.java
Wed Nov 18 07:13:58 2009
@@ -24,6 +24,8 @@
* @version $Revision$
*/
public class PurchaseOrder implements Serializable {
+ private static final long serialVersionUID = 1L;
+
private String product;
private double amount;