You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/04/27 05:23:28 UTC
svn commit: r938312 - in /camel/trunk/components:
camel-groovy/src/main/java/org/apache/camel/language/groovy/
camel-groovy/src/test/java/org/apache/camel/language/groovy/
camel-guice/src/test/java/org/apache/camel/guice/
Author: ningjiang
Date: Tue Apr 27 03:23:27 2010
New Revision: 938312
URL: http://svn.apache.org/viewvc?rev=938312&view=rev
Log:
Clean up the @SuppressWarnings in camel-guice, camel-groovy
Modified:
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java
camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MyRouteInstaller.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
Modified: camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java?rev=938312&r1=938311&r2=938312&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java (original)
+++ camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java Tue Apr 27 03:23:27 2010
@@ -65,6 +65,7 @@ public class GroovyExpression extends Ex
return null;
}
+ @SuppressWarnings("unchecked")
@Override
public Set entrySet() {
return Collections.EMPTY_SET;
Modified: camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java?rev=938312&r1=938311&r2=938312&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java (original)
+++ camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java Tue Apr 27 03:23:27 2010
@@ -16,6 +16,9 @@
*/
package org.apache.camel.language.groovy;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
import groovy.lang.GroovyShell;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
@@ -36,7 +39,7 @@ public abstract class GroovyRouteBuilder
private void init() {
ClassLoader loader = getClass().getClassLoader();
GroovyShell shell = new GroovyShell(loader);
- shell.evaluate(loader.getResourceAsStream("org/apache/camel/language/groovy/ConfigureCamel.groovy"));
+ shell.evaluate(new InputStreamReader(loader.getResourceAsStream("org/apache/camel/language/groovy/ConfigureCamel.groovy")));
// TODO compile Groovy as part of build!
//new ConfigureCamel().run();
Modified: camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java?rev=938312&r1=938311&r2=938312&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java (original)
+++ camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovySetHeaderTest.java Tue Apr 27 03:23:27 2010
@@ -37,7 +37,7 @@ public class GroovySetHeaderTest extends
mock.expectedHeaderReceived("beer", "Carlsberg");
mock.expectedHeaderReceived("drink", "Carlsberg");
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("one", "einz");
headers.put("two", "twei");
headers.put("beer", "Carlsberg");
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java?rev=938312&r1=938311&r2=938312&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java Tue Apr 27 03:23:27 2010
@@ -53,7 +53,7 @@ public class ComponentFoundInRegistryTes
@Test
public void testGuice() throws Exception {
- Hashtable env = new Hashtable();
+ Hashtable<String, Object> env = new Hashtable<String, Object>();
env.put(InitialContext.PROVIDER_URL, GuiceInitialContextFactory.class.getName());
env.put(Injectors.MODULE_CLASS_NAMES, MyModule.class.getName());
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java?rev=938312&r1=938311&r2=938312&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java Tue Apr 27 03:23:27 2010
@@ -27,6 +27,7 @@ import org.junit.Test;
*/
public class ConciseGuiceRouteTest extends Assert {
+ @SuppressWarnings("unchecked")
@Test
public void testGuice() throws Exception {
// lets disable resource injection to avoid JNDI being used
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MyRouteInstaller.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MyRouteInstaller.java?rev=938312&r1=938311&r2=938312&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MyRouteInstaller.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MyRouteInstaller.java Tue Apr 27 03:23:27 2010
@@ -28,8 +28,8 @@ public class MyRouteInstaller extends Ro
// TODO we could register explicit endpoints here too if we want
// lets add some other route builders
- addRoutes(new MyConfigurableRoute(endpoint("direct:a"), endpoint("direct:b")));
- addRoutes(new MyConfigurableRoute(endpoint("direct:c"), endpoint("direct:d")));
+ includeRoutes(new MyConfigurableRoute(endpoint("direct:a"), endpoint("direct:b")));
+ includeRoutes(new MyConfigurableRoute(endpoint("direct:c"), endpoint("direct:d")));
}
}
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java?rev=938312&r1=938311&r2=938312&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java Tue Apr 27 03:23:27 2010
@@ -30,6 +30,7 @@ public class TraditionalGuiceRouteTest e
public static class MyModule extends CamelModuleWithRouteTypes {
+ @SuppressWarnings("unchecked")
public MyModule() {
super(MyHardcodeRoute.class, MyRouteInstaller.class);
}