You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/01/12 19:25:40 UTC
svn commit: r1230684 [2/3] - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/builder/xml/
camel-core/src/main/java/org/apache/camel/component/bean/
camel-core/src/main/java/org/apache/camel/...
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.java Thu Jan 12 18:25:36 2012
@@ -36,7 +36,6 @@ public class DeadLetterChannelRedeliverW
private static int counter;
- @SuppressWarnings("unchecked")
public void testRedeliverWithDelay() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -51,13 +50,13 @@ public class DeadLetterChannelRedeliverW
// use executors to simulate two different clients sending
// a request to Camel
- Callable task1 = Executors.callable(new Runnable() {
+ Callable<?> task1 = Executors.callable(new Runnable() {
public void run() {
template.sendBody("direct:start", "Message 1");
}
});
- Callable task2 = Executors.callable(new Runnable() {
+ Callable<?> task2 = Executors.callable(new Runnable() {
public void run() {
template.sendBody("direct:start", "Message 2");
}
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=1230684&r1=1230683&r2=1230684&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 Thu Jan 12 18:25:36 2012
@@ -28,7 +28,7 @@ import org.apache.camel.model.OnExceptio
public class ErrorHandlerSupportTest extends TestCase {
public void testOnePolicyChildFirst() {
- List<Class> exceptions = new ArrayList<Class>();
+ List<Class<? extends Throwable>> exceptions = new ArrayList<Class<? extends Throwable>>();
exceptions.add(ChildException.class);
exceptions.add(ParentException.class);
@@ -40,7 +40,7 @@ public class ErrorHandlerSupportTest ext
}
public void testOnePolicyChildLast() {
- List<Class> exceptions = new ArrayList<Class>();
+ List<Class<? extends Throwable>> exceptions = new ArrayList<Class<? extends Throwable>>();
exceptions.add(ParentException.class);
exceptions.add(ChildException.class);
@@ -69,7 +69,7 @@ public class ErrorHandlerSupportTest ext
assertEquals(ParentException.class, getExceptionPolicyFor(support, new ParentException(), 0));
}
- private static Class getExceptionPolicyFor(ErrorHandlerSupport support, Throwable childException,
+ private static Class<? extends Throwable> getExceptionPolicyFor(ErrorHandlerSupport support, Throwable childException,
int index) {
return support.getExceptionPolicy(null, childException).getExceptionClasses().get(index);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterNullBodyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterNullBodyTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterNullBodyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterNullBodyTest.java Thu Jan 12 18:25:36 2012
@@ -49,7 +49,7 @@ public class SplitterNullBodyTest extend
getMockEndpoint("mock:split").expectedMessageCount(0);
getMockEndpoint("mock:result").expectedMessageCount(1);
- List list = new ArrayList();
+ List<?> list = new ArrayList<Object>();
template.sendBody("direct:start", list);
assertMockEndpointsSatisfied();
@@ -59,7 +59,7 @@ public class SplitterNullBodyTest extend
getMockEndpoint("mock:split").expectedMessageCount(0);
getMockEndpoint("mock:result").expectedMessageCount(1);
- List list = new ArrayList();
+ List<?> list = new ArrayList<Object>();
template.sendBody("direct:streaming", list);
assertMockEndpointsSatisfied();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/CollectionHelperTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/CollectionHelperTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/CollectionHelperTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/CollectionHelperTest.java Thu Jan 12 18:25:36 2012
@@ -30,14 +30,14 @@ import junit.framework.TestCase;
public class CollectionHelperTest extends TestCase {
private String[] names = new String[]{"Claus", "Willem", "Jonathan"};
- private List list = Arrays.asList(names);
+ private List<String> list = Arrays.asList(names);
public void testCollectionAsCommaDelimitedString() {
assertEquals("Claus,Willem,Jonathan", CollectionHelper.collectionAsCommaDelimitedString(names));
assertEquals("Claus,Willem,Jonathan", CollectionHelper.collectionAsCommaDelimitedString(list));
assertEquals("", CollectionHelper.collectionAsCommaDelimitedString((String[]) null));
- assertEquals("", CollectionHelper.collectionAsCommaDelimitedString((Collection) null));
+ assertEquals("", CollectionHelper.collectionAsCommaDelimitedString((Collection<?>) null));
assertEquals("Claus", CollectionHelper.collectionAsCommaDelimitedString(new String[]{"Claus"}));
}
@@ -54,7 +54,7 @@ public class CollectionHelperTest extend
}
public void testAppendValue() {
- Map map = new HashMap();
+ Map<String, Object> map = new HashMap<String, Object>();
CollectionHelper.appendValue(map, "foo", 123);
assertEquals(1, map.size());
@@ -64,7 +64,7 @@ public class CollectionHelperTest extend
CollectionHelper.appendValue(map, "bar", 789);
assertEquals(2, map.size());
- List values = (List) map.get("foo");
+ List<?> values = (List<?>) map.get("foo");
assertEquals(2, values.size());
assertEquals(123, values.get(0));
assertEquals(456, values.get(1));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java Thu Jan 12 18:25:36 2012
@@ -159,7 +159,7 @@ public class IntrospectionSupportTest ex
bean.setDate(date);
bean.setGoldCustomer(true);
bean.setLittle(true);
- Collection children = new ArrayList();
+ Collection<?> children = new ArrayList<Object>();
bean.setChildren(children);
Map<String, Object> map = new HashMap<String, Object>();
@@ -220,7 +220,7 @@ public class IntrospectionSupportTest ex
bean.setDate(date);
bean.setGoldCustomer(true);
bean.setLittle(true);
- Collection children = new ArrayList();
+ Collection<?> children = new ArrayList<Object>();
bean.setChildren(children);
Object name = IntrospectionSupport.getProperty(bean, "name");
Modified: camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java (original)
+++ camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java Thu Jan 12 18:25:36 2012
@@ -25,8 +25,6 @@ import org.apache.abdera.parser.ParseExc
import org.apache.camel.Processor;
import org.apache.camel.component.feed.EntryFilter;
import org.apache.camel.component.feed.FeedEntryPollingConsumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Consumer to poll atom feeds and return each entry from the feed step by step.
Modified: camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java (original)
+++ camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java Thu Jan 12 18:25:36 2012
@@ -22,8 +22,6 @@ import org.apache.abdera.model.Document;
import org.apache.abdera.model.Feed;
import org.apache.camel.Processor;
import org.apache.camel.component.feed.FeedPollingConsumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Consumer to poll atom feeds and return the full feed.
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java Thu Jan 12 18:25:36 2012
@@ -221,7 +221,6 @@ public class BindyCsvFactory extends Bin
}
- @SuppressWarnings("unchecked")
public String unbind(Map<String, Object> model) throws Exception {
StringBuilder buffer = new StringBuilder();
@@ -236,7 +235,7 @@ public class BindyCsvFactory extends Bin
LOG.debug("Separator converted: '0x{}', from: {}", Integer.toHexString(separator), this.getSeparator());
}
- for (Class clazz : models) {
+ for (Class<?> clazz : models) {
if (model.containsKey(clazz.getName())) {
Object obj = model.get(clazz.getName());
@@ -253,15 +252,15 @@ public class BindyCsvFactory extends Bin
}
// Transpose result
- List<List> l = new ArrayList<List>();
+ List<List<String>> l = new ArrayList<List<String>>();
if (isOneToMany) {
l = product(results);
} else {
// Convert Map<Integer, List> into List<List>
- TreeMap<Integer, List> sortValues = new TreeMap<Integer, List>(results);
+ TreeMap<Integer, List<String>> sortValues = new TreeMap<Integer, List<String>>(results);
List<String> temp = new ArrayList<String>();
- for (Entry<Integer, List> entry : sortValues.entrySet()) {
+ for (Entry<Integer, List<String>> entry : sortValues.entrySet()) {
// Get list of values
List<String> val = entry.getValue();
@@ -281,13 +280,13 @@ public class BindyCsvFactory extends Bin
}
if (l != null) {
- Iterator it = l.iterator();
+ Iterator<List<String>> it = l.iterator();
while (it.hasNext()) {
- List<String> tokens = (ArrayList<String>)it.next();
- Iterator itx = tokens.iterator();
+ List<String> tokens = it.next();
+ Iterator<String> itx = tokens.iterator();
while (itx.hasNext()) {
- String res = (String)itx.next();
+ String res = itx.next();
if (res != null) {
// the field may be enclosed in quotes if a quote was configured
if (quote != null) {
@@ -313,10 +312,10 @@ public class BindyCsvFactory extends Bin
return buffer.toString();
}
- private List<List> product(Map<Integer, List<String>> values) {
- TreeMap<Integer, List> sortValues = new TreeMap<Integer, List>(values);
+ private List<List<String>> product(Map<Integer, List<String>> values) {
+ TreeMap<Integer, List<String>> sortValues = new TreeMap<Integer, List<String>>(values);
- List<List> product = new ArrayList<List>();
+ List<List<String>> product = new ArrayList<List<String>>();
Map<Integer, Integer> index = new HashMap<Integer, Integer>();
int idx = 0;
@@ -366,7 +365,7 @@ public class BindyCsvFactory extends Bin
* If a relation @OneToMany is defined, than we iterate recursively through this function
* The result is placed in the Map<Integer, List> results
*/
- private void generateCsvPositionMap(Class clazz, Object obj, Map<Integer, List<String>> results) throws Exception {
+ private void generateCsvPositionMap(Class<?> clazz, Object obj, Map<Integer, List<String>> results) throws Exception {
String result = "";
@@ -382,12 +381,12 @@ public class BindyCsvFactory extends Bin
// Retrieve the format, pattern and precision associated to
// the type
- Class type = field.getType();
+ Class<?> type = field.getType();
String pattern = datafield.pattern();
int precision = datafield.precision();
// Create format
- Format format = FormatFactory.getFormat(type, pattern, getLocale(), precision);
+ Format<?> format = FormatFactory.getFormat(type, pattern, getLocale(), precision);
// Get field value
Object value = field.get(obj);
@@ -448,10 +447,10 @@ public class BindyCsvFactory extends Bin
// Will be used during generation of CSV
isOneToMany = true;
- ArrayList list = (ArrayList)field.get(obj);
+ ArrayList<?> list = (ArrayList<?>)field.get(obj);
if (list != null) {
- Iterator it = list.iterator();
+ Iterator<?> it = list.iterator();
while (it.hasNext()) {
Object target = it.next();
generateCsvPositionMap(target.getClass(), target, results);
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java Thu Jan 12 18:25:36 2012
@@ -158,11 +158,11 @@ public class BindyFixedLengthFactory ext
// Iterate through the list of positions
// defined in the @DataField
// and grab the data from the line
- Collection c = dataFields.values();
- Iterator itr = c.iterator();
+ Collection<DataField> c = dataFields.values();
+ Iterator<DataField> itr = c.iterator();
while (itr.hasNext()) {
- dataField = (DataField)itr.next();
+ dataField = itr.next();
offset = dataField.pos();
length = dataField.length();
@@ -251,7 +251,7 @@ public class BindyFixedLengthFactory ext
StringBuilder buffer = new StringBuilder();
Map<Integer, List<String>> results = new HashMap<Integer, List<String>>();
- for (Class clazz : models) {
+ for (Class<?> clazz : models) {
if (model.containsKey(clazz.getName())) {
@@ -290,7 +290,7 @@ public class BindyFixedLengthFactory ext
* Generate a table containing the data formatted and sorted with their position/offset
* The result is placed in the Map<Integer, List> results
*/
- private void generateFixedLengthPositionMap(Class clazz, Object obj, Map<Integer, List<String>> results) throws Exception {
+ private void generateFixedLengthPositionMap(Class<?> clazz, Object obj, Map<Integer, List<String>> results) throws Exception {
String result = "";
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java Thu Jan 12 18:25:36 2012
@@ -165,7 +165,7 @@ public class BindyKeyValuePairFactory ex
}
// Iterate over the model
- for (Class clazz : models) {
+ for (Class<?> clazz : models) {
Object obj = model.get(clazz.getName());
@@ -179,7 +179,7 @@ public class BindyKeyValuePairFactory ex
}
- private void generateModelFromKeyValueMap(Class clazz, Object obj, Map<Integer, List<String>> results, int line, Map<String, List<Object>> lists) throws Exception {
+ private void generateModelFromKeyValueMap(Class<?> clazz, Object obj, Map<Integer, List<String>> results, int line, Map<String, List<Object>> lists) throws Exception {
for (Field field : clazz.getDeclaredFields()) {
@@ -379,7 +379,7 @@ public class BindyKeyValuePairFactory ex
if (!targetClass.equals("")) {
// Class cl = Class.forName(targetClass); Does not work in
// OSGI when class is defined in another bundle
- Class cl = null;
+ Class<?> cl = null;
try {
cl = Thread.currentThread().getContextClassLoader().loadClass(targetClass);
@@ -550,7 +550,7 @@ public class BindyKeyValuePairFactory ex
return builder.toString();
}
- private Object formatField(Format format, String value, int tag, int line) throws Exception {
+ private Object formatField(Format<?> format, String value, int tag, int line) throws Exception {
Object obj = null;
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java Thu Jan 12 18:25:36 2012
@@ -40,7 +40,7 @@ public class BindyComplexKeyValuePairSta
private static final transient Logger LOG = LoggerFactory.getLogger(BindyComplexKeyValuePairStandaloneTest.class);
protected Map<String, Object> model = new HashMap<String, Object>();
- protected Set<Class> models = new HashSet<Class>();
+ protected Set<Class<?>> models = new HashSet<Class<?>>();
BindyKeyValuePairFactory factory;
int counter;
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java Thu Jan 12 18:25:36 2012
@@ -74,7 +74,7 @@ public class BlueprintContainerRegistry
for (String id : ids) {
try {
ComponentMetadata metadata = blueprintContainer.getComponentMetadata(id);
- Class cl = null;
+ Class<?> cl = null;
if (metadata instanceof BeanMetadata) {
BeanMetadata beanMetadata = (BeanMetadata)metadata;
cl = bundle.loadClass(beanMetadata.getClassName());
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java Thu Jan 12 18:25:36 2012
@@ -64,7 +64,7 @@ public class BlueprintPropertiesParser e
String id = (String) componentId;
ComponentMetadata meta = container.getComponentMetadata(id);
if (meta instanceof ExtendedBeanMetadata) {
- Class clazz = ((ExtendedBeanMetadata) meta).getRuntimeClass();
+ Class<?> clazz = ((ExtendedBeanMetadata) meta).getRuntimeClass();
if (clazz != null && AbstractPropertyPlaceholder.class.isAssignableFrom(clazz)) {
ids.add(id);
}
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java Thu Jan 12 18:25:36 2012
@@ -155,7 +155,7 @@ public class CamelContextFactoryBean ext
private boolean implicitId;
- public Class getObjectType() {
+ public Class<BlueprintCamelContext> getObjectType() {
return BlueprintCamelContext.class;
}
@@ -451,11 +451,11 @@ public class CamelContextFactoryBean ext
this.camelJMXAgent = camelJMXAgent;
}
- public List getBeans() {
+ public List<?> getBeans() {
return beans;
}
- public void setBeans(List beans) {
+ public void setBeans(List<?> beans) {
this.beans = beans;
}
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java Thu Jan 12 18:25:36 2012
@@ -104,7 +104,6 @@ public class CamelErrorHandlerFactoryBea
}
@Override
- @SuppressWarnings("unchecked")
public Class<? extends ErrorHandlerBuilder> getObjectType() {
return type.getTypeAsClass();
}
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java Thu Jan 12 18:25:36 2012
@@ -93,7 +93,7 @@ public class CamelProxyFactoryBean exten
try {
producer = endpoint.createProducer();
ServiceHelper.startService(producer);
- Class clazz = blueprintContainer.loadClass(getServiceInterface());
+ Class<?> clazz = blueprintContainer.loadClass(getServiceInterface());
serviceProxy = ProxyHelper.createProxy(endpoint, producer, clazz);
} catch (Exception e) {
throw new FailedToCreateProducerException(endpoint, e);
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java Thu Jan 12 18:25:36 2012
@@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlType
import org.apache.camel.builder.DeadLetterChannelBuilder;
import org.apache.camel.builder.DefaultErrorHandlerBuilder;
+import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.builder.LoggingErrorHandlerBuilder;
import org.apache.camel.builder.NoErrorHandlerBuilder;
@@ -40,7 +41,7 @@ public enum ErrorHandlerType {
*
* @return the class which represents the selected type.
*/
- public Class getTypeAsClass() {
+ public Class<? extends ErrorHandlerBuilder> getTypeAsClass() {
switch (this) {
case DefaultErrorHandler:
return DefaultErrorHandlerBuilder.class;
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java Thu Jan 12 18:25:36 2012
@@ -54,7 +54,7 @@ public class PackageScanRouteBuilderFind
*/
public void appendBuilders(List<RoutesBuilder> list) throws IllegalAccessException, InstantiationException {
Set<Class<?>> classes = resolver.findImplementations(RoutesBuilder.class, packages);
- for (Class aClass : classes) {
+ for (Class<?> aClass : classes) {
LOG.trace("Found RouteBuilder class: {}", aClass);
// certain beans should be ignored
@@ -94,7 +94,7 @@ public class PackageScanRouteBuilderFind
/**
* Returns <tt>true</tt>if the class is a public, non-abstract class
*/
- protected boolean isValidClass(Class type) {
+ protected boolean isValidClass(Class<?> type) {
// should skip non public classes
if (!Modifier.isPublic(type.getModifiers())) {
return false;
@@ -106,8 +106,7 @@ public class PackageScanRouteBuilderFind
return false;
}
- @SuppressWarnings("unchecked")
- protected RoutesBuilder instantiateBuilder(Class type) throws IllegalAccessException, InstantiationException {
+ protected RoutesBuilder instantiateBuilder(Class<?> type) throws IllegalAccessException, InstantiationException {
return (RoutesBuilder) camelContext.getInjector().newInstance(type);
}
}
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=1230684&r1=1230683&r2=1230684&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 Thu Jan 12 18:25:36 2012
@@ -124,7 +124,7 @@ public class CamelNamespaceHandler imple
return getClass().getClassLoader().getResource("camel-blueprint.xsd");
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public Set<Class> getManagedClasses() {
return new HashSet<Class>(Arrays.asList(BlueprintCamelContext.class));
}
@@ -376,7 +376,7 @@ public class CamelNamespaceHandler imple
if (beans != null) {
for (Object bean : beans) {
if (bean instanceof AbstractCamelFactoryBean) {
- registerBean(context, contextId, (AbstractCamelFactoryBean) bean);
+ registerBean(context, contextId, (AbstractCamelFactoryBean<?>) bean);
}
}
}
@@ -435,7 +435,7 @@ public class CamelNamespaceHandler imple
protected JAXBContext createJaxbContext() throws JAXBException {
StringBuilder packages = new StringBuilder();
- for (Class cl : getJaxbPackages()) {
+ for (Class<?> cl : getJaxbPackages()) {
if (packages.length() > 0) {
packages.append(":");
}
@@ -444,8 +444,8 @@ public class CamelNamespaceHandler imple
return JAXBContext.newInstance(packages.toString(), getClass().getClassLoader());
}
- protected Set<Class> getJaxbPackages() {
- Set<Class> classes = new HashSet<Class>();
+ protected Set<Class<?>> getJaxbPackages() {
+ Set<Class<?>> classes = new HashSet<Class<?>>();
classes.add(CamelContextFactoryBean.class);
classes.add(AbstractCamelContextFactoryBean.class);
classes.add(org.apache.camel.ExchangePattern.class);
@@ -511,7 +511,7 @@ public class CamelNamespaceHandler imple
* @param bean the bean to be injected
*/
protected void injectFields(final Object bean, final String beanName) {
- Class clazz = bean.getClass();
+ Class<?> clazz = bean.getClass();
do {
Field[] fields = clazz.getDeclaredFields();
for (Field field : fields) {
@@ -552,7 +552,7 @@ public class CamelNamespaceHandler imple
}
protected void injectMethods(final Object bean, final String beanName) {
- Class clazz = bean.getClass();
+ Class<?> clazz = bean.getClass();
do {
Method[] methods = clazz.getDeclaredMethods();
for (Method method : methods) {
@@ -770,7 +770,7 @@ public class CamelNamespaceHandler imple
findLanguage(((SortDefinition) def).getExpression(), languages);
}
if (def instanceof WireTapDefinition) {
- findLanguage(((WireTapDefinition) def).getNewExchangeExpression(), languages);
+ findLanguage(((WireTapDefinition<?>) def).getNewExchangeExpression(), languages);
}
findOutputComponents(def.getOutputs(), components, languages, dataformats);
}
Modified: camel/trunk/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/AbstractCastorDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/AbstractCastorDataFormat.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/AbstractCastorDataFormat.java (original)
+++ camel/trunk/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/AbstractCastorDataFormat.java Thu Jan 12 18:25:36 2012
@@ -89,7 +89,7 @@ public abstract class AbstractCastorData
}
if (getClassNames() != null) {
for (String name : getClassNames()) {
- Class clazz = resolver.resolveClass(name);
+ Class<?> clazz = resolver.resolveClass(name);
xmlContext.addClass(clazz);
}
}
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinder.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinder.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinder.java Thu Jan 12 18:25:36 2012
@@ -48,7 +48,7 @@ public class OsgiFactoryFinder extends D
propertyPrefix = "";
}
- Class clazz = classMap.get(propertyPrefix + key);
+ Class<?> clazz = classMap.get(propertyPrefix + key);
if (clazz == null) {
BundleEntry entry = getResource(key, checkClass);
if (entry != null) {
@@ -111,7 +111,7 @@ public class OsgiFactoryFinder extends D
return entry;
}
- private boolean checkCompat(Bundle bundle, Class clazz) {
+ private boolean checkCompat(Bundle bundle, Class<?> clazz) {
if (clazz == null) {
return true;
}
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java Thu Jan 12 18:25:36 2012
@@ -35,7 +35,7 @@ public final class BundleContextUtils {
* @param clazz the class to find the bundle context from
* @return the bundle context or <code>null</code> if it can't be found
*/
- public static BundleContext getBundleContext(Class clazz) {
+ public static BundleContext getBundleContext(Class<?> clazz) {
// Ideally we should use FrameworkUtil.getBundle(clazz).getBundleContext()
// but that does not exist in OSGi 4.1, so until we upgrade, we keep that one
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java Thu Jan 12 18:25:36 2012
@@ -56,7 +56,7 @@ public class BundleDelegatingClassLoader
return resource;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
protected Enumeration findResources(String name) throws IOException {
LOG.trace("FindResource: {}", name);
return bundle.getResources(name);
@@ -64,7 +64,7 @@ public class BundleDelegatingClassLoader
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
LOG.trace("LoadClass: {}, resolve: {}", name, resolve);
- Class clazz;
+ Class<?> clazz;
try {
clazz = findClass(name);
} catch (ClassNotFoundException cnfe) {
Modified: camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java (original)
+++ camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java Thu Jan 12 18:25:36 2012
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
+import org.apache.camel.util.CastUtils;
import org.springframework.osgi.mock.MockBundle;
/**
@@ -33,11 +34,11 @@ public class CamelMockBundle extends Moc
public static final String META_INF_LANGUAGE_RESOLVER = "META-INF/services/org/apache/camel/language/resolver/";
public static final String META_INF_DATAFORMAT = "META-INF/services/org/apache/camel/dataformat/";
- private static class ListEnumeration implements Enumeration {
- private final List list;
+ private static class ListEnumeration<E> implements Enumeration<E> {
+ private final List<E> list;
private int index;
- public ListEnumeration(List list) {
+ public ListEnumeration(List<E> list) {
this.list = list;
}
@@ -45,8 +46,8 @@ public class CamelMockBundle extends Moc
return list != null && index < list.size();
}
- public Object nextElement() {
- Object result = null;
+ public E nextElement() {
+ E result = null;
if (list != null) {
result = list.get(index);
index++;
@@ -60,16 +61,16 @@ public class CamelMockBundle extends Moc
setClassLoader(getClass().getClassLoader());
}
- private Enumeration getListEnumeration(String prefix, String entrys[]) {
+ private Enumeration<String> getListEnumeration(String prefix, String entrys[]) {
List<String> list = new ArrayList<String>();
for (String entry : entrys) {
list.add(prefix + entry);
}
- return new ListEnumeration(list);
+ return new ListEnumeration<String>(list);
}
- public Enumeration getEntryPaths(String path) {
- Enumeration result = null;
+ public Enumeration<String> getEntryPaths(String path) {
+ Enumeration<String> result = null;
if (META_INF_COMPONENT.equals(path)) {
String[] entries = new String[] {"timer_test", "file_test"};
result = getListEnumeration(META_INF_COMPONENT, entries);
@@ -86,20 +87,20 @@ public class CamelMockBundle extends Moc
return result;
}
- public Enumeration findEntries(String path, String filePattern, boolean recurse) {
+ public Enumeration<URL> findEntries(String path, String filePattern, boolean recurse) {
if (path.equals("/org/apache/camel/core/osgi/test") && filePattern.equals("*.class")) {
List<URL> urls = new ArrayList<URL>();
URL url = getClass().getClassLoader().getResource("org/apache/camel/core/osgi/test/MyTypeConverter.class");
urls.add(url);
url = getClass().getClassLoader().getResource("org/apache/camel/core/osgi/test/MyRouteBuilder.class");
urls.add(url);
- return new ListEnumeration(urls);
+ return new ListEnumeration<URL>(urls);
} else {
- return super.findEntries(path, filePattern, recurse);
+ return CastUtils.cast(super.findEntries(path, filePattern, recurse));
}
}
- public Class loadClass(String name) throws ClassNotFoundException {
+ public Class<?> loadClass(String name) throws ClassNotFoundException {
if (isLoadableClass(name)) {
return super.loadClass(name);
} else {
Modified: camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiClassResolverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiClassResolverTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiClassResolverTest.java (original)
+++ camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiClassResolverTest.java Thu Jan 12 18:25:36 2012
@@ -26,7 +26,7 @@ public class OsgiClassResolverTest exten
@Test
public void testResolveClass() {
ClassResolver classResolver = getClassResolver();
- Class routeBuilder = classResolver.resolveClass("org.apache.camel.core.osgi.test.MyRouteBuilder");
+ Class<?> routeBuilder = classResolver.resolveClass("org.apache.camel.core.osgi.test.MyRouteBuilder");
assertNotNull("The class of routeBuilder should not be null.", routeBuilder);
}
Modified: camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java (original)
+++ camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java Thu Jan 12 18:25:36 2012
@@ -27,7 +27,7 @@ public class OsgiFactoryFinderTest exten
@Test
public void testFindClass() throws Exception {
OsgiFactoryFinder finder = new OsgiFactoryFinder(getBundleContext(), new DefaultClassResolver(), "META-INF/services/org/apache/camel/component/");
- Class clazz = finder.findClass("file_test", "strategy.factory.");
+ Class<?> clazz = finder.findClass("file_test", "strategy.factory.");
assertNotNull("We should get the file strategy factory here", clazz);
try {
Modified: camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java (original)
+++ camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java Thu Jan 12 18:25:36 2012
@@ -35,7 +35,7 @@ public class MockTypeConverterRegistry i
return fallbackTypeConverters;
}
- public void addTypeConverter(Class toType, Class fromType, TypeConverter typeConverter) {
+ public void addTypeConverter(Class<?> toType, Class<?> fromType, TypeConverter typeConverter) {
typeConverters.add(typeConverter);
}
@@ -43,7 +43,7 @@ public class MockTypeConverterRegistry i
fallbackTypeConverters.add(typeConverter);
}
- public TypeConverter lookup(Class toType, Class fromType) {
+ public TypeConverter lookup(Class<?> toType, Class<?> fromType) {
return null;
}
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java Thu Jan 12 18:25:36 2012
@@ -113,13 +113,11 @@ public abstract class AbstractCamelConte
contextClassLoaderOnStart = Thread.currentThread().getContextClassLoader();
}
- public Object getObject() throws Exception {
+ public T getObject() throws Exception {
return getContext();
}
- public Class getObjectType() {
- return CamelContext.class;
- }
+ public abstract Class<T> getObjectType();
public boolean isSingleton() {
return true;
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java Thu Jan 12 18:25:36 2012
@@ -34,7 +34,7 @@ public class CamelProxyFactoryDefinition
@XmlAttribute
private String serviceRef;
@XmlAttribute
- private Class serviceInterface;
+ private Class<?> serviceInterface;
@XmlAttribute
private String camelContextId;
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelServiceExporterDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelServiceExporterDefinition.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelServiceExporterDefinition.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelServiceExporterDefinition.java Thu Jan 12 18:25:36 2012
@@ -34,7 +34,7 @@ public class CamelServiceExporterDefinit
@XmlAttribute
private String serviceRef;
@XmlAttribute
- private Class serviceInterface;
+ private Class<?> serviceInterface;
@XmlAttribute
private String camelContextId;
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java Thu Jan 12 18:25:36 2012
@@ -450,6 +450,8 @@ public class SftpOperations implements R
try {
final List<ChannelSftp.LsEntry> list = new ArrayList<ChannelSftp.LsEntry>();
+
+ @SuppressWarnings("rawtypes")
Vector files = channel.ls(path);
// can return either null or an empty list depending on FTP servers
if (files != null) {
@@ -713,6 +715,7 @@ public class SftpOperations implements R
String onlyName = FileUtil.stripPath(name);
try {
+ @SuppressWarnings("rawtypes")
Vector files = channel.ls(directory);
// can return either null or an empty list depending on FTP servers
if (files == null) {
@@ -741,6 +744,7 @@ public class SftpOperations implements R
protected boolean fastExistsFile(String name) throws GenericFileOperationFailedException {
LOG.trace("fastExistsFile({})", name);
try {
+ @SuppressWarnings("rawtypes")
Vector files = channel.ls(name);
if (files == null) {
return false;
Modified: camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModuleWithMatchingRoutes.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModuleWithMatchingRoutes.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModuleWithMatchingRoutes.java (original)
+++ camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModuleWithMatchingRoutes.java Thu Jan 12 18:25:36 2012
@@ -40,6 +40,7 @@ import org.guiceyfruit.Injectors;
*
* @version
*/
+@SuppressWarnings("rawtypes")
public class CamelModuleWithMatchingRoutes extends CamelModule {
private final Matcher<Class> matcher;
Modified: camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java (original)
+++ camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java Thu Jan 12 18:25:36 2012
@@ -69,7 +69,7 @@ public class HazelcastSedaConsumer exten
}
public void run() {
- final BlockingQueue queue = endpoint.getQueue();
+ final BlockingQueue<?> queue = endpoint.getQueue();
while (queue != null && isRunAllowed()) {
final Exchange exchange = this.getEndpoint().createExchange();
Modified: camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java (original)
+++ camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java Thu Jan 12 18:25:36 2012
@@ -32,7 +32,7 @@ import org.apache.camel.util.ObjectHelpe
*/
public class HazelcastSedaEndpoint extends HazelcastDefaultEndpoint {
- private final BlockingQueue queue;
+ private final BlockingQueue<Object> queue;
private final HazelcastSedaConfiguration configuration;
private HazelcastInstance hazelcastInstance;
@@ -54,7 +54,7 @@ public class HazelcastSedaEndpoint exten
return new HazelcastSedaConsumer(this, processor);
}
- public BlockingQueue getQueue() {
+ public BlockingQueue<Object> getQueue() {
return queue;
}
Modified: camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaProducer.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaProducer.java (original)
+++ camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaProducer.java Thu Jan 12 18:25:36 2012
@@ -31,9 +31,9 @@ import org.apache.camel.impl.DefaultExch
*/
public class HazelcastSedaProducer extends DefaultAsyncProducer {
- private final transient BlockingQueue queue;
+ private final transient BlockingQueue<Object> queue;
- public HazelcastSedaProducer(final HazelcastSedaEndpoint endpoint, final BlockingQueue hzlq) {
+ public HazelcastSedaProducer(final HazelcastSedaEndpoint endpoint, final BlockingQueue<Object> hzlq) {
super(endpoint);
this.queue = hzlq;
}
@@ -44,7 +44,6 @@ public class HazelcastSedaProducer exten
return true;
}
- @SuppressWarnings("unchecked")
private void checkAndStore(final Exchange exchange) {
Object obj;
Object body = exchange.getIn().getBody();
Modified: camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java (original)
+++ camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java Thu Jan 12 18:25:36 2012
@@ -39,8 +39,7 @@ public class HdfsComponent extends Defau
initHdfs();
}
- @SuppressWarnings("unchecked")
- protected final Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
+ protected final Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
HdfsEndpoint hdfsEndpoint = new HdfsEndpoint(uri, this.getCamelContext());
setProperties(hdfsEndpoint.getConfig(), parameters);
return hdfsEndpoint;
Modified: camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConfiguration.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConfiguration.java (original)
+++ camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConfiguration.java Thu Jan 12 18:25:36 2012
@@ -54,7 +54,7 @@ public class HdfsConfiguration {
public HdfsConfiguration() {
}
- private Boolean getBoolean(Map hdfsSettings, String param, Boolean dflt) {
+ private Boolean getBoolean(Map<String, Object> hdfsSettings, String param, Boolean dflt) {
if (hdfsSettings.containsKey(param)) {
return Boolean.valueOf((String) hdfsSettings.get(param));
} else {
@@ -62,7 +62,7 @@ public class HdfsConfiguration {
}
}
- private Integer getInteger(Map hdfsSettings, String param, Integer dflt) {
+ private Integer getInteger(Map<String, Object> hdfsSettings, String param, Integer dflt) {
if (hdfsSettings.containsKey(param)) {
return Integer.valueOf((String) hdfsSettings.get(param));
} else {
@@ -70,7 +70,7 @@ public class HdfsConfiguration {
}
}
- private Short getShort(Map hdfsSettings, String param, Short dflt) {
+ private Short getShort(Map<String, Object> hdfsSettings, String param, Short dflt) {
if (hdfsSettings.containsKey(param)) {
return Short.valueOf((String) hdfsSettings.get(param));
} else {
@@ -78,7 +78,7 @@ public class HdfsConfiguration {
}
}
- private Long getLong(Map hdfsSettings, String param, Long dflt) {
+ private Long getLong(Map<String, Object> hdfsSettings, String param, Long dflt) {
if (hdfsSettings.containsKey(param)) {
return Long.valueOf((String) hdfsSettings.get(param));
} else {
@@ -86,7 +86,7 @@ public class HdfsConfiguration {
}
}
- private HdfsFileType getFileType(Map hdfsSettings, String param, HdfsFileType dflt) {
+ private HdfsFileType getFileType(Map<String, Object> hdfsSettings, String param, HdfsFileType dflt) {
String eit = (String) hdfsSettings.get(param);
if (eit != null) {
return HdfsFileType.valueOf(eit);
@@ -95,7 +95,7 @@ public class HdfsConfiguration {
}
}
- private HdfsFileSystemType getFileSystemType(Map hdfsSettings, String param, HdfsFileSystemType dflt) {
+ private HdfsFileSystemType getFileSystemType(Map<String, Object> hdfsSettings, String param, HdfsFileSystemType dflt) {
String eit = (String) hdfsSettings.get(param);
if (eit != null) {
return HdfsFileSystemType.valueOf(eit);
@@ -104,7 +104,7 @@ public class HdfsConfiguration {
}
}
- private HdfsWritableFactories.WritableType getWritableType(Map hdfsSettings, String param, HdfsWritableFactories.WritableType dflt) {
+ private HdfsWritableFactories.WritableType getWritableType(Map<String, Object> hdfsSettings, String param, HdfsWritableFactories.WritableType dflt) {
String eit = (String) hdfsSettings.get(param);
if (eit != null) {
return HdfsWritableFactories.WritableType.valueOf(eit);
@@ -113,7 +113,7 @@ public class HdfsConfiguration {
}
}
- private SequenceFile.CompressionType getCompressionType(Map hdfsSettings, String param, SequenceFile.CompressionType ct) {
+ private SequenceFile.CompressionType getCompressionType(Map<String, Object> hdfsSettings, String param, SequenceFile.CompressionType ct) {
String eit = (String) hdfsSettings.get(param);
if (eit != null) {
return SequenceFile.CompressionType.valueOf(eit);
@@ -122,7 +122,7 @@ public class HdfsConfiguration {
}
}
- private HdfsCompressionCodec getCompressionCodec(Map hdfsSettings, String param, HdfsCompressionCodec cd) {
+ private HdfsCompressionCodec getCompressionCodec(Map<String, Object> hdfsSettings, String param, HdfsCompressionCodec cd) {
String eit = (String) hdfsSettings.get(param);
if (eit != null) {
return HdfsCompressionCodec.valueOf(eit);
@@ -131,7 +131,7 @@ public class HdfsConfiguration {
}
}
- private String getString(Map hdfsSettings, String param, String dflt) {
+ private String getString(Map<String, Object> hdfsSettings, String param, String dflt) {
if (hdfsSettings.containsKey(param)) {
return (String) hdfsSettings.get(param);
} else {
@@ -139,7 +139,7 @@ public class HdfsConfiguration {
}
}
- private List<HdfsProducer.SplitStrategy> getSplitStrategies(Map hdfsSettings) {
+ private List<HdfsProducer.SplitStrategy> getSplitStrategies(Map<String, Object> hdfsSettings) {
List<HdfsProducer.SplitStrategy> strategies = new ArrayList<HdfsProducer.SplitStrategy>();
for (Object obj : hdfsSettings.keySet()) {
String key = (String) obj;
@@ -184,7 +184,7 @@ public class HdfsConfiguration {
hostName = uri.getHost();
port = uri.getPort() == -1 ? HdfsConstants.DEFAULT_PORT : uri.getPort();
path = uri.getPath();
- Map hdfsSettings = URISupport.parseParameters(uri);
+ Map<String, Object> hdfsSettings = URISupport.parseParameters(uri);
overwrite = getBoolean(hdfsSettings, "overwrite", overwrite);
append = getBoolean(hdfsSettings, "append", append);
Modified: camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java (original)
+++ camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java Thu Jan 12 18:25:36 2012
@@ -207,8 +207,8 @@ public enum HdfsFileType {
try {
Closeable rout;
HdfsInfo hdfsInfo = new HdfsInfo(hdfsPath);
- Class keyWritableClass = configuration.getKeyType().getWritableClass();
- Class valueWritableClass = configuration.getValueType().getWritableClass();
+ Class<?> keyWritableClass = configuration.getKeyType().getWritableClass();
+ Class<?> valueWritableClass = configuration.getValueType().getWritableClass();
rout = SequenceFile.createWriter(hdfsInfo.getFileSystem(), hdfsInfo.getConf(), hdfsInfo.getPath(), keyWritableClass,
valueWritableClass, configuration.getBufferSize(), configuration.getReplication(), configuration.getBlockSize(),
configuration.getCompressionType(), configuration.getCompressionCodec().getCodec(), new Progressable() {
@@ -243,7 +243,7 @@ public enum HdfsFileType {
Writable keyWritable = getWritable(key, typeConverter, keySize);
Holder<Integer> valueSize = new Holder<Integer>();
Writable valueWritable = getWritable(value, typeConverter, valueSize);
- ((MapFile.Writer) hdfsostr.getOut()).append((WritableComparable) keyWritable, valueWritable);
+ ((MapFile.Writer) hdfsostr.getOut()).append((WritableComparable<?>) keyWritable, valueWritable);
return keySize.value + valueSize.value;
} catch (Exception ex) {
throw new RuntimeCamelException(ex);
@@ -255,7 +255,7 @@ public enum HdfsFileType {
try {
MapFile.Reader reader = (MapFile.Reader) hdfsistr.getIn();
Holder<Integer> keySize = new Holder<Integer>();
- WritableComparable keyWritable = (WritableComparable) ReflectionUtils.newInstance(reader.getKeyClass(), new Configuration());
+ WritableComparable<?> keyWritable = (WritableComparable<?>) ReflectionUtils.newInstance(reader.getKeyClass(), new Configuration());
Holder<Integer> valueSize = new Holder<Integer>();
Writable valueWritable = (Writable) ReflectionUtils.newInstance(reader.getValueClass(), new Configuration());
if (reader.next(keyWritable, valueWritable)) {
@@ -271,13 +271,13 @@ public enum HdfsFileType {
}
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Closeable createOutputStream(String hdfsPath, HdfsConfiguration configuration) {
try {
Closeable rout;
HdfsInfo hdfsInfo = new HdfsInfo(hdfsPath);
- Class keyWritableClass = configuration.getKeyType().getWritableClass();
- Class valueWritableClass = configuration.getValueType().getWritableClass();
+ Class<? extends WritableComparable> keyWritableClass = configuration.getKeyType().getWritableClass();
+ Class<? extends WritableComparable> valueWritableClass = configuration.getValueType().getWritableClass();
rout = new MapFile.Writer(hdfsInfo.getConf(), hdfsInfo.getFileSystem(), hdfsPath, keyWritableClass, valueWritableClass,
configuration.getCompressionType(), configuration.getCompressionCodec().getCodec(), new Progressable() {
@Override
@@ -311,7 +311,7 @@ public enum HdfsFileType {
Writable keyWritable = getWritable(key, typeConverter, keySize);
Holder<Integer> valueSize = new Holder<Integer>();
Writable valueWritable = getWritable(value, typeConverter, valueSize);
- ((BloomMapFile.Writer) hdfsostr.getOut()).append((WritableComparable) keyWritable, valueWritable);
+ ((BloomMapFile.Writer) hdfsostr.getOut()).append((WritableComparable<?>) keyWritable, valueWritable);
return keySize.value + valueSize.value;
} catch (Exception ex) {
throw new RuntimeCamelException(ex);
@@ -323,7 +323,7 @@ public enum HdfsFileType {
try {
MapFile.Reader reader = (BloomMapFile.Reader) hdfsistr.getIn();
Holder<Integer> keySize = new Holder<Integer>();
- WritableComparable keyWritable = (WritableComparable) ReflectionUtils.newInstance(reader.getKeyClass(), new Configuration());
+ WritableComparable<?> keyWritable = (WritableComparable<?>) ReflectionUtils.newInstance(reader.getKeyClass(), new Configuration());
Holder<Integer> valueSize = new Holder<Integer>();
Writable valueWritable = (Writable) ReflectionUtils.newInstance(reader.getValueClass(), new Configuration());
if (reader.next(keyWritable, valueWritable)) {
@@ -338,14 +338,14 @@ public enum HdfsFileType {
}
}
+ @SuppressWarnings("rawtypes")
@Override
- @SuppressWarnings("unchecked")
public Closeable createOutputStream(String hdfsPath, HdfsConfiguration configuration) {
try {
Closeable rout;
HdfsInfo hdfsInfo = new HdfsInfo(hdfsPath);
- Class keyWritableClass = configuration.getKeyType().getWritableClass();
- Class valueWritableClass = configuration.getValueType().getWritableClass();
+ Class<? extends WritableComparable> keyWritableClass = configuration.getKeyType().getWritableClass();
+ Class<? extends WritableComparable> valueWritableClass = configuration.getValueType().getWritableClass();
rout = new BloomMapFile.Writer(hdfsInfo.getConf(), hdfsInfo.getFileSystem(), hdfsPath, keyWritableClass, valueWritableClass,
configuration.getCompressionType(), configuration.getCompressionCodec().getCodec(), new Progressable() {
@Override
@@ -401,13 +401,13 @@ public enum HdfsFileType {
}
}
+ @SuppressWarnings("rawtypes")
@Override
- @SuppressWarnings("unchecked")
public Closeable createOutputStream(String hdfsPath, HdfsConfiguration configuration) {
try {
Closeable rout;
HdfsInfo hdfsInfo = new HdfsInfo(hdfsPath);
- Class valueWritableClass = configuration.getValueType().getWritableClass();
+ Class<? extends WritableComparable> valueWritableClass = configuration.getValueType().getWritableClass();
rout = new ArrayFile.Writer(hdfsInfo.getConf(), hdfsInfo.getFileSystem(), hdfsPath, valueWritableClass,
configuration.getCompressionType(), new Progressable() {
@Override
@@ -433,6 +433,7 @@ public enum HdfsFileType {
}
};
+ @SuppressWarnings({"rawtypes"})
private static final class WritableCache {
private static Map<Class, HdfsWritableFactories.HdfsWritableFactory> writables = new HashMap<Class, HdfsWritableFactories.HdfsWritableFactory>();
@@ -467,7 +468,7 @@ public enum HdfsFileType {
}
private static Writable getWritable(Object obj, TypeConverter typeConverter, Holder<Integer> size) {
- Class objCls = obj == null ? null : obj.getClass();
+ Class<?> objCls = obj == null ? null : obj.getClass();
HdfsWritableFactories.HdfsWritableFactory objWritableFactory = WritableCache.writables.get(objCls);
if (objWritableFactory == null) {
objWritableFactory = new HdfsWritableFactories.HdfsObjectWritableFactory();
@@ -476,7 +477,7 @@ public enum HdfsFileType {
}
private static Object getObject(Writable writable, Holder<Integer> size) {
- Class writableClass = NullWritable.class;
+ Class<?> writableClass = NullWritable.class;
if (writable != null) {
writableClass = writable.getClass();
}
Modified: camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java (original)
+++ camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java Thu Jan 12 18:25:36 2012
@@ -35,74 +35,76 @@ import org.apache.hadoop.io.LongWritable
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.io.WritableComparable;
public class HdfsWritableFactories {
public enum WritableType {
NULL {
@Override
- public Class getWritableClass() {
+ public Class<NullWritable> getWritableClass() {
return NullWritable.class;
}
},
BOOLEAN {
@Override
- public Class getWritableClass() {
+ public Class<BooleanWritable> getWritableClass() {
return BooleanWritable.class;
}
},
BYTE {
@Override
- public Class getWritableClass() {
+ public Class<ByteWritable> getWritableClass() {
return ByteWritable.class;
}
},
INT {
@Override
- public Class getWritableClass() {
+ public Class<IntWritable> getWritableClass() {
return IntWritable.class;
}
},
FLOAT {
@Override
- public Class getWritableClass() {
+ public Class<FloatWritable> getWritableClass() {
return FloatWritable.class;
}
},
LONG {
@Override
- public Class getWritableClass() {
+ public Class<LongWritable> getWritableClass() {
return LongWritable.class;
}
},
DOUBLE {
@Override
- public Class getWritableClass() {
+ public Class<DoubleWritable> getWritableClass() {
return DoubleWritable.class;
}
},
TEXT {
@Override
- public Class getWritableClass() {
+ public Class<Text> getWritableClass() {
return Text.class;
}
},
BYTES {
@Override
- public Class getWritableClass() {
+ public Class<BytesWritable> getWritableClass() {
return BytesWritable.class;
}
};
- public abstract Class getWritableClass();
+ @SuppressWarnings("rawtypes")
+ public abstract Class<? extends WritableComparable> getWritableClass();
}
interface HdfsWritableFactory {
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java Thu Jan 12 18:25:36 2012
@@ -266,14 +266,14 @@ public final class HttpHelper {
* @param value the value
*/
@SuppressWarnings("unchecked")
- public static void appendHeader(Map headers, String key, Object value) {
+ public static void appendHeader(Map<String, Object> headers, String key, Object value) {
if (headers.containsKey(key)) {
Object existing = headers.get(key);
- List list;
+ List<Object> list;
if (existing instanceof List) {
- list = (List) existing;
+ list = (List<Object>) existing;
} else {
- list = new ArrayList();
+ list = new ArrayList<Object>();
list.add(existing);
}
list.add(value);
@@ -295,7 +295,6 @@ public final class HttpHelper {
* @param value the parameter value
* @return the extracted parameter value, see more details in javadoc.
*/
- @SuppressWarnings("unchecked")
public static Object extractHttpParameterValue(String value) {
if (value == null || ObjectHelper.isEmpty(value)) {
return value;
@@ -307,7 +306,7 @@ public final class HttpHelper {
if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
// remove the [ ] markers
trimmed = trimmed.substring(1, trimmed.length() - 1);
- List list = new ArrayList<String>();
+ List<String> list = new ArrayList<String>();
String[] values = trimmed.split(",");
for (String s : values) {
list.add(s.trim());
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/helper/HttpHelperTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/helper/HttpHelperTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/helper/HttpHelperTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/helper/HttpHelperTest.java Thu Jan 12 18:25:36 2012
@@ -38,7 +38,7 @@ public class HttpHelperTest {
@Test
public void testAppendHeader() throws Exception {
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
HttpHelper.appendHeader(headers, "foo", "a");
HttpHelper.appendHeader(headers, "bar", "b");
HttpHelper.appendHeader(headers, "baz", "c");
@@ -51,7 +51,7 @@ public class HttpHelperTest {
@Test
public void testAppendHeaderMultipleValues() throws Exception {
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
HttpHelper.appendHeader(headers, "foo", "a");
HttpHelper.appendHeader(headers, "bar", "b");
HttpHelper.appendHeader(headers, "bar", "c");
Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java (original)
+++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java Thu Jan 12 18:25:36 2012
@@ -298,15 +298,15 @@ public final class HttpHelper {
* @param key the key
* @param value the value
*/
- @SuppressWarnings("unchecked")
- public static void appendHeader(Map headers, String key, Object value) {
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ public static void appendHeader(Map<String, Object> headers, String key, Object value) {
if (headers.containsKey(key)) {
Object existing = headers.get(key);
- List list;
+ List<Object> list;
if (existing instanceof List) {
list = (List) existing;
} else {
- list = new ArrayList();
+ list = new ArrayList<Object>();
list.add(existing);
}
list.add(value);
Modified: camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/HttpHelperTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/HttpHelperTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/HttpHelperTest.java (original)
+++ camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/HttpHelperTest.java Thu Jan 12 18:25:36 2012
@@ -38,7 +38,7 @@ public class HttpHelperTest {
@Test
public void testAppendHeader() throws Exception {
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
HttpHelper.appendHeader(headers, "foo", "a");
HttpHelper.appendHeader(headers, "bar", "b");
HttpHelper.appendHeader(headers, "baz", "c");
@@ -51,7 +51,7 @@ public class HttpHelperTest {
@Test
public void testAppendHeaderMultipleValues() throws Exception {
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
HttpHelper.appendHeader(headers, "foo", "a");
HttpHelper.appendHeader(headers, "bar", "b");
HttpHelper.appendHeader(headers, "bar", "c");
@@ -59,7 +59,7 @@ public class HttpHelperTest {
assertEquals(2, headers.size());
assertEquals("a", headers.get("foo"));
- List list = (List) headers.get("bar");
+ List<?> list = (List<?>) headers.get("bar");
assertNotNull(list);
assertEquals(2, list.size());
assertEquals("b", list.get(0));
Modified: camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java (original)
+++ camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java Thu Jan 12 18:25:36 2012
@@ -64,7 +64,7 @@ public class JaxbDataFormat extends Serv
// partial support
private QName partNamespace;
private String partClass;
- private Class partialClass;
+ private Class<Object> partialClass;
public JaxbDataFormat() {
}
@@ -105,13 +105,12 @@ public class JaxbDataFormat extends Serv
}
}
- @SuppressWarnings("unchecked")
void marshal(Exchange exchange, Object graph, OutputStream stream, Marshaller marshaller)
throws XMLStreamException, JAXBException {
Object e = graph;
if (partialClass != null && getPartNamespace() != null) {
- e = new JAXBElement(getPartNamespace(), partialClass, graph);
+ e = new JAXBElement<Object>(getPartNamespace(), partialClass, graph);
}
if (needFiltering(exchange)) {
@@ -128,7 +127,6 @@ public class JaxbDataFormat extends Serv
return filteringWriter;
}
- @SuppressWarnings("unchecked")
public Object unmarshal(Exchange exchange, InputStream stream) throws IOException {
try {
// must create a new instance of unmarshaller as its not thread safe
@@ -262,7 +260,7 @@ public class JaxbDataFormat extends Serv
context = createContext();
}
if (partClass != null) {
- partialClass = camelContext.getClassResolver().resolveMandatoryClass(partClass);
+ partialClass = camelContext.getClassResolver().resolveMandatoryClass(partClass, Object.class);
}
}
Modified: camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java (original)
+++ camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java Thu Jan 12 18:25:36 2012
@@ -56,7 +56,7 @@ public class JcloudsSpringComputeTest ex
List<Exchange> exchanges = result.getExchanges();
if (exchanges != null && !exchanges.isEmpty()) {
for (Exchange exchange : exchanges) {
- Set images = (Set) exchange.getIn().getBody();
+ Set<?> images = exchange.getIn().getBody(Set.class);
assertTrue(images.size() > 0);
for (Object obj : images) {
assertTrue(obj instanceof Image);
@@ -73,7 +73,7 @@ public class JcloudsSpringComputeTest ex
List<Exchange> exchanges = result.getExchanges();
if (exchanges != null && !exchanges.isEmpty()) {
for (Exchange exchange : exchanges) {
- Set hardwares = (Set) exchange.getIn().getBody();
+ Set<?> hardwares = exchange.getIn().getBody(Set.class);
assertTrue(hardwares.size() > 0);
for (Object obj : hardwares) {
assertTrue(obj instanceof Hardware);
@@ -90,7 +90,7 @@ public class JcloudsSpringComputeTest ex
List<Exchange> exchanges = result.getExchanges();
if (exchanges != null && !exchanges.isEmpty()) {
for (Exchange exchange : exchanges) {
- Set nodeMetadatas = (Set) exchange.getIn().getBody();
+ Set<?> nodeMetadatas = exchange.getIn().getBody(Set.class);
assertEquals("Nodes should be 0", 0, nodeMetadatas.size());
}
}
@@ -106,7 +106,7 @@ public class JcloudsSpringComputeTest ex
List<Exchange> exchanges = result.getExchanges();
if (exchanges != null && !exchanges.isEmpty()) {
for (Exchange exchange : exchanges) {
- Set nodeMetadatas = (Set) exchange.getIn().getBody();
+ Set<?> nodeMetadatas = exchange.getIn().getBody(Set.class);
assertEquals("Nodes should be 1", 1, nodeMetadatas.size());
}
}
@@ -131,20 +131,20 @@ public class JcloudsSpringComputeTest ex
List<Exchange> exchanges = result.getExchanges();
Exchange exchange = exchanges.get(3);
- Set<NodeMetadata> nodeMetadatas = (Set<NodeMetadata>) exchange.getIn().getBody();
+ Set<?> nodeMetadatas = exchange.getIn().getBody(Set.class);
assertEquals("Nodes should be 2", 2, nodeMetadatas.size());
NodeMetadata nodeMetadata = nodeMetadatas.toArray(new NodeMetadata[0])[0];
assertEquals("other", nodeMetadata.getGroup());
exchange = exchanges.get(4);
- nodeMetadatas = (Set<NodeMetadata>) exchange.getIn().getBody();
+ nodeMetadatas = exchange.getIn().getBody(Set.class);
assertEquals("Nodes should be 1", 1, nodeMetadatas.size());
nodeMetadata = nodeMetadatas.toArray(new NodeMetadata[0])[0];
assertEquals("other", nodeMetadata.getGroup());
assertEquals("3", nodeMetadata.getId());
exchange = exchanges.get(5);
- nodeMetadatas = (Set<NodeMetadata>) exchange.getIn().getBody();
+ nodeMetadatas = exchange.getIn().getBody(Set.class);
assertEquals("Nodes should be 1", 1, nodeMetadatas.size());
nodeMetadata = nodeMetadatas.toArray(new NodeMetadata[0])[0];
assertEquals("other", nodeMetadata.getGroup());
@@ -159,7 +159,7 @@ public class JcloudsSpringComputeTest ex
List<Exchange> exchanges = result.getExchanges();
if (exchanges != null && !exchanges.isEmpty()) {
for (Exchange exchange : exchanges) {
- Set nodeMetadatas = (Set) exchange.getIn().getBody();
+ Set<?> nodeMetadatas = exchange.getIn().getBody(Set.class);
assertEquals("There should be no node running", 1, nodeMetadatas.size());
for (Object obj : nodeMetadatas) {
Modified: camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java (original)
+++ camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java Thu Jan 12 18:25:36 2012
@@ -69,8 +69,7 @@ public class JcrConverterTest extends As
assertJcrConverterAvailable(StringValue.class, "plain text");
}
- @SuppressWarnings("unchecked")
- private void assertJcrConverterAvailable(Class expected, Object object) {
+ private void assertJcrConverterAvailable(Class<?> expected, Object object) {
Value value = converter.convertTo(Value.class, object);
assertNotNull(value);
assertTrue(expected.isAssignableFrom(value.getClass()));