Author: davsclaus
Date: Wed Jul 29 13:33:17 2009
New Revision: 798901
URL: http://svn.apache.org/viewvc?rev=798901&view=rev
Log:
Removing ExchangeConverter as its not used and not needed anymore.
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExchangeConverter.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java?rev=798901&r1=798900&r2=798901&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java Wed
Jul 29 13:33:17 2009
@@ -26,7 +26,6 @@
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.EndpointStrategy;
-import org.apache.camel.spi.ExchangeConverter;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.FactoryFinderResolver;
import org.apache.camel.spi.Injector;
@@ -258,14 +257,6 @@
//-----------------------------------------------------------------------
/**
- * Returns the converter of exchanges from one type to another
- *
- * @return the converter
- * @deprecated
- */
- ExchangeConverter getExchangeConverter();
-
- /**
* Returns the type converter used to coerce types from one type to another
*
* @return the converter
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=798901&r1=798900&r2=798901&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Wed Jul 29 13:33:17 2009
@@ -55,7 +55,6 @@
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.spi.EndpointStrategy;
-import org.apache.camel.spi.ExchangeConverter;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.FactoryFinderResolver;
import org.apache.camel.spi.Injector;
@@ -95,7 +94,6 @@
private final List<Service> servicesToClose = new ArrayList<Service>();
private TypeConverter typeConverter;
private TypeConverterRegistry typeConverterRegistry;
- private ExchangeConverter exchangeConverter;
private Injector injector;
private ComponentResolver componentResolver;
private boolean autoCreateComponents = true;
@@ -614,16 +612,6 @@
// Properties
// -----------------------------------------------------------------------
- public ExchangeConverter getExchangeConverter() {
- if (exchangeConverter == null) {
- exchangeConverter = createExchangeConverter();
- }
- return exchangeConverter;
- }
-
- public void setExchangeConverter(ExchangeConverter exchangeConverter) {
- this.exchangeConverter = exchangeConverter;
- }
public TypeConverter getTypeConverter() {
if (typeConverter == null) {
@@ -939,7 +927,6 @@
* components and create routes
*/
protected void forceLazyInitialization() {
- getExchangeConverter();
getInjector();
getLanguageResolver();
getTypeConverter();
@@ -948,13 +935,6 @@
/**
* Lazily create a default implementation
*/
- protected ExchangeConverter createExchangeConverter() {
- return new DefaultExchangeConverter();
- }
-
- /**
- * Lazily create a default implementation
- */
protected TypeConverter createTypeConverter() {
DefaultTypeConverter answer = new
DefaultTypeConverter(packageScanClassResolver, getInjector(),
getDefaultFactoryFinder());
typeConverterRegistry = answer;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java?rev=798901&r1=798900&r2=798901&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
Wed Jul 29 13:33:17 2009
@@ -151,16 +151,6 @@
return new EventDrivenPollingConsumer(this);
}
- /**
- * Converts the given exchange to the specified exchange type
- */
- public Exchange convertTo(Class<Exchange> type, Exchange exchange) {
- if (type.isInstance(exchange)) {
- return type.cast(exchange);
- }
- return getCamelContext().getExchangeConverter().convertTo(type,
exchange);
- }
-
public Exchange createExchange(Exchange exchange) {
Class<Exchange> exchangeType = getExchangeType();
if (exchangeType != null) {
