Author: ningjiang
Date: Wed Apr 28 02:37:25 2010
New Revision: 938753
URL: http://svn.apache.org/viewvc?rev=938753&view=rev
Log:
Clean up the @SuppressWarnings in camel-osgi
Modified:
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiLanguageResolver.java
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/tracker/AbstractTracked.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiClassResolverTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiComponentResolverTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ServiceRegistryTest.java
Modified:
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java?rev=938753&r1=938752&r2=938753&view=diff
==============================================================================
---
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java
(original)
+++
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java
Wed Apr 28 02:37:25 2010
@@ -41,7 +41,7 @@ public class OsgiFactoryFinder extends D
}
@Override
- public Class findClass(String key, String propertyPrefix) throws
ClassNotFoundException, IOException {
+ public Class<?> findClass(String key, String propertyPrefix) throws
ClassNotFoundException, IOException {
if (propertyPrefix == null) {
propertyPrefix = "";
}
Modified:
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiLanguageResolver.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiLanguageResolver.java?rev=938753&r1=938752&r2=938753&view=diff
==============================================================================
---
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiLanguageResolver.java
(original)
+++
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiLanguageResolver.java
Wed Apr 28 02:37:25 2010
@@ -30,12 +30,12 @@ public class OsgiLanguageResolver extend
}
@Override
- protected Class findLanguage(String name, CamelContext context) throws
Exception {
+ protected Class<?> findLanguage(String name, CamelContext context) throws
Exception {
return Activator.getLanguage(name);
}
@Override
- protected Class findLanguageResolver(String name, CamelContext context)
throws Exception {
+ protected Class<?> findLanguageResolver(String name, CamelContext context)
throws Exception {
return Activator.getLanguageResolver(name);
}
Modified:
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/tracker/AbstractTracked.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/tracker/AbstractTracked.java?rev=938753&r1=938752&r2=938753&view=diff
==============================================================================
---
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/tracker/AbstractTracked.java
(original)
+++
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/tracker/AbstractTracked.java
Wed Apr 28 02:37:25 2010
@@ -127,6 +127,7 @@ abstract class AbstractTracked {
* entries in the list are ignored.
* @GuardedBy this
*/
+ @SuppressWarnings("unchecked")
void setInitial(Object[] list) {
if (list == null) {
return;
@@ -149,6 +150,7 @@ abstract class AbstractTracked {
* be received. This method must be called from Tracker's open method while
* not synchronized on this object after the add listener call.
*/
+ @SuppressWarnings("unchecked")
void trackInitial() {
while (true) {
Object item;
@@ -206,6 +208,7 @@ abstract class AbstractTracked {
* @param item Item to be tracked.
* @param related Action related object.
*/
+ @SuppressWarnings("unchecked")
void track(final Object item, final Object related) {
final Object object;
synchronized (this) {
@@ -250,6 +253,7 @@ abstract class AbstractTracked {
* @param item Item to be tracked.
* @param related Action related object.
*/
+ @SuppressWarnings("unchecked")
private void trackAdding(final Object item, final Object related) {
if (DEBUG) {
System.out.println("AbstractTracked.trackAdding: " + item);
//$NON-NLS-1$
@@ -379,6 +383,7 @@ abstract class AbstractTracked {
* items or a new array large enough to hold the tracked items.
* @GuardedBy this
*/
+ @SuppressWarnings("unchecked")
Object[] getTracked(final Object[] list) {
return tracked.keySet().toArray(list);
}
Modified:
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiClassResolverTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiClassResolverTest.java?rev=938753&r1=938752&r2=938753&view=diff
==============================================================================
---
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiClassResolverTest.java
(original)
+++
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiClassResolverTest.java
Wed Apr 28 02:37:25 2010
@@ -34,8 +34,8 @@ public class OsgiClassResolverTest exten
@Test
public void testResolverResource() {
ClassResolver classResolver = getClassResolver();
- InputStream is =
classResolver.loadResourceAsStream("/META-INF/services/org/apache/camel/TypeConverter");
- assertNotNull("The InputStream should not be null.");
+ InputStream is =
classResolver.loadResourceAsStream("META-INF/services/org/apache/camel/TypeConverter");
+ assertNotNull("The InputStream should not be null.", is);
}
}
Modified:
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiComponentResolverTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiComponentResolverTest.java?rev=938753&r1=938752&r2=938753&view=diff
==============================================================================
---
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiComponentResolverTest.java
(original)
+++
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiComponentResolverTest.java
Wed Apr 28 02:37:25 2010
@@ -27,7 +27,8 @@ public class OsgiComponentResolverTest e
@Test
public void testOsgiResolverFindLanguageTest() throws Exception {
- BundleContext context = getActivator().getBundle().getBundleContext();
+ BundleContext context = Activator.getBundle().getBundleContext();
+ assertNotNull("The BundleContext should not be null", context);
CamelContext camelContext = new DefaultCamelContext();
OsgiComponentResolver resolver = new OsgiComponentResolver();
Component component = resolver.resolveComponent("file_test",
camelContext);
Modified:
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java?rev=938753&r1=938752&r2=938753&view=diff
==============================================================================
---
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java
(original)
+++
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java
Wed Apr 28 02:37:25 2010
@@ -27,7 +27,8 @@ import org.osgi.framework.BundleContext;
public class OsgiLanguageResolverTest extends CamelOsgiTestSupport {
@Test
public void testOsgiResolverFindLanguageTest() throws IOException {
- BundleContext context = getActivator().getBundle().getBundleContext();
+ BundleContext context = Activator.getBundle().getBundleContext();
+ assertNotNull("The BundleContext should not be null", context);
CamelContext camelContext = new DefaultCamelContext();
OsgiLanguageResolver resolver = new OsgiLanguageResolver();
Language language = resolver.resolveLanguage("js", camelContext);
Modified:
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java?rev=938753&r1=938752&r2=938753&view=diff
==============================================================================
---
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java
(original)
+++
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java
Wed Apr 28 02:37:25 2010
@@ -30,7 +30,8 @@ public class OsgiPackageScanClassResolve
@Test
public void testOsgiResolverFindAnnotatedTest() throws IOException {
- BundleContext context = getActivator().getBundle().getBundleContext();
+ BundleContext context = Activator.getBundle().getBundleContext();
+ assertNotNull("The BundleContext should not be null", context);
OsgiPackageScanClassResolver resolver = new
OsgiPackageScanClassResolver(context);
String[] packageNames = {"org.apache.camel.osgi.test"};
@@ -41,7 +42,8 @@ public class OsgiPackageScanClassResolve
@Test
public void testOsgiResolverFindImplementationTest() {
- BundleContext context = getActivator().getBundle().getBundleContext();
+ BundleContext context = Activator.getBundle().getBundleContext();
+ assertNotNull("The BundleContext should not be null", context);
OsgiPackageScanClassResolver resolver = new
OsgiPackageScanClassResolver(context);
String[] packageNames = {"org.apache.camel.osgi.test"};
Set<Class<?>> classes =
resolver.findImplementations(RoutesBuilder.class, packageNames);
Modified:
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ServiceRegistryTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ServiceRegistryTest.java?rev=938753&r1=938752&r2=938753&view=diff
==============================================================================
---
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ServiceRegistryTest.java
(original)
+++
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ServiceRegistryTest.java
Wed Apr 28 02:37:25 2010
@@ -34,10 +34,10 @@ public class ServiceRegistryTest extends
assertNotNull("MyService should not be null", myService);
Object service =
context.getRegistry().lookup(MyService.class.getName());
- assertNotNull("MyService should not be null", myService);
+ assertNotNull("MyService should not be null", service);
service = context.getRegistry().lookupByType(MyService.class);
- assertNotNull("MyService should not be null", myService);
+ assertNotNull("MyService should not be null", service);
context.stop();
}
@@ -53,10 +53,10 @@ public class ServiceRegistryTest extends
assertNotNull("MyService should not be null", myService);
Object service =
context.getRegistry().lookup(MyService.class.getName());
- assertNotNull("MyService should not be null", myService);
+ assertNotNull("MyService should not be null", service);
service = context.getRegistry().lookupByType(MyService.class);
- assertNotNull("MyService should not be null", myService);
+ assertNotNull("MyService should not be null", service);
context.stop();
}
