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 2017/02/14 11:40:35 UTC

[2/2] camel git commit: [CAMEL-10824] Improve DefaultRuntimeProvider abstraction

[CAMEL-10824] Improve DefaultRuntimeProvider abstraction


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6ea18cb9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6ea18cb9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6ea18cb9

Branch: refs/heads/camel-2.18.x
Commit: 6ea18cb9175f98646fa205bee89853acbabb8c89
Parents: ff71bb7
Author: Thomas Diesler <th...@jboss.com>
Authored: Tue Feb 14 11:08:31 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 14 12:40:28 2017 +0100

----------------------------------------------------------------------
 .../camel/catalog/DefaultRuntimeProvider.java     | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/6ea18cb9/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
index d022954..0bbf414 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
@@ -69,10 +69,22 @@ public class DefaultRuntimeProvider implements RuntimeProvider {
         return LANGUAGE_DIR;
     }
 
+    protected String getComponentsCatalog() {
+        return COMPONENTS_CATALOG;
+    }
+
+    protected String getDataFormatsCatalog() {
+        return DATA_FORMATS_CATALOG;
+    }
+
+    protected String getLanguageCatalog() {
+        return LANGUAGE_CATALOG;
+    }
+
     @Override
     public List<String> findComponentNames() {
         List<String> names = new ArrayList<String>();
-        InputStream is = camelCatalog.getVersionManager().getResourceAsStream(COMPONENTS_CATALOG);
+        InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getComponentsCatalog());
         if (is != null) {
             try {
                 CatalogHelper.loadLines(is, names);
@@ -86,7 +98,7 @@ public class DefaultRuntimeProvider implements RuntimeProvider {
     @Override
     public List<String> findDataFormatNames() {
         List<String> names = new ArrayList<String>();
-        InputStream is = camelCatalog.getVersionManager().getResourceAsStream(DATA_FORMATS_CATALOG);
+        InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getDataFormatsCatalog());
         if (is != null) {
             try {
                 CatalogHelper.loadLines(is, names);
@@ -100,7 +112,7 @@ public class DefaultRuntimeProvider implements RuntimeProvider {
     @Override
     public List<String> findLanguageNames() {
         List<String> names = new ArrayList<String>();
-        InputStream is = camelCatalog.getVersionManager().getResourceAsStream(LANGUAGE_CATALOG);
+        InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getLanguageCatalog());
         if (is != null) {
             try {
                 CatalogHelper.loadLines(is, names);