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/10/21 09:40:49 UTC
svn commit: r1025866 - in /camel/trunk/components/camel-spring/src:
main/java/org/apache/camel/osgi/ main/java/org/apache/camel/spring/
main/java/org/apache/camel/spring/handler/
main/java/org/apache/camel/spring/spi/ main/java/org/apache/camel/spring/...
Author: ningjiang
Date: Thu Oct 21 07:40:49 2010
New Revision: 1025866
URL: http://svn.apache.org/viewvc?rev=1025866&view=rev
Log:
clean up the Eclipse warnings of camel-spring
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/Activator.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/Activator.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/Activator.java?rev=1025866&r1=1025865&r2=1025866&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/Activator.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/Activator.java Thu Oct 21 07:40:49 2010
@@ -28,6 +28,10 @@ public class Activator implements Bundle
public static Bundle getBundle() {
return bundle;
}
+
+ public static BundleContext getBundleContext() {
+ return context;
+ }
public void start(BundleContext context) throws Exception {
Activator.context = context;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=1025866&r1=1025865&r2=1025866&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Thu Oct 21 07:40:49 2010
@@ -162,8 +162,7 @@ public class CamelContextFactoryBean ext
public Class getObjectType() {
return SpringCamelContext.class;
}
-
- @SuppressWarnings("unchecked")
+
protected <S> S getBeanForType(Class<S> clazz) {
S bean = null;
String[] names = getApplicationContext().getBeanNamesForType(clazz, true, true);
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java?rev=1025866&r1=1025865&r2=1025866&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java Thu Oct 21 07:40:49 2010
@@ -219,8 +219,7 @@ public class Main extends MainSupport {
return new ClassPathXmlApplicationContext(args);
}
}
-
- @SuppressWarnings("unchecked")
+
protected Map<String, CamelContext> getCamelContextMap() {
Map<String, SpringCamelContext> map = applicationContext.getBeansOfType(SpringCamelContext.class);
Set<Map.Entry<String, SpringCamelContext>> entries = map.entrySet();
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java?rev=1025866&r1=1025865&r2=1025866&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java Thu Oct 21 07:40:49 2010
@@ -43,7 +43,6 @@ public abstract class SpringRouteBuilder
* @param type the type of the bean
* @return the bean
*/
- @SuppressWarnings("unchecked")
public <T> T lookup(String beanName, Class<T> type) {
ApplicationContext context = getApplicationContext();
return (T)context.getBean(beanName, type);
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=1025866&r1=1025865&r2=1025866&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Thu Oct 21 07:40:49 2010
@@ -115,7 +115,7 @@ public class CamelNamespaceHandler exten
boolean osgi = false;
Class cl = CamelContextFactoryBean.class;
try {
- Class c = Class.forName("org.apache.camel.osgi.Activator");
+ Class<?> c = Class.forName("org.apache.camel.osgi.Activator");
Method mth = c.getDeclaredMethod("getBundle");
Object bundle = mth.invoke(null);
if (bundle != null) {
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java?rev=1025866&r1=1025865&r2=1025866&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java Thu Oct 21 07:40:49 2010
@@ -55,7 +55,6 @@ public class ApplicationContextRegistry
}
}
- @SuppressWarnings("unchecked")
public <T> Map<String, T> lookupByType(Class<T> type) {
return applicationContext.getBeansOfType(type);
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java?rev=1025866&r1=1025865&r2=1025866&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java Thu Oct 21 07:40:49 2010
@@ -38,7 +38,7 @@ import static org.apache.camel.util.Obje
public class MainRunner implements InitializingBean, Runnable {
private static final Log LOG = LogFactory.getLog(MainRunner.class);
- private Class main;
+ private Class<?> main;
private String[] args = {};
private boolean asyncRun = true;
private long delay;
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java?rev=1025866&r1=1025865&r2=1025866&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java Thu Oct 21 07:40:49 2010
@@ -51,8 +51,7 @@ public class DefaultJMXAgentTest extends
mbsc = null;
super.tearDown();
}
-
- @SuppressWarnings("unchecked")
+
protected void releaseMBeanServers() {
List<MBeanServer> servers = MBeanServerFactory.findMBeanServer(null);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java?rev=1025866&r1=1025865&r2=1025866&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java Thu Oct 21 07:40:49 2010
@@ -46,7 +46,6 @@ public class DualCamelContextManagedTest
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/dualCamelContextManagedTest.xml");
}
- @SuppressWarnings("unchecked")
public void testDualCamelContextManaged() throws Exception {
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();