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/06/28 14:29:20 UTC
[1/2] camel git commit: Allow camel-catalog to lookup the bean/method
language using both kind of names.
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 211d09b72 -> 135c3ced2
refs/heads/master ca11932ec -> 6393a5602
Allow camel-catalog to lookup the bean/method language using both kind of names.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6393a560
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6393a560
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6393a560
Branch: refs/heads/master
Commit: 6393a56025ecd71053dcb542183f2df55d70a1fe
Parents: ca11932
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 28 16:28:20 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 28 16:28:20 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/catalog/DefaultCamelCatalog.java | 5 +++++
.../test/java/org/apache/camel/catalog/CamelCatalogTest.java | 8 ++++++++
2 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6393a560/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 2ee7044..b1cfea9 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -520,6 +520,11 @@ public class DefaultCamelCatalog implements CamelCatalog {
@Override
public String languageJSonSchema(String name) {
+ // if we try to look method then its in the bean.json file
+ if ("method".equals(name)) {
+ name = "bean";
+ }
+
String file = LANGUAGE_JSON + "/" + name + ".json";
String answer = null;
http://git-wip-us.apache.org/repos/asf/camel/blob/6393a560/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index e14115e..4d09ba3 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -72,6 +72,8 @@ public class CamelCatalogTest {
assertTrue(names.contains("simple"));
assertTrue(names.contains("spel"));
assertTrue(names.contains("xpath"));
+ assertTrue(names.contains("bean"));
+ assertFalse(names.contains("method"));
}
@Test
@@ -119,6 +121,12 @@ public class CamelCatalogTest {
schema = catalog.modelJSonSchema("aggregate");
assertNotNull(schema);
+
+ // lets make it possible to find bean/method using both names
+ schema = catalog.modelJSonSchema("method");
+ assertNotNull(schema);
+ schema = catalog.modelJSonSchema("bean");
+ assertNotNull(schema);
}
@Test
[2/2] camel git commit: Allow camel-catalog to lookup the bean/method
language using both kind of names.
Posted by da...@apache.org.
Allow camel-catalog to lookup the bean/method language using both kind of names.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/135c3ced
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/135c3ced
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/135c3ced
Branch: refs/heads/camel-2.17.x
Commit: 135c3ced22b845b6c69505d18e54b014992447fc
Parents: 211d09b
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 28 16:28:20 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 28 16:29:03 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/catalog/DefaultCamelCatalog.java | 5 +++++
.../test/java/org/apache/camel/catalog/CamelCatalogTest.java | 8 ++++++++
2 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/135c3ced/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 6163b05..eb5035b 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -497,6 +497,11 @@ public class DefaultCamelCatalog implements CamelCatalog {
@Override
public String languageJSonSchema(String name) {
+ // if we try to look method then its in the bean.json file
+ if ("method".equals(name)) {
+ name = "bean";
+ }
+
String file = LANGUAGE_JSON + "/" + name + ".json";
String answer = null;
http://git-wip-us.apache.org/repos/asf/camel/blob/135c3ced/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 1da20e7..2499227 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -58,6 +58,8 @@ public class CamelCatalogTest {
assertTrue(names.contains("simple"));
assertTrue(names.contains("spel"));
assertTrue(names.contains("xpath"));
+ assertTrue(names.contains("bean"));
+ assertFalse(names.contains("method"));
}
@Test
@@ -105,6 +107,12 @@ public class CamelCatalogTest {
schema = catalog.modelJSonSchema("aggregate");
assertNotNull(schema);
+
+ // lets make it possible to find bean/method using both names
+ schema = catalog.modelJSonSchema("method");
+ assertNotNull(schema);
+ schema = catalog.modelJSonSchema("bean");
+ assertNotNull(schema);
}
@Test