You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2011/09/11 17:53:31 UTC
svn commit: r1169472 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/spi/
components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/
Author: cschneider
Date: Sun Sep 11 15:53:31 2011
New Revision: 1169472
URL: http://svn.apache.org/viewvc?rev=1169472&view=rev
Log:
CAMEL-4428 Removed resolveDataFormatDefinition from DataFormatResolver as it was the same in all implementations and moved the impl to DefaultCamelContext. This removes another dependency from api to model
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/DataFormatResolver.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java
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=1169472&r1=1169471&r2=1169472&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 Sun Sep 11 15:53:31 2011
@@ -2240,7 +2240,21 @@ public class DefaultCamelContext extends
}
public DataFormatDefinition resolveDataFormatDefinition(String name) {
- return dataFormatResolver.resolveDataFormatDefinition(name, this);
+ // lookup type and create the data format from it
+ DataFormatDefinition type = lookup(this, name, DataFormatDefinition.class);
+ if (type == null && getDataFormats() != null) {
+ type = getDataFormats().get(name);
+ }
+ return type;
+ }
+
+ private static <T> T lookup(CamelContext context, String ref, Class<T> type) {
+ try {
+ return context.getRegistry().lookup(ref, type);
+ } catch (Exception e) {
+ // need to ignore not same type and return it as null
+ return null;
+ }
}
public ShutdownStrategy getShutdownStrategy() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java?rev=1169472&r1=1169471&r2=1169472&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java Sun Sep 11 15:53:31 2011
@@ -18,7 +18,6 @@ package org.apache.camel.impl;
import org.apache.camel.CamelContext;
import org.apache.camel.NoFactoryAvailableException;
-import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.spi.FactoryFinder;
@@ -65,15 +64,6 @@ public class DefaultDataFormatResolver i
return dataFormat;
}
- public DataFormatDefinition resolveDataFormatDefinition(String name, CamelContext context) {
- // lookup type and create the data format from it
- DataFormatDefinition type = lookup(context, name, DataFormatDefinition.class);
- if (type == null && context.getDataFormats() != null) {
- type = context.getDataFormats().get(name);
- }
- return type;
- }
-
private static <T> T lookup(CamelContext context, String ref, Class<T> type) {
try {
return context.getRegistry().lookup(ref, type);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/DataFormatResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/DataFormatResolver.java?rev=1169472&r1=1169471&r2=1169472&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/DataFormatResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/DataFormatResolver.java Sun Sep 11 15:53:31 2011
@@ -17,7 +17,6 @@
package org.apache.camel.spi;
import org.apache.camel.CamelContext;
-import org.apache.camel.model.DataFormatDefinition;
/**
* Represents a resolver of data formats.
@@ -35,12 +34,4 @@ public interface DataFormatResolver {
*/
DataFormat resolveDataFormat(String name, CamelContext context);
- /**
- * Resolves the given data format definition given its name.
- *
- * @param name the name of the data format to lookup in {@link org.apache.camel.spi.Registry} or create
- * @param context the camel context
- * @return the data format or <tt>null</tt> if not possible to resolve
- */
- DataFormatDefinition resolveDataFormatDefinition(String name, CamelContext context);
}
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java?rev=1169472&r1=1169471&r2=1169472&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java Sun Sep 11 15:53:31 2011
@@ -17,7 +17,6 @@
package org.apache.camel.core.osgi;
import org.apache.camel.CamelContext;
-import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.util.ObjectHelper;
@@ -55,24 +54,6 @@ public class OsgiDataFormatResolver impl
return getDataFormat(name, context);
}
- public DataFormatDefinition resolveDataFormatDefinition(String name, CamelContext context) {
- // lookup type and create the data format from it
- DataFormatDefinition type = lookup(context, name, DataFormatDefinition.class);
- if (type == null && context.getDataFormats() != null) {
- type = context.getDataFormats().get(name);
- }
- return type;
- }
-
- private static <T> T lookup(CamelContext context, String ref, Class<T> type) {
- try {
- return context.getRegistry().lookup(ref, type);
- } catch (Exception e) {
- // need to ignore not same type and return it as null
- return null;
- }
- }
-
protected DataFormat getDataFormat(String name, CamelContext context) {
LOG.trace("Finding DataFormat: {}", name);
try {