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 2016/07/28 07:11:59 UTC
[7/9] camel git commit: Changed constants and formatting
Changed constants and formatting
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef8edc89
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef8edc89
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef8edc89
Branch: refs/heads/master
Commit: ef8edc8934cc4bbbd9716686c9fe1443540c56de
Parents: 9d81d1f
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Wed Jul 27 16:42:46 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 08:41:34 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/impl/DefaultComponentResolver.java | 10 ++++------
.../org/apache/camel/impl/DefaultDataFormatResolver.java | 10 ++++------
2 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ef8edc89/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
index 99cb020..abce3af 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
* scheme name in the <b>META-INF/services/org/apache/camel/component/</b>
* directory on the classpath.
*
- * @version
+ * @version
*/
public class DefaultComponentResolver implements ComponentResolver {
@@ -41,13 +41,11 @@ public class DefaultComponentResolver implements ComponentResolver {
private static final Logger LOG = LoggerFactory.getLogger(DefaultComponentResolver.class);
- private static final String FALLBACK_COMPONENT_BEAN_SUFFIX = "-component";
-
private FactoryFinder factoryFinder;
public Component resolveComponent(String name, CamelContext context) {
// lookup in registry first
- Object bean = lookupInRegistry(context, name, name + FALLBACK_COMPONENT_BEAN_SUFFIX);
+ Object bean = lookupInRegistry(context, name, name + "-component");
if (bean != null) {
if (bean instanceof Component) {
@@ -91,7 +89,7 @@ public class DefaultComponentResolver implements ComponentResolver {
private Object lookupInRegistry(CamelContext context, String... names) {
Object bean = null;
- for(String name : names) {
+ for (String name : names) {
try {
bean = context.getRegistry().lookupByName(name);
getLog().debug("Lookup component with name {} in registry. Found: {}", name, bean);
@@ -99,7 +97,7 @@ public class DefaultComponentResolver implements ComponentResolver {
getLog().debug("Ignored error looking up bean: " + name, e);
}
- if(bean!=null) {
+ if (bean != null) {
break;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ef8edc89/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
index 353858c..5a20fd1 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
@@ -25,18 +25,16 @@ import org.apache.camel.spi.FactoryFinder;
/**
* Default data format resolver
*
- * @version
+ * @version
*/
public class DefaultDataFormatResolver implements DataFormatResolver {
public static final String DATAFORMAT_RESOURCE_PATH = "META-INF/services/org/apache/camel/dataformat/";
- private static final String FALLBACK_DATA_FORMAT_BEAN_SUFFIX = "-dataformat";
-
protected FactoryFinder dataformatFactory;
public DataFormat resolveDataFormat(String name, CamelContext context) {
- DataFormat dataFormat = lookup(context, DataFormat.class, name, name + FALLBACK_DATA_FORMAT_BEAN_SUFFIX);
+ DataFormat dataFormat = lookup(context, DataFormat.class, name, name + "-dataformat");
if (dataFormat == null) {
Class<?> type = null;
try {
@@ -67,10 +65,10 @@ public class DefaultDataFormatResolver implements DataFormatResolver {
}
private static <T> T lookup(CamelContext context, Class<T> type, String... names) {
- for(String name : names) {
+ for (String name : names) {
try {
T bean = context.getRegistry().lookupByNameAndType(name, type);
- if(bean!=null) {
+ if (bean != null) {
return bean;
}
} catch (Exception e) {