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/14 01:13:16 UTC
svn commit: r1231420 [3/4] - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/component/bean/
camel-core/src/main/java/org/apache/camel/component/mock/
camel-core/src/main/java/org/apache/cam...
Modified: camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/strategy/IBatisProcessingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/strategy/IBatisProcessingStrategy.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/strategy/IBatisProcessingStrategy.java (original)
+++ camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/strategy/IBatisProcessingStrategy.java Sat Jan 14 00:13:10 2012
@@ -35,7 +35,7 @@ public interface IBatisProcessingStrateg
* @return Results of the query as a {@link List}
* @throws Exception can be thrown in case of error
*/
- List poll(IBatisConsumer consumer, IBatisEndpoint endpoint) throws Exception;
+ List<Object> poll(IBatisConsumer consumer, IBatisEndpoint endpoint) throws Exception;
/**
* Commit callback if there are a statements to be run after processing.
Modified: camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisBatchConsumerIsolationLevelTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisBatchConsumerIsolationLevelTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisBatchConsumerIsolationLevelTest.java (original)
+++ camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisBatchConsumerIsolationLevelTest.java Sat Jan 14 00:13:10 2012
@@ -59,7 +59,7 @@ public class IBatisBatchConsumerIsolatio
account2.setLastName("Hale");
account2.setEmailAddress("TryGuessingSkipper@gmail.com");
- List<Account> accounts = new ArrayList<Account>();
+ List<Object> accounts = new ArrayList<Object>();
accounts.add(account1);
accounts.add(account2);
Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java Sat Jan 14 00:13:10 2012
@@ -475,7 +475,7 @@ public class IrcConfiguration implements
Object value = pair.getValue();
// the value may be a list since the same key has multiple values
if (value instanceof List) {
- List list = (List)value;
+ List<?> list = (List<?>)value;
for (Object s : list) {
addQueryParameter(result, pair.getKey(), s);
}
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java Sat Jan 14 00:13:10 2012
@@ -36,7 +36,6 @@ import org.apache.camel.component.http.H
import org.apache.camel.component.http.HttpEndpoint;
import org.apache.camel.spi.ManagementAgent;
import org.apache.camel.spi.ManagementStrategy;
-import org.apache.camel.util.CastUtils;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
@@ -195,9 +194,9 @@ public class JettyHttpComponent extends
String address = uri.startsWith("jetty:") ? remaining : uri;
URI addressUri = new URI(UnsafeUriCharactersEncoder.encode(address));
- URI endpointUri = URISupport.createRemainingURI(addressUri, CastUtils.cast(httpClientParameters));
+ URI endpointUri = URISupport.createRemainingURI(addressUri, httpClientParameters);
// restructure uri to be based on the parameters left as we dont want to include the Camel internal options
- URI httpUri = URISupport.createRemainingURI(addressUri, CastUtils.cast(parameters));
+ URI httpUri = URISupport.createRemainingURI(addressUri, parameters);
// create endpoint after all known parameters have been extracted from parameters
JettyHttpEndpoint endpoint = new JettyHttpEndpoint(this, endpointUri.toString(), httpUri);
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java Sat Jan 14 00:13:10 2012
@@ -154,7 +154,7 @@ public class JettyHttpProducer extends D
if (headerValue != null) {
// use an iterator as there can be multiple values. (must not use a delimiter)
- final Iterator it = ObjectHelper.createIterator(headerValue, null);
+ final Iterator<?> it = ObjectHelper.createIterator(headerValue, null);
// the values to add as a request header
final List<String> values = new ArrayList<String>();
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java Sat Jan 14 00:13:10 2012
@@ -50,11 +50,11 @@ public class HttpProducerConcurrentTest
getMockEndpoint("mock:result").assertNoDuplicates(body());
ExecutorService executor = Executors.newFixedThreadPool(poolSize);
- Map<Integer, Future> responses = new ConcurrentHashMap<Integer, Future>();
+ Map<Integer, Future<String>> responses = new ConcurrentHashMap<Integer, Future<String>>();
for (int i = 0; i < files; i++) {
final int index = i;
- Future out = executor.submit(new Callable<Object>() {
- public Object call() throws Exception {
+ Future<String> out = executor.submit(new Callable<String>() {
+ public String call() throws Exception {
return template.requestBody("http://localhost:{{port}}/echo", "" + index, String.class);
}
});
@@ -67,7 +67,7 @@ public class HttpProducerConcurrentTest
// get all responses
Set<Object> unique = new HashSet<Object>();
- for (Future future : responses.values()) {
+ for (Future<String> future : responses.values()) {
unique.add(future.get());
}
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerTwoParametersWithSameKeyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerTwoParametersWithSameKeyTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerTwoParametersWithSameKeyTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerTwoParametersWithSameKeyTest.java Sat Jan 14 00:13:10 2012
@@ -38,7 +38,7 @@ public class HttpProducerTwoParametersWi
assertEquals("OK", out.getOut().getBody(String.class));
assertEquals("yes", out.getOut().getHeader("bar"));
- List foo = out.getOut().getHeader("foo", List.class);
+ List<?> foo = out.getOut().getHeader("foo", List.class);
assertNotNull(foo);
assertEquals(2, foo.size());
assertEquals("123", foo.get(0));
@@ -63,7 +63,7 @@ public class HttpProducerTwoParametersWi
assertEquals("OK", out.getOut().getBody(String.class));
assertEquals("yes", out.getOut().getHeader("bar"));
- List foo = out.getOut().getHeader("foo", List.class);
+ List<?> foo = out.getOut().getHeader("foo", List.class);
assertNotNull(foo);
assertEquals(2, foo.size());
assertEquals("123", foo.get(0));
@@ -80,7 +80,7 @@ public class HttpProducerTwoParametersWi
String from = exchange.getIn().getHeader("from", String.class);
assertEquals("me", from);
- List to = exchange.getIn().getHeader("to", List.class);
+ List<?> to = exchange.getIn().getHeader("to", List.class);
assertNotNull(to);
assertEquals(2, to.size());
assertEquals("foo", to.get(0));
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoParametersWithSameKeyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoParametersWithSameKeyTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoParametersWithSameKeyTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoParametersWithSameKeyTest.java Sat Jan 14 00:13:10 2012
@@ -47,7 +47,7 @@ public class HttpJettyProducerTwoParamet
assertEquals("OK", out.getOut().getBody(String.class));
assertEquals("yes", out.getOut().getHeader("bar"));
- List foo = out.getOut().getHeader("foo", List.class);
+ List<?> foo = out.getOut().getHeader("foo", List.class);
assertEquals(2, foo.size());
assertEquals("123", foo.get(0));
assertEquals("456", foo.get(1));
@@ -79,7 +79,7 @@ public class HttpJettyProducerTwoParamet
assertEquals("OK", out.getOut().getBody(String.class));
assertEquals("yes", out.getOut().getHeader("bar"));
- List foo = out.getOut().getHeader("foo", List.class);
+ List<?> foo = out.getOut().getHeader("foo", List.class);
assertNotNull(foo);
assertEquals(2, foo.size());
assertEquals("123", foo.get(0));
@@ -96,7 +96,7 @@ public class HttpJettyProducerTwoParamet
String from = exchange.getIn().getHeader("from", String.class);
assertEquals("me", from);
- List values = exchange.getIn().getHeader("to", List.class);
+ List<?> values = exchange.getIn().getHeader("to", List.class);
assertNotNull(values);
assertEquals(2, values.size());
assertEquals("foo", values.get(0));
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java Sat Jan 14 00:13:10 2012
@@ -67,11 +67,11 @@ public class JettyHttpProducerConcurrent
getMockEndpoint("mock:result").assertNoDuplicates(body());
ExecutorService executor = Executors.newFixedThreadPool(poolSize);
- Map<Integer, Future> responses = new ConcurrentHashMap<Integer, Future>();
+ Map<Integer, Future<String>> responses = new ConcurrentHashMap<Integer, Future<String>>();
for (int i = 0; i < files; i++) {
final int index = i;
- Future out = executor.submit(new Callable<Object>() {
- public Object call() throws Exception {
+ Future<String> out = executor.submit(new Callable<String>() {
+ public String call() throws Exception {
return template.requestBody("jetty://http://localhost:{{port}}/echo", "" + index, String.class);
}
});
@@ -84,7 +84,7 @@ public class JettyHttpProducerConcurrent
// get all responses
Set<Object> unique = new HashSet<Object>();
- for (Future future : responses.values()) {
+ for (Future<String> future : responses.values()) {
unique.add(future.get());
}
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java Sat Jan 14 00:13:10 2012
@@ -47,7 +47,7 @@ public class DefaultQueueBrowseStrategy
// not the best implementation in the world as we have to browse
// the entire queue, which could be massive
List<Exchange> answer = new ArrayList<Exchange>();
- Enumeration iter = browser.getEnumeration();
+ Enumeration<?> iter = browser.getEnumeration();
for (int i = 0; i < size && iter.hasMoreElements(); i++) {
Message message = (Message) iter.nextElement();
Exchange exchange = endpoint.createExchange(message);
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java Sat Jan 14 00:13:10 2012
@@ -172,7 +172,7 @@ public class JmsBinding {
throw new RuntimeCamelException(e);
}
- Enumeration names;
+ Enumeration<?> names;
try {
names = jmsMessage.getPropertyNames();
} catch (JMSException e) {
@@ -526,7 +526,7 @@ public class JmsBinding {
}
case Map: {
MapMessage message = session.createMapMessage();
- Map payload = context.getTypeConverter().convertTo(Map.class, exchange, body);
+ Map<?, ?> payload = context.getTypeConverter().convertTo(Map.class, exchange, body);
populateMapMessage(message, payload, context);
return message;
}
@@ -564,7 +564,7 @@ public class JmsBinding {
*/
public Map<String, Object> createMapFromMapMessage(MapMessage message) throws JMSException {
Map<String, Object> answer = new HashMap<String, Object>();
- Enumeration names = message.getMapNames();
+ Enumeration<?> names = message.getMapNames();
while (names.hasMoreElements()) {
String name = names.nextElement().toString();
Object value = message.getObject(name);
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java Sat Jan 14 00:13:10 2012
@@ -64,7 +64,7 @@ public final class JmsMessageHelper {
// clear a single property, but must clear them all and redo
// the properties
Map<String, Object> map = new LinkedHashMap<String, Object>();
- Enumeration en = jmsMessage.getPropertyNames();
+ Enumeration<?> en = jmsMessage.getPropertyNames();
while (en.hasMoreElements()) {
String key = (String) en.nextElement();
if (name.equals(key)) {
@@ -92,7 +92,7 @@ public final class JmsMessageHelper {
* @throws JMSException can be thrown
*/
public static boolean hasProperty(Message jmsMessage, String name) throws JMSException {
- Enumeration en = jmsMessage.getPropertyNames();
+ Enumeration<?> en = jmsMessage.getPropertyNames();
while (en.hasMoreElements()) {
String key = (String) en.nextElement();
if (name.equals(key)) {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java Sat Jan 14 00:13:10 2012
@@ -50,11 +50,11 @@ public class JmsProduerConcurrentWithRep
getMockEndpoint("mock:result").expectsNoDuplicates(body());
ExecutorService executor = Executors.newFixedThreadPool(poolSize);
- final List<Future> futures = new ArrayList<Future>();
+ final List<Future<String>> futures = new ArrayList<Future<String>>();
for (int i = 0; i < files; i++) {
final int index = i;
- Future out = executor.submit(new Callable<Object>() {
- public Object call() throws Exception {
+ Future<String> out = executor.submit(new Callable<String>() {
+ public String call() throws Exception {
return template.requestBody("direct:start", "Message " + index, String.class);
}
});
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMQSpecialHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMQSpecialHeaderTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMQSpecialHeaderTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMQSpecialHeaderTest.java Sat Jan 14 00:13:10 2012
@@ -46,13 +46,12 @@ public class JmsMQSpecialHeaderTest exte
}
@Test
- @SuppressWarnings("unchecked")
public void testUsingSpecialIBMJMSHeaderAndStandardJMSHeader() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello IBM");
mock.message(0).header("JMS_IBM_Character_Set").isEqualTo("ISO8859_1");
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("JMSPriority", 3);
headers.put("JMS_IBM_Character_Set", "ISO8859_1");
Modified: camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentTest.java (original)
+++ camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentTest.java Sat Jan 14 00:13:10 2012
@@ -27,7 +27,6 @@ import org.junit.Test;
/**
* Test case for {@link Jt400Component}
*/
-@SuppressWarnings("unchecked")
public class Jt400ComponentTest extends Assert {
private Jt400Component component;
@@ -44,7 +43,7 @@ public class Jt400ComponentTest extends
public void testCreateDatqEndpoint() throws Exception {
Endpoint endpoint = component
.createEndpoint("jt400://user:password@host/qsys.lib/library.lib/queue.dtaq",
- "/user:password@host/qsys.lib/library.lib/queue.dtaq", new HashMap());
+ "/user:password@host/qsys.lib/library.lib/queue.dtaq", new HashMap<String, Object>());
assertNotNull(endpoint);
assertTrue(endpoint instanceof Jt400DataQueueEndpoint);
}
@@ -56,7 +55,7 @@ public class Jt400ComponentTest extends
public void testCreatePgmEndpoint() throws Exception {
Endpoint endpoint = component
.createEndpoint("jt400://user:password@host/qsys.lib/library.lib/queue.pgm",
- "/user:password@host/qsys.lib/library.lib/queue.pgm", new HashMap());
+ "/user:password@host/qsys.lib/library.lib/queue.pgm", new HashMap<String, Object>());
assertNotNull(endpoint);
assertTrue(endpoint instanceof Jt400PgmEndpoint);
}
@@ -68,7 +67,7 @@ public class Jt400ComponentTest extends
public void testCreateEndpointForOtherObjectType() throws Exception {
try {
component.createEndpoint("jt400://user:password@host/qsys.lib/library.lib/program.xxx",
- "/user:password@host/qsys.lib/library.lib/program.xxx", new HashMap());
+ "/user:password@host/qsys.lib/library.lib/program.xxx", new HashMap<String, Object>());
fail("Exception should been thrown when trying to create an endpoint for an unsupported object type");
} catch (CamelException e) {
// this is just what we expected
Modified: camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java (original)
+++ camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java Sat Jan 14 00:13:10 2012
@@ -36,7 +36,7 @@ import org.apache.camel.spi.ShutdownAwar
public class KestrelConsumer extends DefaultConsumer implements ShutdownAware {
private final KestrelEndpoint endpoint;
private final MemcachedClient memcachedClient;
- private final BlockingQueue<Exchanger> exchangerQueue = new LinkedBlockingQueue<Exchanger>();
+ private final BlockingQueue<Exchanger<?>> exchangerQueue = new LinkedBlockingQueue<Exchanger<?>>();
private ExecutorService pollerExecutor;
private ExecutorService handlerExecutor;
private volatile boolean shutdownPending;
@@ -152,6 +152,7 @@ public class KestrelConsumer extends Def
target = endpoint.getQueue();
}
+ @SuppressWarnings("rawtypes")
Exchanger exchanger = null;
while (isRunAllowed() && !shutdownPending) {
if (concurrent) {
@@ -246,9 +247,8 @@ public class KestrelConsumer extends Def
}
}
- @SuppressWarnings("unchecked")
private final class Handler implements Runnable {
- private Exchanger exchanger = new Exchanger();
+ private Exchanger<Handler> exchanger = new Exchanger<Handler>();
public void run() {
if (log.isTraceEnabled()) {
Modified: camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java (original)
+++ camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java Sat Jan 14 00:13:10 2012
@@ -41,13 +41,13 @@ public class KratiConsumer extends Sched
private static final transient Logger LOG = LoggerFactory.getLogger(KratiConsumer.class);
protected final KratiEndpoint endpoint;
- protected DataStore dataStore;
+ protected DataStore<Object, Object> dataStore;
protected int maxMessagesPerPoll = 10;
protected volatile ShutdownRunningTask shutdownRunningTask;
protected volatile int pendingExchanges;
- public KratiConsumer(KratiEndpoint endpoint, Processor processor, DataStore dataStore) {
+ public KratiConsumer(KratiEndpoint endpoint, Processor processor, DataStore<Object, Object> dataStore) {
super(endpoint, processor);
this.endpoint = endpoint;
this.dataStore = dataStore;
@@ -60,7 +60,7 @@ public class KratiConsumer extends Sched
Queue<Exchange> queue = new LinkedList<Exchange>();
- Iterator keyIterator = dataStore.keyIterator();
+ Iterator<Object> keyIterator = dataStore.keyIterator();
while (keyIterator.hasNext()) {
Object key = keyIterator.next();
Object value = dataStore.get(key);
Modified: camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java (original)
+++ camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java Sat Jan 14 00:13:10 2012
@@ -26,10 +26,10 @@ public class KratiDataStoreRegistration
private static final transient Logger LOG = LoggerFactory.getLogger(KratiDataStoreRegistration.class);
- private final DataStore<byte[], byte[]> dataStore;
+ private final DataStore<Object, Object> dataStore;
private int registrationCount;
- public KratiDataStoreRegistration(DataStore<byte[], byte[]> dataStore) {
+ public KratiDataStoreRegistration(DataStore<Object, Object> dataStore) {
this.dataStore = dataStore;
}
@@ -50,7 +50,7 @@ public class KratiDataStoreRegistration
}
}
- public DataStore<byte[], byte[]> getDataStore() {
+ public DataStore<Object, Object> getDataStore() {
register();
return dataStore;
}
Modified: camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiEndpoint.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiEndpoint.java (original)
+++ camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiEndpoint.java Sat Jan 14 00:13:10 2012
@@ -45,8 +45,10 @@ public class KratiEndpoint extends Defau
protected int initialCapacity = 100;
protected int segmentFileSize = 64;
- protected Serializer keySerializer = new KratiDefaultSerializer();
- protected Serializer valueSerializer = new KratiDefaultSerializer();
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ protected Serializer<Object> keySerializer = new KratiDefaultSerializer();
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ protected Serializer<Object> valueSerializer = new KratiDefaultSerializer();
protected SegmentFactory segmentFactory = new ChannelSegmentFactory();
protected HashFunction<byte[]> hashFunction = new FnvHashFunction();
@@ -57,11 +59,6 @@ public class KratiEndpoint extends Defau
this.path = getPath(uri);
}
- public KratiEndpoint(String endpointUri) throws URISyntaxException {
- super(endpointUri);
- this.path = getPath(endpointUri);
- }
-
@Override
public void stop() throws Exception {
super.stop();
@@ -72,20 +69,20 @@ public class KratiEndpoint extends Defau
}
public Producer createProducer() throws Exception {
- DataStore<byte[], byte[]> dataStore = null;
+ DataStore<Object, Object> dataStore = null;
KratiDataStoreRegistration registration = dataStoreRegistry.get(path);
if (registration != null) {
dataStore = registration.getDataStore();
}
if (dataStore == null || !dataStore.isOpen()) {
- dataStore = KratiHelper.createDataStore(path, initialCapacity, segmentFileSize, segmentFactory, hashFunction, keySerializer, valueSerializer);
+ dataStore = KratiHelper.<Object, Object>createDataStore(path, initialCapacity, segmentFileSize, segmentFactory, hashFunction, keySerializer, valueSerializer);
dataStoreRegistry.put(path, new KratiDataStoreRegistration(dataStore));
}
return new KratiProducer(this, dataStore);
}
public Consumer createConsumer(Processor processor) throws Exception {
- DataStore<byte[], byte[]> dataStore = null;
+ DataStore<Object, Object> dataStore = null;
KratiDataStoreRegistration registration = dataStoreRegistry.get(path);
if (registration != null) {
dataStore = registration.getDataStore();
Modified: camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java (original)
+++ camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java Sat Jan 14 00:13:10 2012
@@ -27,13 +27,9 @@ import krati.store.DynamicDataSet;
import krati.store.DynamicDataStore;
import krati.util.HashFunction;
import org.apache.camel.RuntimeCamelException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public final class KratiHelper {
- private static final transient Logger LOG = LoggerFactory.getLogger(KratiHelper.class);
-
private KratiHelper() {
//Utillity Class
}
@@ -50,9 +46,9 @@ public final class KratiHelper {
* @param valueSerializer The serializer used for values,defaults to {@link org.apache.camel.component.krati.serializer.KratiDefaultSerializer}.
* @return
*/
- public static DataStore<byte[], byte[]> createDataStore(String path, int initialCapacity, int segmentFileSize, SegmentFactory segmentFactory,
- HashFunction<byte[]> hashFunction, Serializer keySerializer, Serializer valueSerializer) {
- DataStore<byte[], byte[]> result = null;
+ public static <K, V> DataStore<K, V> createDataStore(String path, int initialCapacity, int segmentFileSize, SegmentFactory segmentFactory,
+ HashFunction<byte[]> hashFunction, Serializer<K> keySerializer, Serializer<V> valueSerializer) {
+ DataStore<K, V> result = null;
File homeDir = new File(path);
homeDir.mkdirs();
try {
@@ -61,7 +57,7 @@ public final class KratiHelper {
storeConfig.setHashFunction(hashFunction);
storeConfig.setSegmentFileSizeMB(segmentFileSize);
DataStore<byte[], byte[]> dynamicDataStore = new DynamicDataStore(storeConfig);
- result = new SerializableObjectStore(dynamicDataStore, keySerializer, valueSerializer);
+ result = new SerializableObjectStore<K, V>(dynamicDataStore, keySerializer, valueSerializer);
} catch (Exception e) {
throw new RuntimeCamelException("Failed to create Krati DataStore.", e);
}
Modified: camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiProducer.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiProducer.java (original)
+++ camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiProducer.java Sat Jan 14 00:13:10 2012
@@ -29,9 +29,9 @@ public class KratiProducer extends Defau
private static final transient Logger LOG = LoggerFactory.getLogger(KratiProducer.class);
protected KratiEndpoint endpoint;
- protected DataStore dataStore;
+ protected DataStore<Object, Object> dataStore;
- public KratiProducer(KratiEndpoint endpoint, DataStore dataStore) {
+ public KratiProducer(KratiEndpoint endpoint, DataStore<Object, Object> dataStore) {
super(endpoint);
this.endpoint = endpoint;
this.dataStore = dataStore;
Modified: camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/processor/idempotent/KratiIdempotentRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/processor/idempotent/KratiIdempotentRepository.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/processor/idempotent/KratiIdempotentRepository.java (original)
+++ camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/processor/idempotent/KratiIdempotentRepository.java Sat Jan 14 00:13:10 2012
@@ -34,9 +34,9 @@ public class KratiIdempotentRepository e
private String repositoryPath;
- private DataSet dataSet;
+ private DataSet<byte[]> dataSet;
private int initialCapacity = 100;
- private Serializer serializer = new KratiDefaultSerializer();
+ private Serializer<String> serializer = new KratiDefaultSerializer<String>();
private SegmentFactory segmentFactory = new ChannelSegmentFactory();
public KratiIdempotentRepository(String repositoryPath) {
@@ -76,7 +76,7 @@ public class KratiIdempotentRepository e
}
@Override
- @ManagedOperation(description = "Does the store contain the given key")
+ @ManagedOperation(description = "Removes the given key from the store")
public boolean remove(String s) {
byte[] bytes = serializer.serialize(s);
try {
@@ -114,11 +114,11 @@ public class KratiIdempotentRepository e
this.repositoryPath = repositoryPath;
}
- public DataSet getDataSet() {
+ public DataSet<byte[]> getDataSet() {
return dataSet;
}
- public void setDataSet(DataSet dataSet) {
+ public void setDataSet(DataSet<byte[]> dataSet) {
this.dataSet = dataSet;
}
@@ -130,11 +130,11 @@ public class KratiIdempotentRepository e
this.initialCapacity = initialCapacity;
}
- public Serializer getSerializer() {
+ public Serializer<String> getSerializer() {
return serializer;
}
- public void setSerializer(Serializer serializer) {
+ public void setSerializer(Serializer<String> serializer) {
this.serializer = serializer;
}
Modified: camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/serializer/KratiDefaultSerializer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/serializer/KratiDefaultSerializer.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/serializer/KratiDefaultSerializer.java (original)
+++ camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/serializer/KratiDefaultSerializer.java Sat Jan 14 00:13:10 2012
@@ -69,6 +69,7 @@ public class KratiDefaultSerializer<T ex
* @return an object constructed from the raw bytes.
* @throws SerializationException if the object cannot be constructed from the raw bytes.
*/
+ @SuppressWarnings("unchecked")
public T deserialize(byte[] binary) throws SerializationException {
T result = null;
ObjectInputStream ois = null;
Modified: camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KeyObject.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KeyObject.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KeyObject.java (original)
+++ camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KeyObject.java Sat Jan 14 00:13:10 2012
@@ -20,6 +20,7 @@ import java.io.Serializable;
public class KeyObject implements Serializable {
+ private static final long serialVersionUID = 1L;
private String id;
public KeyObject(String id) {
Modified: camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/ValueObject.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/ValueObject.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/ValueObject.java (original)
+++ camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/ValueObject.java Sat Jan 14 00:13:10 2012
@@ -21,6 +21,7 @@ import java.io.Serializable;
public class ValueObject implements Serializable {
+ private static final long serialVersionUID = 1L;
Object value;
public ValueObject(Object value) {
Modified: camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/processor/idempotent/KratiIdempotentRepositoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/processor/idempotent/KratiIdempotentRepositoryTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/processor/idempotent/KratiIdempotentRepositoryTest.java (original)
+++ camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/processor/idempotent/KratiIdempotentRepositoryTest.java Sat Jan 14 00:13:10 2012
@@ -30,8 +30,8 @@ import org.junit.Test;
public class KratiIdempotentRepositoryTest extends CamelTestSupport {
private String path = "target/test/idempotent";
- private DataSet dataSet = KratiHelper.createDataSet(path, 2, new ChannelSegmentFactory());
- private Serializer serializer = new KratiDefaultSerializer();
+ private DataSet<byte[]> dataSet = KratiHelper.createDataSet(path, 2, new ChannelSegmentFactory());
+ private Serializer<String> serializer = new KratiDefaultSerializer<String>();
private KratiIdempotentRepository repository;
private String key01 = "123";
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java Sat Jan 14 00:13:10 2012
@@ -345,7 +345,7 @@ public class MailBinding {
// Mail messages can repeat the same header...
if (ObjectConverter.isCollection(headerValue)) {
- Iterator iter = ObjectHelper.createIterator(headerValue);
+ Iterator<?> iter = ObjectHelper.createIterator(headerValue);
while (iter.hasNext()) {
Object value = iter.next();
mimeMessage.addHeader(headerName, asString(exchange, value));
@@ -365,7 +365,7 @@ public class MailBinding {
if (headerValue != null && isRecipientHeader(headerName)) {
// special handling of recipients
if (ObjectConverter.isCollection(headerValue)) {
- Iterator iter = ObjectHelper.createIterator(headerValue);
+ Iterator<?> iter = ObjectHelper.createIterator(headerValue);
while (iter.hasNext()) {
Object recipient = iter.next();
appendRecipientToMimeMessage(mimeMessage, headerName, asString(exchange, recipient));
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java Sat Jan 14 00:13:10 2012
@@ -19,7 +19,6 @@ package org.apache.camel.component.mail;
import java.net.URI;
import java.util.HashSet;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import org.apache.camel.CamelContext;
@@ -75,13 +74,11 @@ public class MailComponent extends Defau
return endpoint;
}
- @SuppressWarnings("unchecked")
- private void configureAdditionalJavaMailProperties(MailConfiguration config, Map parameters) {
+ private void configureAdditionalJavaMailProperties(MailConfiguration config, Map<String, Object> parameters) {
// we cannot remove while iterating, as we will get a modification exception
- Set toRemove = new HashSet();
+ Set<Object> toRemove = new HashSet<Object>();
- for (Object object : parameters.entrySet()) {
- Entry entry = (Entry) object;
+ for (Map.Entry<String, Object> entry : parameters.entrySet()) {
if (entry.getKey().toString().startsWith("mail.")) {
config.getAdditionalJavaMailProperties().put(entry.getKey(), entry.getValue());
toRemove.add(entry.getKey());
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java Sat Jan 14 00:13:10 2012
@@ -374,7 +374,7 @@ public class MailConsumer extends Schedu
// to be unique
StringBuilder buffer = new StringBuilder();
try {
- Enumeration it = message.getAllHeaders();
+ Enumeration<?> it = message.getAllHeaders();
while (it.hasMoreElements()) {
Header header = (Header)it.nextElement();
buffer.append(header.getName()).append("=").append(header.getValue()).append("\n");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java Sat Jan 14 00:13:10 2012
@@ -45,7 +45,7 @@ public class MailCollectionHeaderTest ex
Object beers = mock.getReceivedExchanges().get(0).getIn().getHeader("beers");
assertNotNull(beers);
- List list = assertIsInstanceOf(List.class, beers);
+ List<?> list = assertIsInstanceOf(List.class, beers);
assertEquals("Carlsberg", list.get(0));
assertEquals("Heineken", list.get(1));
}
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java Sat Jan 14 00:13:10 2012
@@ -38,7 +38,6 @@ public class MailProducerUnsupportedChar
}
@Test
- @SuppressWarnings("unchecked")
public void testSencUnsupportedCharset() throws Exception {
Mailbox.clearAll();
@@ -54,7 +53,7 @@ public class MailProducerUnsupportedChar
mock.expectedBodiesReceived("Hello World", "Bye World");
mock.allMessages().header("Content-Type").isEqualTo("text/plain");
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("To", "jones@localhost");
headers.put("Content-Type", "text/plain");
template.sendBodyAndHeaders("smtp://localhost?ignoreUnsupportedCharset=true", "Hello World", headers);
@@ -68,7 +67,6 @@ public class MailProducerUnsupportedChar
}
@Test
- @SuppressWarnings("unchecked")
public void testSencUnsupportedCharsetDisabledOption() throws Exception {
Mailbox.clearAll();
@@ -84,7 +82,7 @@ public class MailProducerUnsupportedChar
mock.expectedBodiesReceived("Hello World");
mock.allMessages().header("Content-Type").isEqualTo("text/plain");
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("To", "jones@localhost");
headers.put("Content-Type", "text/plain");
template.sendBodyAndHeaders("smtp://localhost?ignoreUnsupportedCharset=false", "Hello World", headers);
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java Sat Jan 14 00:13:10 2012
@@ -53,11 +53,11 @@ public class MinaProducerAnotherConcurre
getMockEndpoint("mock:result").expectedMessageCount(files);
ExecutorService executor = Executors.newFixedThreadPool(poolSize);
- Map<Integer, Future> responses = new ConcurrentHashMap<Integer, Future>();
+ Map<Integer, Future<String>> responses = new ConcurrentHashMap<Integer, Future<String>>();
for (int i = 0; i < files; i++) {
final int index = i;
- Future out = executor.submit(new Callable<Object>() {
- public Object call() throws Exception {
+ Future<String> out = executor.submit(new Callable<String>() {
+ public String call() throws Exception {
return template.requestBody("direct:start", index, String.class);
}
});
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java Sat Jan 14 00:13:10 2012
@@ -49,11 +49,11 @@ public class MinaProducerConcurrentTest
getMockEndpoint("mock:result").expectedMessageCount(files);
ExecutorService executor = Executors.newFixedThreadPool(poolSize);
- Map<Integer, Future> responses = new ConcurrentHashMap<Integer, Future>();
+ Map<Integer, Future<String>> responses = new ConcurrentHashMap<Integer, Future<String>>();
for (int i = 0; i < files; i++) {
final int index = i;
- Future out = executor.submit(new Callable<Object>() {
- public Object call() throws Exception {
+ Future<String> out = executor.submit(new Callable<String>() {
+ public String call() throws Exception {
return template.requestBody("mina:tcp://localhost:{{port}}?sync=true", index, String.class);
}
});
@@ -65,7 +65,7 @@ public class MinaProducerConcurrentTest
// get all responses
Set<Object> unique = new HashSet<Object>();
- for (Future future : responses.values()) {
+ for (Future<String> future : responses.values()) {
unique.add(future.get());
}
Modified: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java (original)
+++ camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java Sat Jan 14 00:13:10 2012
@@ -40,7 +40,7 @@ public class DefaultMyBatisProcessingStr
}
}
- public List poll(MyBatisConsumer consumer, MyBatisEndpoint endpoint) throws Exception {
+ public List<?> poll(MyBatisConsumer consumer, MyBatisEndpoint endpoint) throws Exception {
SqlSession session = endpoint.getSqlSessionFactory().openSession();
try {
return session.selectList(endpoint.getStatement(), null);
Modified: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProcessingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProcessingStrategy.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProcessingStrategy.java (original)
+++ camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProcessingStrategy.java Sat Jan 14 00:13:10 2012
@@ -35,7 +35,7 @@ public interface MyBatisProcessingStrate
* @return Results of the query as a {@link List}
* @throws Exception can be thrown in case of error
*/
- List poll(MyBatisConsumer consumer, MyBatisEndpoint endpoint) throws Exception;
+ List<?> poll(MyBatisConsumer consumer, MyBatisEndpoint endpoint) throws Exception;
/**
* Commit callback if there are a statements to be run after processing.
Modified: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java (original)
+++ camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java Sat Jan 14 00:13:10 2012
@@ -108,7 +108,7 @@ public class MyBatisProducer extends Def
Object in = exchange.getIn().getBody();
if (in != null) {
// lets handle arrays or collections of objects
- Iterator iter = ObjectHelper.createIterator(in);
+ Iterator<?> iter = ObjectHelper.createIterator(in);
while (iter.hasNext()) {
Object value = iter.next();
LOG.trace("Inserting: {} using statement: {}", value, statement);
@@ -134,7 +134,7 @@ public class MyBatisProducer extends Def
Object in = exchange.getIn().getBody();
if (in != null) {
// lets handle arrays or collections of objects
- Iterator iter = ObjectHelper.createIterator(in);
+ Iterator<?> iter = ObjectHelper.createIterator(in);
while (iter.hasNext()) {
Object value = iter.next();
LOG.trace("Updating: {} using statement: {}", value, statement);
@@ -160,7 +160,7 @@ public class MyBatisProducer extends Def
Object in = exchange.getIn().getBody();
if (in != null) {
// lets handle arrays or collections of objects
- Iterator iter = ObjectHelper.createIterator(in);
+ Iterator<?> iter = ObjectHelper.createIterator(in);
while (iter.hasNext()) {
Object value = iter.next();
LOG.trace("Deleting: {} using statement: {}", value, statement);
Modified: camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java (original)
+++ camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java Sat Jan 14 00:13:10 2012
@@ -43,11 +43,11 @@ public class NettyConcurrentTest extends
getMockEndpoint("mock:result").expectedMessageCount(files);
ExecutorService executor = Executors.newFixedThreadPool(poolSize);
- Map<Integer, Future> responses = new ConcurrentHashMap<Integer, Future>();
+ Map<Integer, Future<String>> responses = new ConcurrentHashMap<Integer, Future<String>>();
for (int i = 0; i < files; i++) {
final int index = i;
- Future out = executor.submit(new Callable<Object>() {
- public Object call() throws Exception {
+ Future<String> out = executor.submit(new Callable<String>() {
+ public String call() throws Exception {
return template.requestBody("netty:tcp://localhost:{{port}}", index, String.class);
}
});
@@ -59,7 +59,7 @@ public class NettyConcurrentTest extends
// get all responses
Set<Object> unique = new HashSet<Object>();
- for (Future future : responses.values()) {
+ for (Future<String> future : responses.values()) {
unique.add(future.get());
}
Modified: camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiComponent.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiComponent.java (original)
+++ camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiComponent.java Sat Jan 14 00:13:10 2012
@@ -44,10 +44,10 @@ public class RmiComponent extends Defaul
// lookup remote interfaces
List<Class<?>> classes = new ArrayList<Class<?>>();
- Iterator it = getAndRemoveParameter(parameters, "remoteInterfaces", Iterator.class);
+ Iterator<?> it = getAndRemoveParameter(parameters, "remoteInterfaces", Iterator.class);
while (it != null && it.hasNext()) {
Object next = it.next();
- Class clazz = getCamelContext().getTypeConverter().mandatoryConvertTo(Class.class, next);
+ Class<?> clazz = getCamelContext().getTypeConverter().mandatoryConvertTo(Class.class, next);
classes.add(clazz);
}
Modified: camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java (original)
+++ camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java Sat Jan 14 00:13:10 2012
@@ -48,7 +48,7 @@ public class RmiConsumer extends Default
@Override
protected void doStart() throws Exception {
- Class[] interfaces = new Class[endpoint.getRemoteInterfaces().size()];
+ Class<?>[] interfaces = new Class[endpoint.getRemoteInterfaces().size()];
endpoint.getRemoteInterfaces().toArray(interfaces);
proxy = (Remote)Proxy.newProxyInstance(endpoint.getClassLoader(), interfaces, this);
stub = UnicastRemoteObject.exportObject(proxy, endpoint.getPort());
Modified: camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssComponent.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssComponent.java (original)
+++ camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssComponent.java Sat Jan 14 00:13:10 2012
@@ -47,7 +47,7 @@ public class RssComponent extends FeedCo
// for the http feed
String feedUri;
if (!parameters.isEmpty()) {
- Map<Object, Object> options = new LinkedHashMap<Object, Object>(parameters);
+ Map<String, Object> options = new LinkedHashMap<String, Object>(parameters);
String query = URISupport.createQueryString(options);
feedUri = remaining + "?" + query;
} else {
Modified: camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryAnnotationExpressionFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryAnnotationExpressionFactory.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryAnnotationExpressionFactory.java (original)
+++ camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryAnnotationExpressionFactory.java Sat Jan 14 00:13:10 2012
@@ -33,10 +33,9 @@ import org.apache.camel.language.Namespa
*/
public class XQueryAnnotationExpressionFactory extends DefaultAnnotationExpressionFactory {
- @SuppressWarnings("unchecked")
@Override
public Expression createExpression(CamelContext camelContext, Annotation annotation,
- LanguageAnnotation languageAnnotation, Class expressionReturnType) {
+ LanguageAnnotation languageAnnotation, Class<?> expressionReturnType) {
String xQuery = getExpressionFromAnnotation(annotation);
XQueryBuilder builder = XQueryBuilder.xquery(xQuery);
if (annotation instanceof XQuery) {
Modified: camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java (original)
+++ camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java Sat Jan 14 00:13:10 2012
@@ -87,7 +87,7 @@ public abstract class XQueryBuilder impl
private Map<String, String> namespacePrefixes = new HashMap<String, String>();
private ResultFormat resultsFormat = ResultFormat.DOM;
private Properties properties = new Properties();
- private Class resultType;
+ private Class<?> resultType;
private final AtomicBoolean initialized = new AtomicBoolean(false);
private boolean stripsAllWhiteSpace = true;
private ModuleURIResolver moduleURIResolver;
@@ -285,7 +285,7 @@ public abstract class XQueryBuilder impl
return this;
}
- public XQueryBuilder resultType(Class resultType) {
+ public XQueryBuilder resultType(Class<?> resultType) {
setResultType(resultType);
return this;
}
@@ -405,11 +405,11 @@ public abstract class XQueryBuilder impl
this.resultsFormat = resultsFormat;
}
- public Class getResultType() {
+ public Class<?> getResultType() {
return resultType;
}
- public void setResultType(Class resultType) {
+ public void setResultType(Class<?> resultType) {
this.resultType = resultType;
}
Modified: camel/trunk/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java (original)
+++ camel/trunk/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java Sat Jan 14 00:13:10 2012
@@ -117,7 +117,7 @@ public class Activator implements Bundle
protected void registerScriptEngines(Bundle bundle, List<BundleScriptEngineResolver> resolvers) {
URL configURL = null;
- for (Enumeration e = bundle.findEntries(META_INF_SERVICES_DIR, SCRIPT_ENGINE_SERVICE_FILE, false); e != null && e.hasMoreElements();) {
+ for (Enumeration<?> e = bundle.findEntries(META_INF_SERVICES_DIR, SCRIPT_ENGINE_SERVICE_FILE, false); e != null && e.hasMoreElements();) {
configURL = (URL) e.nextElement();
}
if (configURL != null) {
Modified: camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java (original)
+++ camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java Sat Jan 14 00:13:10 2012
@@ -27,7 +27,6 @@ import org.apache.camel.component.http.H
import org.apache.camel.component.http.HttpClientConfigurer;
import org.apache.camel.component.http.HttpComponent;
import org.apache.camel.component.http.HttpConsumer;
-import org.apache.camel.util.CastUtils;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
@@ -73,7 +72,7 @@ public class ServletComponent extends Ht
String servletName = getAndRemoveParameter(parameters, "servletName", String.class, getServletName());
// restructure uri to be based on the parameters left as we dont want to include the Camel internal options
- URI httpUri = URISupport.createRemainingURI(new URI(UnsafeUriCharactersEncoder.encode(uri)), CastUtils.cast(parameters));
+ URI httpUri = URISupport.createRemainingURI(new URI(UnsafeUriCharactersEncoder.encode(uri)), parameters);
ServletEndpoint endpoint = createServletEndpoint(uri, this, httpUri, params, getHttpConnectionManager(), configurer);
endpoint.setServletName(servletName);
Modified: camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java (original)
+++ camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java Sat Jan 14 00:13:10 2012
@@ -19,7 +19,6 @@ package org.apache.camel.component.solr;
import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument;
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java Sat Jan 14 00:13:10 2012
@@ -32,22 +32,20 @@ public final class SpringIntegrationBind
// Helper class
}
- public static org.springframework.integration.Message createSpringIntegrationMessage(Exchange exchange) {
+ public static org.springframework.integration.Message<?> createSpringIntegrationMessage(Exchange exchange) {
return createSpringIntegrationMessage(exchange, exchange.getIn().getHeaders());
}
- @SuppressWarnings("unchecked")
- public static org.springframework.integration.Message createSpringIntegrationMessage(Exchange exchange, Map<String, Object> headers) {
+ public static org.springframework.integration.Message<?> createSpringIntegrationMessage(Exchange exchange, Map<String, Object> headers) {
org.apache.camel.Message message = exchange.getIn();
- return new GenericMessage(message.getBody(), headers);
+ return new GenericMessage<Object>(message.getBody(), headers);
}
- @SuppressWarnings("unchecked")
- public static org.springframework.integration.Message storeToSpringIntegrationMessage(org.apache.camel.Message message) {
- return new GenericMessage(message.getBody());
+ public static org.springframework.integration.Message<?> storeToSpringIntegrationMessage(org.apache.camel.Message message) {
+ return new GenericMessage<Object>(message.getBody());
}
- public static void storeToCamelMessage(org.springframework.integration.Message siMessage, org.apache.camel.Message cMessage) {
+ public static void storeToCamelMessage(org.springframework.integration.Message<?> siMessage, org.apache.camel.Message cMessage) {
cMessage.setBody(siMessage.getPayload());
cMessage.setHeaders(siMessage.getHeaders());
}
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java Sat Jan 14 00:13:10 2012
@@ -44,12 +44,11 @@ public final class SpringIntegrationConv
return answer;
}
- @SuppressWarnings("unchecked")
@Converter
- public static org.springframework.integration.Message toSpringMessage(final org.apache.camel.Message camelMessage) throws Exception {
+ public static org.springframework.integration.Message<?> toSpringMessage(final org.apache.camel.Message camelMessage) throws Exception {
if (camelMessage instanceof SpringIntegrationMessage) {
SpringIntegrationMessage siMessage = (SpringIntegrationMessage)camelMessage;
- org.springframework.integration.Message message = siMessage.getMessage();
+ org.springframework.integration.Message<?> message = siMessage.getMessage();
if (message != null) {
return message;
}
@@ -57,11 +56,11 @@ public final class SpringIntegrationConv
// Create a new spring message and copy the attributes and body from the camel message
MessageHeaders messageHeaders = new MessageHeaders(camelMessage.getHeaders());
- return new GenericMessage(camelMessage.getBody(), messageHeaders);
+ return new GenericMessage<Object>(camelMessage.getBody(), messageHeaders);
}
@Converter
- public static org.apache.camel.Message toCamelMessage(final org.springframework.integration.Message springMessage) throws Exception {
+ public static org.apache.camel.Message toCamelMessage(final org.springframework.integration.Message<?> springMessage) throws Exception {
return new SpringIntegrationMessage(springMessage);
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelConsumerTemplateFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelConsumerTemplateFactoryBean.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelConsumerTemplateFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelConsumerTemplateFactoryBean.java Sat Jan 14 00:13:10 2012
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlRoot
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.core.xml.AbstractCamelConsumerTemplateFactoryBean;
import org.apache.camel.spring.util.CamelContextResolverHelper;
import org.springframework.beans.BeansException;
@@ -39,7 +40,7 @@ import org.springframework.context.Appli
*/
@XmlRootElement(name = "consumerTemplate")
@XmlAccessorType(XmlAccessType.FIELD)
-public class CamelConsumerTemplateFactoryBean extends AbstractCamelConsumerTemplateFactoryBean implements FactoryBean, InitializingBean, DisposableBean, ApplicationContextAware {
+public class CamelConsumerTemplateFactoryBean extends AbstractCamelConsumerTemplateFactoryBean implements FactoryBean<ConsumerTemplate>, InitializingBean, DisposableBean, ApplicationContextAware {
@XmlTransient
private ApplicationContext applicationContext;
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=1231420&r1=1231419&r2=1231420&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 Sat Jan 14 00:13:10 2012
@@ -122,7 +122,7 @@ public class CamelContextFactoryBean ext
@XmlElement(name = "proxy", type = CamelProxyFactoryDefinition.class, required = false),
@XmlElement(name = "export", type = CamelServiceExporterDefinition.class, required = false),
@XmlElement(name = "errorHandler", type = ErrorHandlerDefinition.class, required = false)})
- private List beans;
+ private List<?> beans;
@XmlElement(name = "routeBuilder", required = false)
private List<RouteBuilderDefinition> builderRefs = new ArrayList<RouteBuilderDefinition>();
@XmlElement(name = "routeContextRef", required = false)
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelEndpointFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelEndpointFactoryBean.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelEndpointFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelEndpointFactoryBean.java Sat Jan 14 00:13:10 2012
@@ -37,7 +37,7 @@ import org.springframework.context.Appli
*/
@XmlRootElement(name = "endpoint")
@XmlAccessorType(XmlAccessType.FIELD)
-public class CamelEndpointFactoryBean extends AbstractCamelEndpointFactoryBean implements FactoryBean, ApplicationContextAware {
+public class CamelEndpointFactoryBean extends AbstractCamelEndpointFactoryBean implements FactoryBean<Endpoint>, ApplicationContextAware {
@XmlTransient
private ApplicationContext applicationContext;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProducerTemplateFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProducerTemplateFactoryBean.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProducerTemplateFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProducerTemplateFactoryBean.java Sat Jan 14 00:13:10 2012
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlRoot
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.core.xml.AbstractCamelProducerTemplateFactoryBean;
import org.apache.camel.spring.util.CamelContextResolverHelper;
import org.springframework.beans.BeansException;
@@ -39,7 +40,7 @@ import org.springframework.context.Appli
*/
@XmlRootElement(name = "template")
@XmlAccessorType(XmlAccessType.FIELD)
-public class CamelProducerTemplateFactoryBean extends AbstractCamelProducerTemplateFactoryBean implements FactoryBean, InitializingBean, DisposableBean, ApplicationContextAware {
+public class CamelProducerTemplateFactoryBean extends AbstractCamelProducerTemplateFactoryBean implements FactoryBean<ProducerTemplate>, InitializingBean, DisposableBean, ApplicationContextAware {
@XmlTransient
private ApplicationContext applicationContext;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRedeliveryPolicyFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRedeliveryPolicyFactoryBean.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRedeliveryPolicyFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRedeliveryPolicyFactoryBean.java Sat Jan 14 00:13:10 2012
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlTran
import org.apache.camel.CamelContext;
import org.apache.camel.core.xml.AbstractCamelRedeliveryPolicyFactoryBean;
+import org.apache.camel.processor.RedeliveryPolicy;
import org.apache.camel.spring.util.CamelContextResolverHelper;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.context.ApplicationContext;
@@ -35,7 +36,7 @@ import org.springframework.context.Appli
*/
@XmlRootElement(name = "redeliveryPolicyProfile")
@XmlAccessorType(XmlAccessType.FIELD)
-public class CamelRedeliveryPolicyFactoryBean extends AbstractCamelRedeliveryPolicyFactoryBean implements FactoryBean, ApplicationContextAware {
+public class CamelRedeliveryPolicyFactoryBean extends AbstractCamelRedeliveryPolicyFactoryBean implements FactoryBean<RedeliveryPolicy>, ApplicationContextAware {
@XmlTransient
private ApplicationContext applicationContext;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelThreadPoolFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelThreadPoolFactoryBean.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelThreadPoolFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelThreadPoolFactoryBean.java Sat Jan 14 00:13:10 2012
@@ -16,6 +16,8 @@
*/
package org.apache.camel.spring;
+import java.util.concurrent.ExecutorService;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@@ -35,7 +37,7 @@ import org.springframework.context.Appli
*/
@XmlRootElement(name = "threadPool")
@XmlAccessorType(XmlAccessType.FIELD)
-public class CamelThreadPoolFactoryBean extends AbstractCamelThreadPoolFactoryBean implements FactoryBean, ApplicationContextAware {
+public class CamelThreadPoolFactoryBean extends AbstractCamelThreadPoolFactoryBean implements FactoryBean<ExecutorService>, ApplicationContextAware {
@XmlTransient
private ApplicationContext applicationContext;
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/scan/ScanTestSupport.java Sat Jan 14 00:13:10 2012
@@ -32,7 +32,7 @@ public abstract class ScanTestSupport ex
protected void validateMatchingSetContains(Set<Class<?>> scannedClasses, Class<?>... matchingClasses) {
HashSet<Class<?>> expectedSet = new HashSet<Class<?>>();
- for (Class expected : matchingClasses) {
+ for (Class<?> expected : matchingClasses) {
expectedSet.add(expected);
}
validateMatchingSetContains(scannedClasses, expectedSet);
@@ -62,7 +62,7 @@ public abstract class ScanTestSupport ex
public Set<Class<?>> getMatchingClasses(Set<Class<?>> scannedClasses, PatternBasedPackageScanFilter filter) {
Set<Class<?>> matching = new HashSet<Class<?>>();
- for (Class candidate : scannedClasses) {
+ for (Class<?> candidate : scannedClasses) {
if (filter.matches(candidate)) {
matching.add(candidate);
}
Modified: camel/trunk/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXJAXBIteratorExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXJAXBIteratorExpression.java?rev=1231420&r1=1231419&r2=1231420&view=diff
==============================================================================
--- camel/trunk/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXJAXBIteratorExpression.java (original)
+++ camel/trunk/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXJAXBIteratorExpression.java Sat Jan 14 00:13:10 2012
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.stream.XMLEventReader;
@@ -157,7 +156,6 @@ public class StAXJAXBIteratorExpression<
throw new UnsupportedOperationException();
}
- @SuppressWarnings("unchecked")
T getNextElement() {
XMLEvent xmlEvent;
boolean found = false;
@@ -178,18 +176,11 @@ public class StAXJAXBIteratorExpression<
return null;
}
- Object answer;
try {
- answer = unmarshaller.unmarshal(reader, clazz);
- if (answer != null && answer.getClass() == JAXBElement.class) {
- JAXBElement jbe = (JAXBElement) answer;
- answer = jbe.getValue();
- }
+ return unmarshaller.unmarshal(reader, clazz).getValue();
} catch (JAXBException e) {
throw new RuntimeCamelException(e);
}
-
- return (T) answer;
}
@Override