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 2008/11/10 22:43:21 UTC
svn commit: r712844 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/processor/
camel-core/src/test/java/org/apache/camel/ camel-core/src/te...
Author: hadrian
Date: Mon Nov 10 13:43:20 2008
New Revision: 712844
URL: http://svn.apache.org/viewvc?rev=712844&view=rev
Log:
CAMEL-872. Remove generics on ProducerTemplate and ProducerCache. Part 9 of 12.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Camel715ThreadProcessorTest.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
activemq/camel/trunk/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapTestSupport.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java Mon Nov 10 13:43:20 2008
@@ -291,7 +291,7 @@
*
* @return the template
*/
- <E extends Exchange> ProducerTemplate<E> createProducerTemplate();
+ ProducerTemplate createProducerTemplate();
/**
* Adds the given interceptor strategy
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java Mon Nov 10 13:43:20 2008
@@ -38,7 +38,7 @@
*
* @version $Revision$
*/
-public interface ProducerTemplate<E extends Exchange> extends Service {
+public interface ProducerTemplate extends Service {
/**
* Sends the exchange to the default endpoint
@@ -46,7 +46,7 @@
* @param exchange the exchange to send
* @return the returned exchange
*/
- E send(E exchange);
+ Exchange send(Exchange exchange);
/**
* Sends an exchange to the default endpoint using a supplied
@@ -55,7 +55,7 @@
* {@link Processor} to populate the exchange
* @return the returned exchange
*/
- E send(Processor processor);
+ Exchange send(Processor processor);
/**
* Sends the body to the default endpoint and returns the result content
@@ -96,7 +96,7 @@
* @param exchange the exchange to send
* @return the returned exchange
*/
- E send(String endpointUri, E exchange);
+ Exchange send(String endpointUri, Exchange exchange);
/**
* Sends an exchange to an endpoint using a supplied processor
@@ -106,7 +106,7 @@
* {@link Processor} to populate the exchange
* @return the returned exchange
*/
- E send(String endpointUri, Processor processor);
+ Exchange send(String endpointUri, Processor processor);
/**
* Sends an exchange to an endpoint using a supplied processor
@@ -118,7 +118,7 @@
* {@link Processor} to populate the exchange
* @return the returned exchange
*/
- E send(String endpointUri, ExchangePattern pattern, Processor processor);
+ Exchange send(String endpointUri, ExchangePattern pattern, Processor processor);
/**
* Sends an exchange to an endpoint using a supplied processor
@@ -129,7 +129,7 @@
* @param callback the callback will be called when the exchange is completed.
* @return the returned exchange
*/
- E send(String endpointUri, Processor processor, AsyncCallback callback);
+ Exchange send(String endpointUri, Processor processor, AsyncCallback callback);
/**
* Sends the exchange to the given endpoint
@@ -138,7 +138,7 @@
* @param exchange the exchange to send
* @return the returned exchange
*/
- E send(Endpoint<E> endpoint, E exchange);
+ Exchange send(Endpoint endpoint, Exchange exchange);
/**
* Sends an exchange to an endpoint using a supplied processor
@@ -148,7 +148,7 @@
* {@link Processor} to populate the exchange
* @return the returned exchange
*/
- E send(Endpoint<E> endpoint, Processor processor);
+ Exchange send(Endpoint endpoint, Processor processor);
/**
* Sends an exchange to an endpoint using a supplied processor
@@ -160,7 +160,7 @@
* {@link Processor} to populate the exchange
* @return the returned exchange
*/
- E send(Endpoint<E> endpoint, ExchangePattern pattern, Processor processor);
+ Exchange send(Endpoint endpoint, ExchangePattern pattern, Processor processor);
/**
* Sends an exchange to an endpoint using a supplied processor
@@ -171,7 +171,7 @@
* @param callback the callback will be called when the exchange is completed.
* @return the returned exchange
*/
- E send(Endpoint<E> endpoint, Processor processor, AsyncCallback callback);
+ Exchange send(Endpoint endpoint, Processor processor, AsyncCallback callback);
/**
* Send the body to an endpoint returning any result output body
@@ -180,7 +180,7 @@
* @param body the payload
* @return the result (see class javadoc)
*/
- Object sendBody(Endpoint<E> endpoint, Object body);
+ Object sendBody(Endpoint endpoint, Object body);
/**
* Send the body to an endpoint returning any result output body
@@ -201,7 +201,7 @@
* {@link ExchangePattern#InOnly} or {@link ExchangePattern#InOut}
* @return the result (see class javadoc)
*/
- Object sendBody(Endpoint<E> endpoint, ExchangePattern pattern, Object body);
+ Object sendBody(Endpoint endpoint, ExchangePattern pattern, Object body);
/**
* Send the body to an endpoint returning any result output body
@@ -300,7 +300,7 @@
* @param processor the processor which will populate the exchange before sending
* @return the result (see class javadoc)
*/
- E request(Endpoint<E> endpoint, Processor processor);
+ Exchange request(Endpoint endpoint, Processor processor);
/**
* Send the body to an endpoint returning any result output body.
@@ -310,7 +310,7 @@
* @param body the payload
* @return the result (see class javadoc)
*/
- Object requestBody(Endpoint<E> endpoint, Object body);
+ Object requestBody(Endpoint endpoint, Object body);
/**
* Send the body to an endpoint returning any result output body.
@@ -322,7 +322,7 @@
* @param headerValue the header value
* @return the result (see class javadoc)
*/
- Object requestBodyAndHeader(Endpoint<E> endpoint, Object body, String header, Object headerValue);
+ Object requestBodyAndHeader(Endpoint endpoint, Object body, String header, Object headerValue);
/**
* Send the body to an endpoint returning any result output body.
@@ -332,7 +332,7 @@
* @param processor the processor which will populate the exchange before sending
* @return the result (see class javadoc)
*/
- E request(String endpointUri, Processor processor);
+ Exchange request(String endpointUri, Processor processor);
/**
* Send the body to an endpoint returning any result output body.
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Mon Nov 10 13:43:20 2008
@@ -581,8 +581,8 @@
this.delay = delay;
}
- public <E extends Exchange> ProducerTemplate<E> createProducerTemplate() {
- return new DefaultProducerTemplate<E>(this);
+ public ProducerTemplate createProducerTemplate() {
+ return new DefaultProducerTemplate(this);
}
public ErrorHandlerBuilder getErrorHandlerBuilder() {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java Mon Nov 10 13:43:20 2008
@@ -41,12 +41,12 @@
*
* @version $Revision$
*/
-public class DefaultProducerTemplate<E extends Exchange> extends ServiceSupport implements ProducerTemplate<E> {
+public class DefaultProducerTemplate extends ServiceSupport implements ProducerTemplate {
private CamelContext context;
- private final ProducerCache<E> producerCache = new ProducerCache<E>();
+ private final ProducerCache producerCache = new ProducerCache();
private boolean useEndpointCache = true;
- private final Map<String, Endpoint<E>> endpointCache = new HashMap<String, Endpoint<E>>();
- private Endpoint<E> defaultEndpoint;
+ private final Map<String, Endpoint> endpointCache = new HashMap<String, Endpoint>();
+ private Endpoint defaultEndpoint;
public DefaultProducerTemplate(CamelContext context) {
this.context = context;
@@ -62,51 +62,51 @@
return new DefaultProducerTemplate(camelContext, endpoint);
}
- public E send(String endpointUri, E exchange) {
+ public Exchange send(String endpointUri, Exchange exchange) {
Endpoint endpoint = resolveMandatoryEndpoint(endpointUri);
return send(endpoint, exchange);
}
- public E send(String endpointUri, Processor processor) {
+ public Exchange send(String endpointUri, Processor processor) {
Endpoint endpoint = resolveMandatoryEndpoint(endpointUri);
return send(endpoint, processor);
}
- public E send(String endpointUri, Processor processor, AsyncCallback callback) {
+ public Exchange send(String endpointUri, Processor processor, AsyncCallback callback) {
Endpoint endpoint = resolveMandatoryEndpoint(endpointUri);
return send(endpoint, processor, callback);
}
- public E send(String endpointUri, ExchangePattern pattern, Processor processor) {
+ public Exchange send(String endpointUri, ExchangePattern pattern, Processor processor) {
Endpoint endpoint = resolveMandatoryEndpoint(endpointUri);
return send(endpoint, pattern, processor);
}
- public E send(Endpoint<E> endpoint, E exchange) {
- E convertedExchange = exchange;
+ public Exchange send(Endpoint endpoint, Exchange exchange) {
+ Exchange convertedExchange = exchange;
producerCache.send(endpoint, convertedExchange);
return convertedExchange;
}
- public E send(Endpoint<E> endpoint, Processor processor) {
+ public Exchange send(Endpoint endpoint, Processor processor) {
return producerCache.send(endpoint, processor);
}
- public E send(Endpoint<E> endpoint, Processor processor, AsyncCallback callback) {
+ public Exchange send(Endpoint endpoint, Processor processor, AsyncCallback callback) {
return producerCache.send(endpoint, processor, callback);
}
- public E send(Endpoint<E> endpoint, ExchangePattern pattern, Processor processor) {
+ public Exchange send(Endpoint endpoint, ExchangePattern pattern, Processor processor) {
return producerCache.send(endpoint, pattern, processor);
}
- public Object sendBody(Endpoint<E> endpoint, ExchangePattern pattern, Object body) {
- E result = send(endpoint, pattern, createSetBodyProcessor(body));
+ public Object sendBody(Endpoint endpoint, ExchangePattern pattern, Object body) {
+ Exchange result = send(endpoint, pattern, createSetBodyProcessor(body));
return extractResultBody(result, pattern);
}
- public Object sendBody(Endpoint<E> endpoint, Object body) {
- E result = send(endpoint, createSetBodyProcessor(body));
+ public Object sendBody(Endpoint endpoint, Object body) {
+ Exchange result = send(endpoint, createSetBodyProcessor(body));
return extractResultBody(result);
}
@@ -127,19 +127,19 @@
public Object sendBodyAndHeader(Endpoint endpoint, final Object body, final String header,
final Object headerValue) {
- E result = send(endpoint, createBodyAndHeaderProcessor(body, header, headerValue));
+ Exchange result = send(endpoint, createBodyAndHeaderProcessor(body, header, headerValue));
return extractResultBody(result);
}
public Object sendBodyAndHeader(Endpoint endpoint, ExchangePattern pattern, final Object body, final String header,
final Object headerValue) {
- E result = send(endpoint, pattern, createBodyAndHeaderProcessor(body, header, headerValue));
+ Exchange result = send(endpoint, pattern, createBodyAndHeaderProcessor(body, header, headerValue));
return extractResultBody(result, pattern);
}
public Object sendBodyAndHeader(String endpoint, ExchangePattern pattern, final Object body, final String header,
final Object headerValue) {
- E result = send(endpoint, pattern, createBodyAndHeaderProcessor(body, header, headerValue));
+ Exchange result = send(endpoint, pattern, createBodyAndHeaderProcessor(body, header, headerValue));
return extractResultBody(result, pattern);
}
@@ -148,7 +148,7 @@
}
public Object sendBodyAndHeaders(Endpoint endpoint, final Object body, final Map<String, Object> headers) {
- E result = send(endpoint, new Processor() {
+ Exchange result = send(endpoint, new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
for (Map.Entry<String, Object> header : headers.entrySet()) {
@@ -163,19 +163,19 @@
// Methods using an InOut ExchangePattern
// -----------------------------------------------------------------------
- public E request(Endpoint<E> endpoint, Processor processor) {
+ public Exchange request(Endpoint endpoint, Processor processor) {
return send(endpoint, ExchangePattern.InOut, processor);
}
- public Object requestBody(Endpoint<E> endpoint, Object body) {
+ public Object requestBody(Endpoint endpoint, Object body) {
return sendBody(endpoint, ExchangePattern.InOut, body);
}
- public Object requestBodyAndHeader(Endpoint<E> endpoint, Object body, String header, Object headerValue) {
+ public Object requestBodyAndHeader(Endpoint endpoint, Object body, String header, Object headerValue) {
return sendBodyAndHeader(endpoint, ExchangePattern.InOut, body, header, headerValue);
}
- public E request(String endpoint, Processor processor) {
+ public Exchange request(String endpoint, Processor processor) {
return send(endpoint, ExchangePattern.InOut, processor);
}
@@ -194,11 +194,11 @@
return sendBody(getMandatoryDefaultEndpoint(), body);
}
- public E send(E exchange) {
+ public Exchange send(Exchange exchange) {
return send(getMandatoryDefaultEndpoint(), exchange);
}
- public E send(Processor processor) {
+ public Exchange send(Processor processor) {
return send(getMandatoryDefaultEndpoint(), processor);
}
@@ -212,7 +212,7 @@
// Properties
// -----------------------------------------------------------------------
- public Producer getProducer(Endpoint<E> endpoint) {
+ public Producer getProducer(Endpoint endpoint) {
return producerCache.getProducer(endpoint);
}
@@ -220,11 +220,11 @@
return context;
}
- public Endpoint<E> getDefaultEndpoint() {
+ public Endpoint getDefaultEndpoint() {
return defaultEndpoint;
}
- public void setDefaultEndpoint(Endpoint<E> defaultEndpoint) {
+ public void setDefaultEndpoint(Endpoint defaultEndpoint) {
this.defaultEndpoint = defaultEndpoint;
}
@@ -298,8 +298,8 @@
return endpoint;
}
- protected Endpoint<E> getMandatoryDefaultEndpoint() {
- Endpoint<E> answer = getDefaultEndpoint();
+ protected Endpoint getMandatoryDefaultEndpoint() {
+ Endpoint answer = getDefaultEndpoint();
ObjectHelper.notNull(answer, "defaultEndpoint");
return answer;
}
@@ -319,7 +319,7 @@
* @param result the result
* @return the result, can be <tt>null</tt>.
*/
- protected Object extractResultBody(E result) {
+ protected Object extractResultBody(Exchange result) {
return extractResultBody(result, null);
}
@@ -333,7 +333,7 @@
* @param pattern exchange pattern if given, can be <tt>null</tt>
* @return the result, can be <tt>null</tt>.
*/
- protected Object extractResultBody(E result, ExchangePattern pattern) {
+ protected Object extractResultBody(Exchange result, ExchangePattern pattern) {
Object answer = null;
if (result != null) {
// rethrow if there was an exception
@@ -359,7 +359,7 @@
return answer;
}
- protected boolean hasFaultMessage(E result) {
+ protected boolean hasFaultMessage(Exchange result) {
Message faultMessage = result.getFault(false);
if (faultMessage != null) {
Object faultBody = faultMessage.getBody();
@@ -369,5 +369,4 @@
}
return false;
}
-
}
\ No newline at end of file
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java Mon Nov 10 13:43:20 2008
@@ -39,12 +39,12 @@
*
* @version $Revision$
*/
-public class ProducerCache<E extends Exchange> extends ServiceSupport {
+public class ProducerCache extends ServiceSupport {
private static final transient Log LOG = LogFactory.getLog(ProducerCache.class);
private Map<String, Producer> producers = new HashMap<String, Producer>();
- public synchronized Producer getProducer(Endpoint<E> endpoint) {
+ public synchronized Producer getProducer(Endpoint endpoint) {
String key = endpoint.getEndpointUri();
Producer answer = producers.get(key);
if (answer == null) {
@@ -65,7 +65,7 @@
* @param endpoint the endpoint to send the exchange to
* @param exchange the exchange to send
*/
- public void send(Endpoint<E> endpoint, E exchange) {
+ public void send(Endpoint endpoint, Exchange exchange) {
try {
Producer producer = getProducer(endpoint);
producer.process(exchange);
@@ -81,10 +81,10 @@
* @param endpoint the endpoint to send the exchange to
* @param processor the transformer used to populate the new exchange
*/
- public E send(Endpoint<E> endpoint, Processor processor) {
+ public Exchange send(Endpoint endpoint, Processor processor) {
try {
Producer producer = getProducer(endpoint);
- E exchange = (E) producer.createExchange();
+ Exchange exchange = producer.createExchange();
return sendExchange(endpoint, producer, processor, exchange);
} catch (Exception e) {
throw wrapRuntimeCamelException(e);
@@ -99,10 +99,10 @@
* @param endpoint the endpoint to send the exchange to
* @param processor the transformer used to populate the new exchange
*/
- public E send(Endpoint<E> endpoint, Processor processor, AsyncCallback callback) {
+ public Exchange send(Endpoint endpoint, Processor processor, AsyncCallback callback) {
try {
Producer producer = getProducer(endpoint);
- E exchange = (E) producer.createExchange();
+ Exchange exchange = producer.createExchange();
boolean sync = sendExchange(endpoint, producer, processor, exchange, callback);
setProcessedSync(exchange, sync);
return exchange;
@@ -129,10 +129,10 @@
* {@link ExchangePattern#InOnly} or {@link ExchangePattern#InOut}
* @param processor the transformer used to populate the new exchange
*/
- public E send(Endpoint<E> endpoint, ExchangePattern pattern, Processor processor) {
+ public Exchange send(Endpoint endpoint, ExchangePattern pattern, Processor processor) {
try {
Producer producer = getProducer(endpoint);
- E exchange = (E) producer.createExchange(pattern);
+ Exchange exchange = producer.createExchange(pattern);
return sendExchange(endpoint, producer, processor, exchange);
} catch (Exception e) {
throw wrapRuntimeCamelException(e);
@@ -140,7 +140,7 @@
}
- protected E sendExchange(Endpoint<E> endpoint, Producer producer, Processor processor, E exchange) throws Exception {
+ protected Exchange sendExchange(Endpoint endpoint, Producer producer, Processor processor, Exchange exchange) throws Exception {
// lets populate using the processor callback
processor.process(exchange);
@@ -152,7 +152,7 @@
return exchange;
}
- protected boolean sendExchange(Endpoint<E> endpoint, Producer producer, Processor processor, E exchange, AsyncCallback callback) throws Exception {
+ protected boolean sendExchange(Endpoint endpoint, Producer producer, Processor processor, Exchange exchange, AsyncCallback callback) throws Exception {
// lets populate using the processor callback
processor.process(exchange);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java Mon Nov 10 13:43:20 2008
@@ -42,7 +42,7 @@
*/
public class RecipientList extends ServiceSupport implements Processor {
private final Expression expression;
- private ProducerCache<Exchange> producerCache = new ProducerCache<Exchange>();
+ private ProducerCache producerCache = new ProducerCache();
public RecipientList(Expression expression) {
notNull(expression, "expression");
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java Mon Nov 10 13:43:20 2008
@@ -43,7 +43,7 @@
private final String header;
private final String uriDelimiter;
- private ProducerCache<Exchange> producerCache = new ProducerCache<Exchange>();
+ private ProducerCache producerCache = new ProducerCache();
public RoutingSlip(String header) {
this(header, RoutingSlipType.DEFAULT_DELIMITER);
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java Mon Nov 10 13:43:20 2008
@@ -38,7 +38,7 @@
*/
public abstract class ContextTestSupport extends TestSupport {
protected CamelContext context;
- protected ProducerTemplate<Exchange> template;
+ protected ProducerTemplate template;
private boolean useRouteBuilder = true;
private Service camelContextService;
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Camel715ThreadProcessorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Camel715ThreadProcessorTest.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Camel715ThreadProcessorTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/Camel715ThreadProcessorTest.java Mon Nov 10 13:43:20 2008
@@ -67,7 +67,7 @@
});
- final ProducerTemplate<Exchange> template = context.createProducerTemplate();
+ final ProducerTemplate template = context.createProducerTemplate();
final Endpoint e = context.getEndpoint("direct:a");
context.start();
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java Mon Nov 10 13:43:20 2008
@@ -53,7 +53,7 @@
private CamelContext camelContext;
private EndpointInfo endpointInfo;
private String targetCamelEndpointUri;
- private ProducerTemplate<Exchange> camelTemplate;
+ private ProducerTemplate camelTemplate;
private Bus bus;
private HeaderFilterStrategy headerFilterStrategy;
@@ -122,7 +122,7 @@
}
}
- public ProducerTemplate<Exchange> getCamelTemplate() {
+ public ProducerTemplate getCamelTemplate() {
if (camelTemplate == null) {
CamelContext ctx = camelContext != null ? camelContext : new DefaultCamelContext();
camelTemplate = ctx.createProducerTemplate();
@@ -130,7 +130,7 @@
return camelTemplate;
}
- public void setCamelTemplate(ProducerTemplate<Exchange> template) {
+ public void setCamelTemplate(ProducerTemplate template) {
camelTemplate = template;
}
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java Mon Nov 10 13:43:20 2008
@@ -58,7 +58,7 @@
CamelContext camelContext;
Consumer consumer;
String camelDestinationUri;
- private ProducerTemplate<Exchange> camelTemplate;
+ private ProducerTemplate camelTemplate;
private Endpoint distinationEndpoint;
private HeaderFilterStrategy headerFilterStrategy;
@@ -121,7 +121,7 @@
this.deactivate();
}
- public ProducerTemplate<Exchange> getCamelTemplate() {
+ public ProducerTemplate getCamelTemplate() {
if (camelTemplate == null) {
CamelContext ctx = camelContext != null ? camelContext : new DefaultCamelContext();
camelTemplate = ctx.createProducerTemplate();
@@ -129,7 +129,7 @@
return camelTemplate;
}
- public void setCamelTemplate(ProducerTemplate<Exchange> template) {
+ public void setCamelTemplate(ProducerTemplate template) {
camelTemplate = template;
}
Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java Mon Nov 10 13:43:20 2008
@@ -54,7 +54,7 @@
private static final transient Log LOG = LogFactory.getLog(CxfProducerTest.class);
protected CamelContext camelContext = new DefaultCamelContext();
- protected ProducerTemplate<CxfExchange> template = camelContext.createProducerTemplate();
+ protected ProducerTemplate template = camelContext.createProducerTemplate();
private ServerImpl simpleServer;
private Endpoint jaxwsEndpoint;
Modified: activemq/camel/trunk/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapTestSupport.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapTestSupport.java (original)
+++ activemq/camel/trunk/components/camel-ldap/src/test/java/org/apache/camel/component/ldap/LdapTestSupport.java Mon Nov 10 13:43:20 2008
@@ -47,7 +47,7 @@
public abstract class LdapTestSupport extends AbstractServerTest {
protected transient Log log = LogFactory.getLog(getClass());
protected CamelContext context;
- protected ProducerTemplate<Exchange> template;
+ protected ProducerTemplate template;
private boolean useRouteBuilder = true;
private Service camelContextService;
Modified: activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java (original)
+++ activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java Mon Nov 10 13:43:20 2008
@@ -43,7 +43,7 @@
public class CamelTargetAdapter extends AbstractCamelAdapter implements MessageHandler {
private final Log logger = LogFactory.getLog(this.getClass());
- private ProducerTemplate<Exchange> camelTemplate;
+ private ProducerTemplate camelTemplate;
private MessageChannel replyChannel;
@@ -55,7 +55,7 @@
return replyChannel;
}
- public ProducerTemplate<Exchange> getCamelTemplate() {
+ public ProducerTemplate getCamelTemplate() {
if (camelTemplate == null) {
CamelContext ctx = getCamelContext();
if (ctx == null) {
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java Mon Nov 10 13:43:20 2008
@@ -42,7 +42,7 @@
assertValidContext(context);
// now lets send a message
- ProducerTemplate<Exchange> template = context.createProducerTemplate();
+ ProducerTemplate template = context.createProducerTemplate();
template.send("direct:start", new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java Mon Nov 10 13:43:20 2008
@@ -45,7 +45,7 @@
resultEndpoint.expectedBodiesReceived(body);
// now lets send a message
- ProducerTemplate<Exchange> template = context.createProducerTemplate();
+ ProducerTemplate template = context.createProducerTemplate();
template.send("seda:start", new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
Modified: activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java Mon Nov 10 13:43:20 2008
@@ -51,7 +51,7 @@
protected CamelContext container = new DefaultCamelContext();
protected CountDownLatch latch = new CountDownLatch(1);
protected Endpoint<XmppExchange> endpoint;
- protected ProducerCache<XmppExchange> client = new ProducerCache<XmppExchange>();
+ protected ProducerCache client = new ProducerCache();
public static void main(String[] args) {
enabled = true;
Modified: activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java (original)
+++ activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java Mon Nov 10 13:43:20 2008
@@ -16,7 +16,6 @@
*/
package org.apache.camel.itest.greeter;
-import java.util.ArrayList;
import java.util.List;
import javax.xml.ws.Endpoint;
@@ -24,15 +23,12 @@
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.cxf.CxfConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -71,7 +67,7 @@
assertNotNull(camelContext);
assertNotNull(resultEndpoint);
- ProducerTemplate<Exchange> template = camelContext.createProducerTemplate();
+ ProducerTemplate template = camelContext.createProducerTemplate();
template.sendBodyAndHeader("jms:requestQueue", "Willem", CxfConstants.OPERATION_NAME, "greetMe");
// Sleep a while and wait for the message whole processing
Modified: activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java (original)
+++ activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java Mon Nov 10 13:43:20 2008
@@ -57,7 +57,7 @@
resultEndpoint.reset();
assertNotNull(resultEndpoint);
- ProducerTemplate<Exchange> template = camelContext.createProducerTemplate();
+ ProducerTemplate template = camelContext.createProducerTemplate();
template.sendBodyAndHeader("jetty:http://localhost:9000/test", "Hello form Willem", "Operation", "greetMe");
// Sleep a while and wait for the message whole processing
Modified: activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java?rev=712844&r1=712843&r2=712844&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java (original)
+++ activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java Mon Nov 10 13:43:20 2008
@@ -32,7 +32,7 @@
public void testSendingRequest() throws Exception {
assertNotNull("the camelContext should not be null", camelContext);
- ProducerTemplate<Exchange> template = camelContext.createProducerTemplate();
+ ProducerTemplate template = camelContext.createProducerTemplate();
Exchange exchange = template.send("jetty:http://localhost:9000/test", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("<hello>Willem</hello>");