You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/15 11:38:45 UTC
svn commit: r1231645 [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/impl/
camel-core/src/main/java/org/apache/camel/managem...
Modified: camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java (original)
+++ camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java Sun Jan 15 10:38:40 2012
@@ -151,7 +151,7 @@ public class CsvDataFormat implements Da
this.autogenColumns = autogenColumns;
}
- private synchronized void updateFieldsInConfig(Set set, Exchange exchange) {
+ private synchronized void updateFieldsInConfig(Set<?> set, Exchange exchange) {
for (Object value : set) {
if (value != null) {
String text = exchange.getContext().getTypeConverter().convertTo(String.class, value);
Modified: camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/dto/CustomerDTO.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/dto/CustomerDTO.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/dto/CustomerDTO.java (original)
+++ camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/dto/CustomerDTO.java Sun Jan 15 10:38:40 2012
@@ -21,6 +21,7 @@ import java.io.Serializable;
public class CustomerDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
private String firstName;
private String lastName;
private AddressDTO address;
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java Sun Jan 15 10:38:40 2012
@@ -42,8 +42,8 @@ public abstract class RemoteFileConsumer
return (RemoteFileEndpoint<T>) super.getEndpoint();
}
- protected RemoteFileOperations getOperations() {
- return (RemoteFileOperations) operations;
+ protected RemoteFileOperations<T> getOperations() {
+ return (RemoteFileOperations<T>) operations;
}
protected boolean prePollCheck() throws Exception {
@@ -152,7 +152,7 @@ public abstract class RemoteFileConsumer
* Returns human readable server information for logging purpose
*/
protected String remoteServer() {
- return ((RemoteFileEndpoint) endpoint).remoteServerInformation();
+ return ((RemoteFileEndpoint<?>) endpoint).remoteServerInformation();
}
@Override
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java Sun Jan 15 10:38:40 2012
@@ -29,10 +29,10 @@ public class RemoteFilePollingConsumerPo
@Override
public boolean rollback(Consumer consumer, Endpoint endpoint, int retryCounter, Exception e) throws Exception {
- RemoteFileConsumer rfc = (RemoteFileConsumer) consumer;
+ RemoteFileConsumer<?> rfc = (RemoteFileConsumer<?>) consumer;
// only try to recover if we are allowed to run
- if (((RemoteFileConsumer) consumer).isRunAllowed()) {
+ if (((RemoteFileConsumer<?>) consumer).isRunAllowed()) {
// disconnect from the server to force it to re login at next poll to recover
log.warn("Trying to recover by disconnecting from remote server forcing a re-connect at next poll: " + rfc.remoteServer());
try {
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java Sun Jan 15 10:38:40 2012
@@ -52,8 +52,8 @@ public class RemoteFileProducer<T> exten
ExchangeHelper.copyResults(exchange, remoteExchange);
}
- protected RemoteFileOperations getOperations() {
- return (RemoteFileOperations) operations;
+ protected RemoteFileOperations<T> getOperations() {
+ return (RemoteFileOperations<T>) operations;
}
@Override
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java Sun Jan 15 10:38:40 2012
@@ -35,8 +35,7 @@ public final class FtpProcessStrategyFac
private FtpProcessStrategyFactory() {
}
- @SuppressWarnings("unchecked")
- public static <FTPFile> GenericFileProcessStrategy<FTPFile> createGenericFileProcessStrategy(CamelContext context, Map<String, Object> params) {
+ public static GenericFileProcessStrategy<FTPFile> createGenericFileProcessStrategy(CamelContext context, Map<String, Object> params) {
// We assume a value is present only if its value not null for String and 'true' for boolean
Expression moveExpression = (Expression) params.get("move");
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java Sun Jan 15 10:38:40 2012
@@ -72,9 +72,9 @@ public class FromFtpRemoteFileSorterTest
}
// START SNIPPET: e1
- public class MyRemoteFileSorter implements Comparator<RemoteFile> {
+ public class MyRemoteFileSorter implements Comparator<RemoteFile<?>> {
- public int compare(RemoteFile o1, RemoteFile o2) {
+ public int compare(RemoteFile<?> o1, RemoteFile<?> o2) {
return o1.getFileNameOnly().compareToIgnoreCase(o2.getFileNameOnly());
}
}
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java Sun Jan 15 10:38:40 2012
@@ -47,14 +47,14 @@ public class FtpConsumerMultipleDirector
assertMockEndpointsSatisfied();
Exchange exchange = mock.getExchanges().get(0);
- RemoteFile file = (RemoteFile) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
+ RemoteFile<?> file = (RemoteFile<?>) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
assertNotNull(file);
assertDirectoryEquals("multidir/bye.txt", file.getAbsoluteFilePath());
assertDirectoryEquals("bye.txt", file.getRelativeFilePath());
assertEquals("bye.txt", file.getFileName());
exchange = mock.getExchanges().get(1);
- file = (RemoteFile) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
+ file = (RemoteFile<?>) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
assertNotNull(file);
assertDirectoryEquals("multidir/sub/hello.txt", file.getAbsoluteFilePath());
assertDirectoryEquals("sub/hello.txt", file.getRelativeFilePath());
@@ -62,7 +62,7 @@ public class FtpConsumerMultipleDirector
assertEquals("hello.txt", file.getFileNameOnly());
exchange = mock.getExchanges().get(2);
- file = (RemoteFile) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
+ file = (RemoteFile<?>) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
assertNotNull(file);
assertDirectoryEquals("multidir/sub/sub2/godday.txt", file.getAbsoluteFilePath());
assertDirectoryEquals("sub/sub2/godday.txt", file.getRelativeFilePath());
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java Sun Jan 15 10:38:40 2012
@@ -49,7 +49,7 @@ public class FtpConsumerWithNoFileOption
assertMockEndpointsSatisfied();
Exchange exchange = mock.getExchanges().get(0);
- RemoteFile file = (RemoteFile) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
+ RemoteFile<?> file = (RemoteFile<?>) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
assertNotNull(file);
assertEquals("hello.txt", file.getAbsoluteFilePath());
assertEquals("hello.txt", file.getRelativeFilePath());
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java Sun Jan 15 10:38:40 2012
@@ -18,6 +18,8 @@ package org.apache.camel.component.gae.a
import java.util.Map;
+import com.google.gdata.client.authn.oauth.GoogleOAuthParameters;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.component.gae.bind.OutboundBinding;
@@ -78,12 +80,11 @@ public class GAuthComponent extends Defa
}
@Override
- @SuppressWarnings("unchecked")
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
GAuthEndpoint endpoint = new GAuthEndpoint(uri, this, remaining);
- OutboundBinding authorizeBinding = resolveAndRemoveReferenceParameter(
+ OutboundBinding<GAuthEndpoint, GoogleOAuthParameters, GoogleOAuthParameters> authorizeBinding = resolveAndRemoveReferenceParameter(
parameters, "authorizeBindingRef", GAuthAuthorizeBinding.class, new GAuthAuthorizeBinding());
- OutboundBinding upgradeBinding = resolveAndRemoveReferenceParameter(
+ OutboundBinding<GAuthEndpoint, GoogleOAuthParameters, GoogleOAuthParameters> upgradeBinding = resolveAndRemoveReferenceParameter(
parameters, "upgradeBindingRef", GAuthUpgradeBinding.class, new GAuthUpgradeBinding());
GAuthService service = resolveAndRemoveReferenceParameter(
parameters, "serviceRef", GAuthService.class, new GAuthServiceImpl(endpoint));
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginComponent.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginComponent.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginComponent.java Sun Jan 15 10:38:40 2012
@@ -47,9 +47,8 @@ public class GLoginComponent extends Def
}
@Override
- @SuppressWarnings("unchecked")
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- OutboundBinding outboundBinding = resolveAndRemoveReferenceParameter(
+ OutboundBinding<GLoginEndpoint, GLoginData, GLoginData> outboundBinding = resolveAndRemoveReferenceParameter(
parameters, "outboundBindingRef", GLoginBinding.class, new GLoginBinding());
GLoginService service = resolveAndRemoveReferenceParameter(
parameters, "serviceRef", GLoginService.class, new GLoginServiceImpl());
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailComponent.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailComponent.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailComponent.java Sun Jan 15 10:38:40 2012
@@ -18,6 +18,8 @@ package org.apache.camel.component.gae.m
import java.util.Map;
+import com.google.appengine.api.mail.MailService.Message;
+
import org.apache.camel.Endpoint;
import org.apache.camel.component.gae.bind.OutboundBinding;
import org.apache.camel.impl.DefaultComponent;
@@ -32,7 +34,7 @@ public class GMailComponent extends Defa
@Override
@SuppressWarnings("unchecked")
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- OutboundBinding binding = resolveAndRemoveReferenceParameter(
+ OutboundBinding<GMailEndpoint, Message, Void> binding = resolveAndRemoveReferenceParameter(
parameters, "outboundBindingRef", OutboundBinding.class, new GMailBinding());
GMailEndpoint endpoint = new GMailEndpoint(uri, this, remaining);
endpoint.setOutboundBinding(binding);
Modified: camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java (original)
+++ camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java Sun Jan 15 10:38:40 2012
@@ -26,6 +26,9 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.io.IOUtils;
public class GHttpTestServlet extends HttpServlet {
+
+ private static final long serialVersionUID = 1L;
+
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
doPost(req, resp);
Modified: camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java (original)
+++ camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java Sun Jan 15 10:38:40 2012
@@ -65,10 +65,9 @@ public class GroovyExpression extends Ex
return null;
}
- @SuppressWarnings("unchecked")
@Override
- public Set entrySet() {
- return Collections.EMPTY_SET;
+ public Set<Entry<String, Object>> entrySet() {
+ return Collections.emptySet();
}
});
}
Modified: camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java (original)
+++ camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java Sun Jan 15 10:38:40 2012
@@ -31,6 +31,7 @@ import org.springframework.context.suppo
public class HazelcastMapProducerForSpringTest extends CamelSpringTestSupport implements Serializable {
+ private static final long serialVersionUID = 1L;
private IMap<String, Object> map;
@Override
Modified: camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java (original)
+++ camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java Sun Jan 15 10:38:40 2012
@@ -30,6 +30,7 @@ import org.junit.Test;
public class HazelcastMapProducerTest extends CamelTestSupport implements Serializable {
+ private static final long serialVersionUID = 1L;
private IMap<String, Object> map;
@Override
Modified: camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java (original)
+++ camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java Sun Jan 15 10:38:40 2012
@@ -38,7 +38,7 @@ public class JavaSpaceComponent extends
}
@Override
- protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
JavaSpaceEndpoint endpoint = new JavaSpaceEndpoint(uri, remaining, parameters, this);
endpoint.setExchangePattern(ExchangePattern.InOnly);
return endpoint;
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -192,7 +192,6 @@ public class JettyHttpProducer extends D
return httpExchange;
}
- @SuppressWarnings("unchecked")
private void doSetQueryParameters(Exchange exchange, JettyContentExchange httpExchange) throws URISyntaxException {
// is a query string provided in the endpoint URI or in a header (header
// overrules endpoint)
@@ -208,7 +207,7 @@ public class JettyHttpProducer extends D
// okay we need to add the query string to the URI so we need to juggle a bit with the parameters
String uri = httpExchange.getRequestURI();
- Map parameters = URISupport.parseParameters(new URI(uri));
+ Map<String, Object> parameters = URISupport.parseParameters(new URI(uri));
parameters.putAll(URISupport.parseQuery(queryString));
if (uri.contains("?")) {
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/MyCoolBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/MyCoolBean.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/MyCoolBean.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/MyCoolBean.java Sun Jan 15 10:38:40 2012
@@ -23,6 +23,7 @@ import java.io.Serializable;
*/
public class MyCoolBean implements Serializable {
+ private static final long serialVersionUID = 1L;
private final int id;
private final String name;
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java Sun Jan 15 10:38:40 2012
@@ -45,7 +45,7 @@ public class JettyHttpProducerQueryParam
assertNotNull(exchange);
String body = exchange.getOut().getBody(String.class);
- Map headers = exchange.getOut().getHeaders();
+ Map<?, ?> headers = exchange.getOut().getHeaders();
assertEquals("Bye World", body);
assertEquals("Carlsberg", headers.get("beer"));
@@ -69,7 +69,7 @@ public class JettyHttpProducerQueryParam
assertNotNull(exchange);
String body = exchange.getOut().getBody(String.class);
- Map headers = exchange.getOut().getHeaders();
+ Map<?, ?> headers = exchange.getOut().getHeaders();
assertEquals("Bye World", body);
assertEquals("Carlsberg", headers.get("beer"));
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/MyCoolBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/MyCoolBean.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/MyCoolBean.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/MyCoolBean.java Sun Jan 15 10:38:40 2012
@@ -23,6 +23,7 @@ import java.io.Serializable;
*/
public class MyCoolBean implements Serializable {
+ private static final long serialVersionUID = 1L;
private final int id;
private final String name;
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/MyAppException.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/MyAppException.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/MyAppException.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/MyAppException.java Sun Jan 15 10:38:40 2012
@@ -21,6 +21,7 @@ package org.apache.camel.component.jetty
*/
public class MyAppException extends Exception {
+ private static final long serialVersionUID = 1L;
private final String name;
public MyAppException(String msg, String name) {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java Sun Jan 15 10:38:40 2012
@@ -69,7 +69,7 @@ public class ConsumeJmsMapMessageTest ex
JmsMessage in = (JmsMessage) exchange.getIn();
assertNotNull(in);
- Map map = exchange.getIn().getBody(Map.class);
+ Map<?, ?> map = exchange.getIn().getBody(Map.class);
log.info("Received map: " + map);
assertNotNull("Should have received a map message!", map);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java Sun Jan 15 10:38:40 2012
@@ -115,6 +115,8 @@ public class ConsumeJmsObjectMessageTest
}
public static class MyUser implements Serializable {
+
+ private static final long serialVersionUID = 1L;
private String name;
public String getName() {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutBeanReturnNullTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutBeanReturnNullTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutBeanReturnNullTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutBeanReturnNullTest.java Sun Jan 15 10:38:40 2012
@@ -97,6 +97,7 @@ public class JmsInOutBeanReturnNullTest
public static final class MyBean implements Serializable {
+ private static final long serialVersionUID = 1L;
public String name;
public MyBean(String name) {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java Sun Jan 15 10:38:40 2012
@@ -213,6 +213,7 @@ public class JmsMessageTypeTest extends
public static final class MyFooBean implements TypeConverter, Serializable {
+ private static final long serialVersionUID = 1L;
private String name;
private MyFooBean() {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java Sun Jan 15 10:38:40 2012
@@ -44,7 +44,7 @@ public class JmsRouteDeliveryModePreserv
assertMockEndpointsSatisfied();
// should be persistent by default
- Map map = mock.getReceivedExchanges().get(0).getIn().getHeaders();
+ Map<String, Object> map = mock.getReceivedExchanges().get(0).getIn().getHeaders();
assertNotNull(map);
assertEquals(DeliveryMode.PERSISTENT, map.get("JMSDeliveryMode"));
}
@@ -59,7 +59,7 @@ public class JmsRouteDeliveryModePreserv
assertMockEndpointsSatisfied();
// should preserve non persistent
- Map map = mock.getReceivedExchanges().get(0).getIn().getHeaders();
+ Map<String, Object> map = mock.getReceivedExchanges().get(0).getIn().getHeaders();
assertNotNull(map);
assertEquals(DeliveryMode.NON_PERSISTENT, map.get("JMSDeliveryMode"));
}
@@ -74,7 +74,7 @@ public class JmsRouteDeliveryModePreserv
assertMockEndpointsSatisfied();
// should preserve non persistent
- Map map = mock.getReceivedExchanges().get(0).getIn().getHeaders();
+ Map<String, Object> map = mock.getReceivedExchanges().get(0).getIn().getHeaders();
assertNotNull(map);
assertEquals(DeliveryMode.NON_PERSISTENT, map.get("JMSDeliveryMode"));
}
@@ -89,7 +89,7 @@ public class JmsRouteDeliveryModePreserv
assertMockEndpointsSatisfied();
// should preserve persistent
- Map map = mock.getReceivedExchanges().get(0).getIn().getHeaders();
+ Map<String, Object> map = mock.getReceivedExchanges().get(0).getIn().getHeaders();
assertNotNull(map);
assertEquals(DeliveryMode.PERSISTENT, map.get("JMSDeliveryMode"));
}
@@ -104,7 +104,7 @@ public class JmsRouteDeliveryModePreserv
assertMockEndpointsSatisfied();
// should preserve persistent
- Map map = mock.getReceivedExchanges().get(0).getIn().getHeaders();
+ Map<String, Object> map = mock.getReceivedExchanges().get(0).getIn().getHeaders();
assertNotNull(map);
assertEquals(DeliveryMode.PERSISTENT, map.get("JMSDeliveryMode"));
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PurchaseOrder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PurchaseOrder.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PurchaseOrder.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PurchaseOrder.java Sun Jan 15 10:38:40 2012
@@ -24,6 +24,7 @@ import java.io.Serializable;
* @version
*/
public class PurchaseOrder implements Serializable {
+ private static final long serialVersionUID = 1L;
private String product;
private double amount;
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java Sun Jan 15 10:38:40 2012
@@ -49,7 +49,7 @@ public class JmsMessageBindTest extends
MyBean bean = getMandatoryBean(MyBean.class, "myBean");
assertEquals("body", "SomeBody", bean.getBody());
- Map beanHeaders = bean.getHeaders();
+ Map<?, ?> beanHeaders = bean.getHeaders();
assertNotNull("No headers!", beanHeaders);
assertEquals("foo header", "bar", beanHeaders.get("foo"));
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java Sun Jan 15 10:38:40 2012
@@ -27,13 +27,13 @@ import org.apache.camel.ProducerTemplate
* @version
*/
public class MyBean {
- private Map headers;
+ private Map<?, ?> headers;
private String body;
@EndpointInject(uri = "mock:result")
private ProducerTemplate producer;
@Consume(uri = "activemq:Test.BindingQueue")
- public void myMethod(@Headers Map headers, String body) {
+ public void myMethod(@Headers Map<?, ?> headers, String body) {
this.headers = headers;
this.body = body;
@@ -45,7 +45,7 @@ public class MyBean {
return body;
}
- public Map getHeaders() {
+ public Map<?, ?> getHeaders() {
return headers;
}
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java Sun Jan 15 10:38:40 2012
@@ -50,7 +50,7 @@ public class JmsDiscoveryTest extends Ca
// sleep a little
Thread.sleep(1000);
- Map<String, Map> map = new HashMap<String, Map>(registry.getServices());
+ Map<String, Map<?, ?>> map = new HashMap<String, Map<?, ?>>(registry.getServices());
assertTrue("There should be 1 or more, was: " + map.size(), map.size() >= 1);
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyRegistry.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyRegistry.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyRegistry.java Sun Jan 15 10:38:40 2012
@@ -30,15 +30,15 @@ import org.slf4j.LoggerFactory;
public class MyRegistry {
private static final transient Logger LOG = LoggerFactory.getLogger(MyRegistry.class);
- private Map<String, Map> services = new HashMap<String, Map>();
+ private Map<String, Map<String, Object>> services = new HashMap<String, Map<String, Object>>();
- public void onEvent(Map heartbeat) {
+ public void onEvent(Map<String, Object> heartbeat) {
String key = (String) heartbeat.get("name");
LOG.debug(">>> event for: " + key + " details: " + heartbeat);
services.put(key, heartbeat);
}
- public Map<String, Map> getServices() {
+ public Map<String, Map<String, Object>> getServices() {
return services;
}
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyService.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyService.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyService.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyService.java Sun Jan 15 10:38:40 2012
@@ -30,7 +30,7 @@ public class MyService {
this.name = name;
}
- public Map status() {
+ public Map<String, Object> status() {
Map<String, Object> answer = new HashMap<String, Object>();
answer.put("name", name);
answer.put("time", new Date().getTime());
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DummyOrder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DummyOrder.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DummyOrder.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DummyOrder.java Sun Jan 15 10:38:40 2012
@@ -23,6 +23,7 @@ import java.io.Serializable;
*/
public class DummyOrder implements Serializable {
+ private static final long serialVersionUID = 1L;
private long orderId;
private long itemId;
private int quantity;
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java Sun Jan 15 10:38:40 2012
@@ -65,7 +65,7 @@ public class JmsGetHeaderKeyFormatIssueT
from(uri)
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- Map headers = exchange.getIn().getHeaders();
+ Map<String, Object> headers = exchange.getIn().getHeaders();
assertEquals("VALUE_1", headers.get("HEADER_1"));
assertEquals("VALUE_1", exchange.getIn().getHeader("HEADER_1"));
}
@@ -73,7 +73,7 @@ public class JmsGetHeaderKeyFormatIssueT
.setHeader("HEADER_1", constant("VALUE_2"))
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- Map headers = exchange.getIn().getHeaders();
+ Map<String, Object> headers = exchange.getIn().getHeaders();
assertEquals("VALUE_2", headers.get("HEADER_1"));
assertEquals("VALUE_2", exchange.getIn().getHeader("HEADER_1"));
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyEndUserIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyEndUserIssueTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyEndUserIssueTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyEndUserIssueTest.java Sun Jan 15 10:38:40 2012
@@ -65,7 +65,7 @@ public class JmsPassThroughtJmsKeyFormat
from(uri)
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- Map headers = exchange.getIn().getHeaders();
+ Map<String, Object> headers = exchange.getIn().getHeaders();
assertEquals("VALUE_1", headers.get("HEADER_1"));
assertEquals("VALUE_1", exchange.getIn().getHeader("HEADER_1"));
}
@@ -73,7 +73,7 @@ public class JmsPassThroughtJmsKeyFormat
.setHeader("HEADER_1", constant("VALUE_2"))
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- Map headers = exchange.getIn().getHeaders();
+ Map<String, Object> headers = exchange.getIn().getHeaders();
assertEquals("VALUE_2", headers.get("HEADER_1"));
assertEquals("VALUE_2", exchange.getIn().getHeader("HEADER_1"));
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyTest.java Sun Jan 15 10:38:40 2012
@@ -72,7 +72,7 @@ public class JmsPassThroughtJmsKeyFormat
from(uri)
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- Map headers = exchange.getIn().getHeaders();
+ Map<String, Object> headers = exchange.getIn().getHeaders();
assertEquals("VALUE_1", headers.get("HEADER_1"));
assertEquals("VALUE_1", exchange.getIn().getHeader("HEADER_1"));
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyUsingJmsConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyUsingJmsConfigurationTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyUsingJmsConfigurationTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyUsingJmsConfigurationTest.java Sun Jan 15 10:38:40 2012
@@ -81,7 +81,7 @@ public class JmsPassThroughtJmsKeyFormat
from(uri)
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- Map headers = exchange.getIn().getHeaders();
+ Map<String, Object> headers = exchange.getIn().getHeaders();
assertEquals("VALUE_1", headers.get("HEADER_1"));
assertEquals("VALUE_1", exchange.getIn().getHeader("HEADER_1"));
}
@@ -90,7 +90,7 @@ public class JmsPassThroughtJmsKeyFormat
.setHeader("HEADER_2", constant("VALUE_2"))
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- Map headers = exchange.getIn().getHeaders();
+ Map<String, Object> headers = exchange.getIn().getHeaders();
assertEquals("START", headers.get("HEADER_3"));
assertEquals("START", exchange.getIn().getHeader("HEADER_3"));
}
Modified: camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java (original)
+++ camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java Sun Jan 15 10:38:40 2012
@@ -54,12 +54,12 @@ public class SqlBuilder implements Expre
}
public boolean matches(Exchange exchange) {
- List list = evaluateQuery(exchange);
+ List<?> list = evaluateQuery(exchange);
return matches(exchange, list);
}
public void assertMatches(String text, Exchange exchange) throws AssertionError {
- List list = evaluateQuery(exchange);
+ List<?> list = evaluateQuery(exchange);
if (!matches(exchange, list)) {
throw new AssertionError(this + " failed on " + exchange + " as found " + list);
}
@@ -101,14 +101,14 @@ public class SqlBuilder implements Expre
// Implementation methods
// -----------------------------------------------------------------------
- protected boolean matches(Exchange exchange, List list) {
+ protected boolean matches(Exchange exchange, List<?> list) {
return ObjectHelper.matches(list);
}
- protected List evaluateQuery(Exchange exchange) {
+ protected List<?> evaluateQuery(Exchange exchange) {
configureQuery(exchange);
Message in = exchange.getIn();
- List list = in.getBody(List.class);
+ List<?> list = in.getBody(List.class);
if (list == null) {
list = Collections.singletonList(in.getBody());
}
Modified: camel/trunk/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java (original)
+++ camel/trunk/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java Sun Jan 15 10:38:40 2012
@@ -33,35 +33,29 @@ import static org.apache.camel.builder.s
*/
public class SqlTest extends CamelTestSupport {
- //protected CamelContext context = new DefaultCamelContext();
protected Exchange exchange;
@Test
public void testExpression() throws Exception {
Expression expression = sql("SELECT * FROM org.apache.camel.builder.sql.Person where city = 'London'");
- List value = expression.evaluate(exchange, List.class);
+ List<?> value = expression.evaluate(exchange, List.class);
+ assertEquals("List size", 2, value.size());
- List list = value;
- assertEquals("List size", 2, list.size());
-
- for (Object person : list) {
+ for (Object person : value) {
log.info("Found: " + person);
}
}
- @SuppressWarnings("unchecked")
@Test
public void testExpressionWithHeaderVariable() throws Exception {
Expression expression = sql("SELECT * FROM org.apache.camel.builder.sql.Person where name = :fooHeader");
- List value = expression.evaluate(exchange, List.class);
-
- List<Person> list = value;
- assertEquals("List size", 1, list.size());
+ List<?> value = expression.evaluate(exchange, List.class);
+ assertEquals("List size", 1, value.size());
- for (Person person : list) {
+ for (Object person : value) {
log.info("Found: " + person);
- assertEquals("name", "James", person.getName());
+ assertEquals("name", "James", ((Person)person).getName());
}
}
Modified: camel/trunk/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java (original)
+++ camel/trunk/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java Sun Jan 15 10:38:40 2012
@@ -34,31 +34,26 @@ public class SqlLanguageTest extends Sql
Language language = assertResolveLanguage(getLanguageName());
Expression expression = language.createExpression("SELECT * FROM org.apache.camel.builder.sql.Person where city = 'London'");
- List value = expression.evaluate(exchange, List.class);
+ List<?> value = expression.evaluate(exchange, List.class);
+ assertEquals("List size", 2, value.size());
- List list = value;
- assertEquals("List size", 2, list.size());
-
- for (Object person : list) {
+ for (Object person : value) {
log.info("Found: " + person);
}
}
- @SuppressWarnings("unchecked")
@Test
public void testExpressionWithHeaderVariable() throws Exception {
Language language = assertResolveLanguage(getLanguageName());
Expression expression = language.createExpression("SELECT * FROM org.apache.camel.builder.sql.Person where name = :fooHeader");
- List value = expression.evaluate(exchange, List.class);
-
- List<Person> list = value;
- assertEquals("List size", 1, list.size());
+ List<?> value = expression.evaluate(exchange, List.class);
+ assertEquals("List size", 1, value.size());
- for (Person person : list) {
+ for (Object person : value) {
log.info("Found: " + person);
- assertEquals("name", "James", person.getName());
+ assertEquals("name", "James", ((Person) person).getName());
}
}
Modified: camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelComponent.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelComponent.java (original)
+++ camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelComponent.java Sun Jan 15 10:38:40 2012
@@ -80,8 +80,7 @@ public class KestrelComponent extends De
this.configuration = configuration;
}
- @SuppressWarnings("unchecked")
- protected KestrelEndpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
+ protected KestrelEndpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
// Copy the configuration as each endpoint can override defaults
KestrelConfiguration config = getConfiguration().copy();
Modified: camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java (original)
+++ camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java Sun Jan 15 10:38:40 2012
@@ -40,7 +40,6 @@ import org.jboss.netty.util.CharsetUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@SuppressWarnings("unchecked")
public class NettyConfiguration implements Cloneable {
private static final transient Logger LOG = LoggerFactory.getLogger(NettyConfiguration.class);
@@ -469,10 +468,10 @@ public class NettyConfiguration implemen
return host + ":" + port;
}
- private <T> void addToHandlersList(List configured, List handlers, Class<? extends T> handlerType) {
+ private <T> void addToHandlersList(List<T> configured, List<T> handlers, Class<T> handlerType) {
if (handlers != null) {
for (int x = 0; x < handlers.size(); x++) {
- Object handler = handlers.get(x);
+ T handler = handlers.get(x);
if (handlerType.isInstance(handler)) {
configured.add(handler);
}
Modified: camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java (original)
+++ camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java Sun Jan 15 10:38:40 2012
@@ -65,7 +65,7 @@ public class PrinterConfiguration {
path = ObjectHelper.removeStartingCharacters(path, '\\');
setPrintername(path);
- Map printSettings = URISupport.parseParameters(uri);
+ Map<String, Object> printSettings = URISupport.parseParameters(uri);
setFlavor((String)printSettings.get("flavor"));
setMimeType((String)printSettings.get("mimeType"));
setDocFlavor(assignDocFlavor(flavor, mimeType));
Modified: camel/trunk/components/camel-ruby/src/main/java/org/apache/camel/ruby/ScriptRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ruby/src/main/java/org/apache/camel/ruby/ScriptRouteBuilder.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-ruby/src/main/java/org/apache/camel/ruby/ScriptRouteBuilder.java (original)
+++ camel/trunk/components/camel-ruby/src/main/java/org/apache/camel/ruby/ScriptRouteBuilder.java Sun Jan 15 10:38:40 2012
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
*/
public abstract class ScriptRouteBuilder extends RouteBuilder {
private static final transient Logger LOG = LoggerFactory.getLogger(ScriptRouteBuilder.class);
- protected ProcessorDefinition node;
+ protected ProcessorDefinition<?> node;
public ScriptRouteBuilder() {
}
@@ -47,24 +47,24 @@ public abstract class ScriptRouteBuilder
this.node = route;
}
- public ProcessorDefinition to(String uri) {
+ public ProcessorDefinition<?> to(String uri) {
return getNode().to(uri);
}
- public ProcessorDefinition to(Endpoint endpoint) {
+ public ProcessorDefinition<?> to(Endpoint endpoint) {
return getNode().to(endpoint);
}
- public ProcessorDefinition getNode() {
+ public ProcessorDefinition<?> getNode() {
if (node == null) {
throw new IllegalStateException("You must define a route first via the from() method");
}
return node;
}
- public void setNode(ProcessorDefinition node) {
+ public void setNode(ProcessorDefinition<?> node) {
this.node = node;
- LOG.info("Node is now: " + node);
+ LOG.info("Node is now: {}", node);
}
}
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -111,7 +111,6 @@ public abstract class XQueryBuilder impl
return exchange.getContext().getTypeConverter().convertTo(type, result);
}
- @SuppressWarnings("unchecked")
public Object evaluate(Exchange exchange) {
try {
LOG.debug("Evaluation: {} for exchange: {}", expression, exchange);
@@ -147,7 +146,7 @@ public abstract class XQueryBuilder impl
}
}
- public List evaluateAsList(Exchange exchange) throws Exception {
+ public List<?> evaluateAsList(Exchange exchange) throws Exception {
initialize(exchange);
return getExpression().evaluate(createDynamicContext(exchange));
@@ -205,7 +204,7 @@ public abstract class XQueryBuilder impl
public boolean matches(Exchange exchange) {
try {
- List list = evaluateAsList(exchange);
+ List<?> list = evaluateAsList(exchange);
return matches(exchange, list);
} catch (Exception e) {
throw new RuntimeExpressionException(e);
@@ -213,7 +212,7 @@ public abstract class XQueryBuilder impl
}
public void assertMatches(String text, Exchange exchange) throws AssertionError {
- List list;
+ List<?> list;
try {
list = evaluateAsList(exchange);
@@ -597,7 +596,7 @@ public abstract class XQueryBuilder impl
}
}
- protected boolean matches(Exchange exchange, List results) {
+ protected boolean matches(Exchange exchange, List<?> results) {
return ObjectHelper.matches(results);
}
Modified: camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpComponent.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpComponent.java (original)
+++ camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpComponent.java Sun Jan 15 10:38:40 2012
@@ -28,8 +28,7 @@ import org.apache.camel.impl.DefaultComp
public class SnmpComponent extends DefaultComponent {
@Override
- @SuppressWarnings("unchecked")
- protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
SnmpEndpoint endpoint = new SnmpEndpoint(uri, this);
setProperties(endpoint, parameters);
endpoint.initiate();
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -104,7 +104,7 @@ public class SolrUpdateTest extends Solr
assertEquals(1, response.getResults().getNumFound());
SolrDocument doc = response.getResults().get(0);
- assertArrayEquals(categories, ((List) doc.getFieldValue("cat")).toArray());
+ assertArrayEquals(categories, ((List<?>) doc.getFieldValue("cat")).toArray());
}
@Test
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java Sun Jan 15 10:38:40 2012
@@ -130,7 +130,7 @@ public class SpringIntegrationConsumer
}
// put the message back the outputChannel if we need
- org.springframework.integration.Message siOutMessage =
+ org.springframework.integration.Message<?> siOutMessage =
SpringIntegrationBinding.storeToSpringIntegrationMessage(exchange.getOut());
// send the message to spring integration
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java Sun Jan 15 10:38:40 2012
@@ -27,20 +27,20 @@ import org.apache.camel.impl.DefaultMess
* @version
*/
public class SpringIntegrationMessage extends DefaultMessage {
- private org.springframework.integration.Message siMessage;
+ private org.springframework.integration.Message<?> siMessage;
public SpringIntegrationMessage() {
}
- public SpringIntegrationMessage(org.springframework.integration.Message message) {
+ public SpringIntegrationMessage(org.springframework.integration.Message<?> message) {
this.siMessage = message;
}
- public void setMessage(org.springframework.integration.Message message) {
+ public void setMessage(org.springframework.integration.Message<?> message) {
this.siMessage = message;
}
- public org.springframework.integration.Message getMessage() {
+ public org.springframework.integration.Message<?> getMessage() {
return siMessage;
}
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java Sun Jan 15 10:38:40 2012
@@ -100,7 +100,7 @@ public class SpringIntegrationProducer e
}
});
}
- org.springframework.integration.Message siOutmessage = SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
+ org.springframework.integration.Message<?> siOutmessage = SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
// send the message to spring integration
log.debug("Sending {} to OutputChannel: {}", siOutmessage, outputChannel);
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java Sun Jan 15 10:38:40 2012
@@ -62,7 +62,7 @@ public class CamelSourceAdapter extends
protected class ConsumerProcessor implements Processor {
public void process(final Exchange exchange) throws Exception {
- org.springframework.integration.Message request = SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
+ org.springframework.integration.Message<?> request = SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
if (exchange.getPattern().isOutCapable()) {
exchange.getIn().getHeaders().put(MessageHeaders.REPLY_CHANNEL , replyChannel);
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java Sun Jan 15 10:38:40 2012
@@ -77,7 +77,7 @@ public class CamelTargetAdapter extends
result = true;
}
- Message response;
+ Message<?> response;
if (isExpectReply()) {
//Check the message header for the return address
response = SpringIntegrationBinding.storeToSpringIntegrationMessage(outExchange.getOut());
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java Sun Jan 15 10:38:40 2012
@@ -46,7 +46,7 @@ public class CamelTargetAdapterTest exte
public void testSendingTwoWayMessage() throws Exception {
MessageChannel requestChannel = applicationContext.getBean("channelB", MessageChannel.class);
- Message message = new GenericMessage<Object>(MESSAGE_BODY);
+ Message<?> message = new GenericMessage<Object>(MESSAGE_BODY);
//Need to subscribe the responseChannel first
DirectChannel responseChannel = (DirectChannel) applicationContext.getBean("channelC");
responseChannel.subscribe(new MessageHandler() {
Modified: camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java (original)
+++ camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java Sun Jan 15 10:38:40 2012
@@ -31,7 +31,7 @@ import org.springframework.context.suppo
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
public class SpringSecurityAuthorizationPolicyTest extends CamelSpringTestSupport {
@@ -90,7 +90,7 @@ public class SpringSecurityAuthorization
if (roles != null && roles.length > 0) {
List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(roles.length);
for (String role : roles) {
- authorities.add(new GrantedAuthorityImpl(role));
+ authorities.add(new SimpleGrantedAuthority(role));
}
authToken = new UsernamePasswordAuthenticationToken(username, password, authorities);
} else {
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java Sun Jan 15 10:38:40 2012
@@ -46,10 +46,9 @@ public class ContextScanRouteBuilderFind
* Appends all the {@link org.apache.camel.builder.RouteBuilder} instances that can be found in the context
*/
public void appendBuilders(List<RoutesBuilder> list) {
- Map beans = applicationContext.getBeansOfType(RoutesBuilder.class, true, true);
+ Map<String, RoutesBuilder> beans = applicationContext.getBeansOfType(RoutesBuilder.class, true, true);
- for (Object object : beans.entrySet()) {
- Entry entry = (Entry) object;
+ for (Entry<String, RoutesBuilder> entry : beans.entrySet()) {
Object bean = entry.getValue();
Object key = entry.getKey();
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/DummyEvent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/DummyEvent.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/DummyEvent.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/DummyEvent.java Sun Jan 15 10:38:40 2012
@@ -22,6 +22,7 @@ import org.springframework.context.Appli
* @version
*/
public class DummyEvent extends ApplicationEvent {
+ private static final long serialVersionUID = 1L;
private final String text;
public DummyEvent(Object source, String text) {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java Sun Jan 15 10:38:40 2012
@@ -33,7 +33,7 @@ public class ContainerWideInterceptor im
private static final transient Logger LOG = LoggerFactory.getLogger(ContainerWideInterceptor.class);
private static int count;
- public Processor wrapProcessorInInterceptors(final CamelContext context, final ProcessorDefinition definition,
+ public Processor wrapProcessorInInterceptors(final CamelContext context, final ProcessorDefinition<?> definition,
final Processor target, final Processor nextTarget) throws Exception {
// as this is based on an unit test we are a bit lazy and just create an inlined processor
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderFailedException.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderFailedException.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderFailedException.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderFailedException.java Sun Jan 15 10:38:40 2012
@@ -21,6 +21,8 @@ package org.apache.camel.spring.processo
*/
public class OrderFailedException extends Exception {
+ private static final long serialVersionUID = 1L;
+
public OrderFailedException(String message) {
super(message);
}
Modified: camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java (original)
+++ camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java Sun Jan 15 10:38:40 2012
@@ -63,13 +63,13 @@ public class StreamGroupLinesTest extend
assertMockEndpointsSatisfied();
- List list = mock.getExchanges().get(0).getIn().getBody(List.class);
+ List<?> list = mock.getExchanges().get(0).getIn().getBody(List.class);
assertEquals(3, list.size());
assertEquals("A", list.get(0));
assertEquals("B", list.get(1));
assertEquals("C", list.get(2));
- List list2 = mock.getExchanges().get(1).getIn().getBody(List.class);
+ List<?> list2 = mock.getExchanges().get(1).getIn().getBody(List.class);
assertEquals(3, list2.size());
assertEquals("D", list2.get(0));
assertEquals("E", list2.get(1));
Modified: camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java (original)
+++ camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java Sun Jan 15 10:38:40 2012
@@ -37,7 +37,7 @@ public class DebugJUnit4Test extends Cam
@Override
protected void debugBefore(Exchange exchange, Processor processor,
- ProcessorDefinition definition, String id, String shortName) {
+ ProcessorDefinition<?> definition, String id, String shortName) {
// this method is invoked before we are about to enter the given processor
// from your Java editor you can just add a breakpoint in the code line below
log.info("Before " + definition + " with body " + exchange.getIn().getBody());
Modified: camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java (original)
+++ camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java Sun Jan 15 10:38:40 2012
@@ -43,7 +43,7 @@ public class DebugNoLazyTypeConverterTes
@Override
protected void debugBefore(Exchange exchange, Processor processor,
- ProcessorDefinition definition, String id, String shortName) {
+ ProcessorDefinition<?> definition, String id, String shortName) {
// this method is invoked before we are about to enter the given processor
// from your Java editor you can just add a breakpoint in the code line below
log.info("Before " + definition + " with body " + exchange.getIn().getBody());
Modified: camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java (original)
+++ camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java Sun Jan 15 10:38:40 2012
@@ -36,7 +36,7 @@ public class DebugSpringTest extends Cam
@Override
protected void debugBefore(Exchange exchange, Processor processor,
- ProcessorDefinition definition, String id, String shortName) {
+ ProcessorDefinition<?> definition, String id, String shortName) {
// this method is invoked before we are about to enter the given processor
// from your Java editor you can just add a breakpoint in the code line below
log.info("Before " + definition + " with body " + exchange.getIn().getBody());
Modified: camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java (original)
+++ camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java Sun Jan 15 10:38:40 2012
@@ -38,7 +38,7 @@ public class DebugTest extends CamelTest
@Override
protected void debugBefore(Exchange exchange, Processor processor,
- ProcessorDefinition definition, String id, String shortName) {
+ ProcessorDefinition<?> definition, String id, String shortName) {
// this method is invoked before we are about to enter the given processor
// from your Java editor you can just add a breakpoint in the code line below
log.info("Before " + definition + " with body " + exchange.getIn().getBody());
Modified: camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java (original)
+++ camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java Sun Jan 15 10:38:40 2012
@@ -41,7 +41,7 @@ public class DebugNoLazyTypeConverterTes
@Override
protected void debugBefore(Exchange exchange, Processor processor,
- ProcessorDefinition definition, String id, String shortName) {
+ ProcessorDefinition<?> definition, String id, String shortName) {
// this method is invoked before we are about to enter the given processor
// from your Java editor you can just add a breakpoint in the code line below
log.info("Before " + definition + " with body " + exchange.getIn().getBody());
Modified: camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java (original)
+++ camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java Sun Jan 15 10:38:40 2012
@@ -38,7 +38,7 @@ public class DebugSpringTest extends Cam
@Override
protected void debugBefore(Exchange exchange, Processor processor,
- ProcessorDefinition definition, String id, String shortName) {
+ ProcessorDefinition<?> definition, String id, String shortName) {
// this method is invoked before we are about to enter the given processor
// from your Java editor you can just add a breakpoint in the code line below
log.info("Before " + definition + " with body " + exchange.getIn().getBody());
Modified: camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java (original)
+++ camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java Sun Jan 15 10:38:40 2012
@@ -36,7 +36,7 @@ public class DebugTest extends CamelTest
@Override
protected void debugBefore(Exchange exchange, Processor processor,
- ProcessorDefinition definition, String id, String shortName) {
+ ProcessorDefinition<?> definition, String id, String shortName) {
// this method is invoked before we are about to enter the given processor
// from your Java editor you can just add a breakpoint in the code line below
log.info("Before " + definition + " with body " + exchange.getIn().getBody());