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 2015/10/18 13:07:56 UTC
[1/5] camel git commit: Fixed potential NPE if components create
exchange the wrong way.
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 3a56fa8f6 -> e10513eb7
Fixed potential NPE if components create exchange the wrong way.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/70098b04
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/70098b04
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/70098b04
Branch: refs/heads/camel-2.16.x
Commit: 70098b04e3eacb70dbb4d6f3da692c61fb5483bf
Parents: 3a56fa8
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Oct 17 10:41:10 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Oct 18 13:09:46 2015 +0200
----------------------------------------------------------------------
.../camel/impl/DefaultRuntimeEndpointRegistry.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/70098b04/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
index d866fea..9fd4c31 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
@@ -241,11 +241,13 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme
// we only capture details in extended mode
ExchangeCreatedEvent ece = (ExchangeCreatedEvent) event;
Endpoint endpoint = ece.getExchange().getFromEndpoint();
- String routeId = ece.getExchange().getFromRouteId();
- String uri = endpoint.getEndpointUri();
- String key = asUtilizationKey(routeId, uri);
- if (key != null) {
- inputUtilization.onHit(key);
+ if (endpoint != null) {
+ String routeId = ece.getExchange().getFromRouteId();
+ String uri = endpoint.getEndpointUri();
+ String key = asUtilizationKey(routeId, uri);
+ if (key != null) {
+ inputUtilization.onHit(key);
+ }
}
} else if (event instanceof ExchangeSendingEvent) {
ExchangeSendingEvent ese = (ExchangeSendingEvent) event;
[5/5] camel git commit: Camel catalog - Add api to get list of all
the other stuff in json
Posted by da...@apache.org.
Camel catalog - Add api to get list of all the other stuff in json
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e10513eb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e10513eb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e10513eb
Branch: refs/heads/camel-2.16.x
Commit: e10513eb7981a91dd0fc9726765d3725c5578575
Parents: 887e12b
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Oct 18 12:50:47 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Oct 18 13:10:22 2015 +0200
----------------------------------------------------------------------
.../camel/catalog/DefaultCamelCatalog.java | 8 +++----
.../apache/camel/catalog/CamelCatalogTest.java | 23 ++++++++++++++++++++
2 files changed, 27 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e10513eb/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 121afb8..e91b170 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
@@ -741,7 +741,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
String scheme = names.get(i);
String json = componentJSonSchema(scheme);
// skip first line
- json = CatalogHelper.between(json, "\"component\": {", "\"componentProperties\"");
+ json = CatalogHelper.between(json, "\"component\": {", "\"componentProperties\": {");
json = json.trim();
// skip last comma if not the last
if (i == names.size() - 1) {
@@ -766,7 +766,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
String scheme = names.get(i);
String json = dataFormatJSonSchema(scheme);
// skip first line
- json = CatalogHelper.between(json, "\"dataformat\": {", "\"properties\"");
+ json = CatalogHelper.between(json, "\"dataformat\": {", "\"properties\": {");
json = json.trim();
// skip last comma if not the last
if (i == names.size() - 1) {
@@ -791,7 +791,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
String scheme = names.get(i);
String json = languageJSonSchema(scheme);
// skip first line
- json = CatalogHelper.between(json, "\"language\": {", "\"properties\"");
+ json = CatalogHelper.between(json, "\"language\": {", "\"properties\": {");
json = json.trim();
// skip last comma if not the last
if (i == names.size() - 1) {
@@ -816,7 +816,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
String scheme = names.get(i);
String json = modelJSonSchema(scheme);
// skip first line
- json = CatalogHelper.between(json, "\"model\": {", "\"properties\"");
+ json = CatalogHelper.between(json, "\"model\": {", "\"properties\": {");
json = json.trim();
// skip last comma if not the last
if (i == names.size() - 1) {
http://git-wip-us.apache.org/repos/asf/camel/blob/e10513eb/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 811d9a6..899e295 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
@@ -20,10 +20,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import junit.framework.TestCase;
import org.junit.Test;
import static org.apache.camel.catalog.CatalogHelper.loadText;
+import static org.junit.Assert.assertNotNull;
public class CamelCatalogTest extends TestCase {
@@ -242,24 +245,44 @@ public class CamelCatalogTest extends TestCase {
public void testListComponentsAsJson() throws Exception {
String json = catalog.listComponentsAsJson();
assertNotNull(json);
+
+ // validate we can parse the json
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(json);
+ assertNotNull(tree);
}
@Test
public void testListDataFormatsAsJson() throws Exception {
String json = catalog.listDataFormatsAsJson();
assertNotNull(json);
+
+ // validate we can parse the json
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(json);
+ assertNotNull(tree);
}
@Test
public void testListLanguagesAsJson() throws Exception {
String json = catalog.listLanguagesAsJson();
assertNotNull(json);
+
+ // validate we can parse the json
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(json);
+ assertNotNull(tree);
}
@Test
public void testListModelsAsJson() throws Exception {
String json = catalog.listModelsAsJson();
assertNotNull(json);
+
+ // validate we can parse the json
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode tree = mapper.readTree(json);
+ assertNotNull(tree);
}
}
[4/5] camel git commit: Camel catalog - Add api to get list of all
the other stuff in json
Posted by da...@apache.org.
Camel catalog - Add api to get list of all the other stuff in json
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/887e12b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/887e12b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/887e12b1
Branch: refs/heads/camel-2.16.x
Commit: 887e12b1c3ab348bc14cb865ee43dcea96276285
Parents: 5ef5b04
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Oct 18 09:13:22 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Oct 18 13:10:15 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/catalog/CamelCatalog.java | 20 ++++-
.../camel/catalog/DefaultCamelCatalog.java | 78 +++++++++++++++++++-
.../apache/camel/catalog/CamelCatalogTest.java | 22 +++++-
3 files changed, 115 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/887e12b1/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index e09ef78..ff66f50 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -211,7 +211,23 @@ public interface CamelCatalog {
String asEndpointUriXml(String scheme, Map<String, String> properties) throws URISyntaxException;
/**
- * Lists all the component summary details in JSon
+ * Lists all the components summary details in JSon
*/
- String listComponentAsJson();
+ String listComponentsAsJson();
+
+ /**
+ * Lists all the data formats summary details in JSon
+ */
+ String listDataFormatsAsJson();
+
+ /**
+ * Lists all the languages summary details in JSon
+ */
+ String listLanguagesAsJson();
+
+ /**
+ * Lists all the models (EIPs) summary details in JSon
+ */
+ String listModelsAsJson();
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/887e12b1/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 225b04d..121afb8 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
@@ -733,7 +733,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
}
@Override
- public String listComponentAsJson() {
+ public String listComponentsAsJson() {
StringBuilder sb = new StringBuilder();
sb.append("[");
List<String> names = findComponentNames();
@@ -756,4 +756,80 @@ public class DefaultCamelCatalog implements CamelCatalog {
sb.append("\n]");
return sb.toString();
}
+
+ @Override
+ public String listDataFormatsAsJson() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("[");
+ List<String> names = findDataFormatNames();
+ for (int i = 0; i < names.size(); i++) {
+ String scheme = names.get(i);
+ String json = dataFormatJSonSchema(scheme);
+ // skip first line
+ json = CatalogHelper.between(json, "\"dataformat\": {", "\"properties\"");
+ json = json.trim();
+ // skip last comma if not the last
+ if (i == names.size() - 1) {
+ json = json.substring(0, json.length() - 1);
+ }
+ sb.append("\n");
+ sb.append(" {\n");
+ sb.append(" ");
+ sb.append(json);
+ }
+
+ sb.append("\n]");
+ return sb.toString();
+ }
+
+ @Override
+ public String listLanguagesAsJson() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("[");
+ List<String> names = findLanguageNames();
+ for (int i = 0; i < names.size(); i++) {
+ String scheme = names.get(i);
+ String json = languageJSonSchema(scheme);
+ // skip first line
+ json = CatalogHelper.between(json, "\"language\": {", "\"properties\"");
+ json = json.trim();
+ // skip last comma if not the last
+ if (i == names.size() - 1) {
+ json = json.substring(0, json.length() - 1);
+ }
+ sb.append("\n");
+ sb.append(" {\n");
+ sb.append(" ");
+ sb.append(json);
+ }
+
+ sb.append("\n]");
+ return sb.toString();
+ }
+
+ @Override
+ public String listModelsAsJson() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("[");
+ List<String> names = findModelNames();
+ for (int i = 0; i < names.size(); i++) {
+ String scheme = names.get(i);
+ String json = modelJSonSchema(scheme);
+ // skip first line
+ json = CatalogHelper.between(json, "\"model\": {", "\"properties\"");
+ json = json.trim();
+ // skip last comma if not the last
+ if (i == names.size() - 1) {
+ json = json.substring(0, json.length() - 1);
+ }
+ sb.append("\n");
+ sb.append(" {\n");
+ sb.append(" ");
+ sb.append(json);
+ }
+
+ sb.append("\n]");
+ return sb.toString();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/887e12b1/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 2f529cb..811d9a6 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
@@ -239,8 +239,26 @@ public class CamelCatalogTest extends TestCase {
}
@Test
- public void testListComponentAsJosn() throws Exception {
- String json = catalog.listComponentAsJson();
+ public void testListComponentsAsJson() throws Exception {
+ String json = catalog.listComponentsAsJson();
+ assertNotNull(json);
+ }
+
+ @Test
+ public void testListDataFormatsAsJson() throws Exception {
+ String json = catalog.listDataFormatsAsJson();
+ assertNotNull(json);
+ }
+
+ @Test
+ public void testListLanguagesAsJson() throws Exception {
+ String json = catalog.listLanguagesAsJson();
+ assertNotNull(json);
+ }
+
+ @Test
+ public void testListModelsAsJson() throws Exception {
+ String json = catalog.listModelsAsJson();
assertNotNull(json);
}
[2/5] camel git commit: Add version to camel-catalog api
Posted by da...@apache.org.
Add version to camel-catalog api
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/68b6cd14
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/68b6cd14
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/68b6cd14
Branch: refs/heads/camel-2.16.x
Commit: 68b6cd148222e6ece10d70cfa9340c457cf4f64c
Parents: 70098b0
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Oct 17 16:45:05 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Oct 18 13:10:01 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/catalog/CamelCatalog.java | 5 ++
.../camel/catalog/DefaultCamelCatalog.java | 7 ++
.../org/apache/camel/catalog/VersionHelper.java | 73 ++++++++++++++++++++
.../apache/camel/catalog/CamelCatalogTest.java | 6 ++
4 files changed, 91 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/68b6cd14/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index 43847d9..350c2d4 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -29,6 +29,11 @@ import javax.management.MXBean;
public interface CamelCatalog {
/**
+ * The version of this Camel Catalog
+ */
+ String getCatalogVersion();
+
+ /**
* Find all the component names from the Camel catalog
*/
List<String> findComponentNames();
http://git-wip-us.apache.org/repos/asf/camel/blob/68b6cd14/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 a510fc5..1641495 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
@@ -57,6 +57,13 @@ public class DefaultCamelCatalog implements CamelCatalog {
private static final Pattern SYNTAX_PATTERN = Pattern.compile("(\\w+)");
+ private final VersionHelper version = new VersionHelper();
+
+ @Override
+ public String getCatalogVersion() {
+ return version.getVersion();
+ }
+
@Override
public List<String> findComponentNames() {
List<String> names = new ArrayList<String>();
http://git-wip-us.apache.org/repos/asf/camel/blob/68b6cd14/platforms/catalog/src/main/java/org/apache/camel/catalog/VersionHelper.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/VersionHelper.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/VersionHelper.java
new file mode 100644
index 0000000..e1c69bc
--- /dev/null
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/VersionHelper.java
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.catalog;
+
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * To get the version of this catalog.
+ */
+public class VersionHelper {
+
+ private static volatile String version;
+
+ public synchronized String getVersion() {
+ if (version != null) {
+ return version;
+ }
+ InputStream is = null;
+ // try to load from maven properties first
+ try {
+ Properties p = new Properties();
+ is = getClass().getResourceAsStream("/META-INF/maven/org.apache.camel/camel-catalog/pom.properties");
+ if (is != null) {
+ p.load(is);
+ version = p.getProperty("version", "");
+ }
+ } catch (Exception e) {
+ // ignore
+ } finally {
+ if (is != null) {
+ try {
+ is.close();
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ }
+
+ // fallback to using Java API
+ if (version == null) {
+ Package aPackage = getClass().getPackage();
+ if (aPackage != null) {
+ version = aPackage.getImplementationVersion();
+ if (version == null) {
+ version = aPackage.getSpecificationVersion();
+ }
+ }
+ }
+
+ if (version == null) {
+ // we could not compute the version so use a blank
+ version = "";
+ }
+
+ return version;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/68b6cd14/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 e905e81..ab69fed 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
@@ -30,6 +30,12 @@ public class CamelCatalogTest extends TestCase {
private CamelCatalog catalog = new DefaultCamelCatalog();
@Test
+ public void testGetVersion() throws Exception {
+ String version = catalog.getCatalogVersion();
+ assertNotNull(version);
+ }
+
+ @Test
public void testFindLanguageNames() throws Exception {
List<String> names = catalog.findLanguageNames();
[3/5] camel git commit: Camel catalog - Add api to get list of all
components in json
Posted by da...@apache.org.
Camel catalog - Add api to get list of all components in json
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5ef5b04f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5ef5b04f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5ef5b04f
Branch: refs/heads/camel-2.16.x
Commit: 5ef5b04ff735fa76e4f4b63ec20ce8a5697393de
Parents: 68b6cd1
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Oct 17 17:39:47 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Oct 18 13:10:08 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/catalog/CamelCatalog.java | 5 +++
.../org/apache/camel/catalog/CatalogHelper.java | 45 ++++++++++++++++++++
.../camel/catalog/DefaultCamelCatalog.java | 24 +++++++++++
.../apache/camel/catalog/CamelCatalogTest.java | 6 +++
4 files changed, 80 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5ef5b04f/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index 350c2d4..e09ef78 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -209,4 +209,9 @@ public interface CamelCatalog {
* @throws java.net.URISyntaxException is thrown if there is encoding error
*/
String asEndpointUriXml(String scheme, Map<String, String> properties) throws URISyntaxException;
+
+ /**
+ * Lists all the component summary details in JSon
+ */
+ String listComponentAsJson();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5ef5b04f/platforms/catalog/src/main/java/org/apache/camel/catalog/CatalogHelper.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CatalogHelper.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CatalogHelper.java
index e33b562..2ce8089 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CatalogHelper.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CatalogHelper.java
@@ -98,4 +98,49 @@ public final class CatalogHelper {
}
return false;
}
+
+ /**
+ * Returns the string after the given token
+ *
+ * @param text the text
+ * @param after the token
+ * @return the text after the token, or <tt>null</tt> if text does not contain the token
+ */
+ public static String after(String text, String after) {
+ if (!text.contains(after)) {
+ return null;
+ }
+ return text.substring(text.indexOf(after) + after.length());
+ }
+
+ /**
+ * Returns the string before the given token
+ *
+ * @param text the text
+ * @param before the token
+ * @return the text before the token, or <tt>null</tt> if text does not contain the token
+ */
+ public static String before(String text, String before) {
+ if (!text.contains(before)) {
+ return null;
+ }
+ return text.substring(0, text.indexOf(before));
+ }
+
+ /**
+ * Returns the string between the given tokens
+ *
+ * @param text the text
+ * @param after the before token
+ * @param before the after token
+ * @return the text between the tokens, or <tt>null</tt> if text does not contain the tokens
+ */
+ public static String between(String text, String after, String before) {
+ text = after(text, after);
+ if (text == null) {
+ return null;
+ }
+ return before(text, before);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5ef5b04f/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 1641495..225b04d 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
@@ -732,4 +732,28 @@ public class DefaultCamelCatalog implements CamelCatalog {
return sb.toString();
}
+ @Override
+ public String listComponentAsJson() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("[");
+ List<String> names = findComponentNames();
+ for (int i = 0; i < names.size(); i++) {
+ String scheme = names.get(i);
+ String json = componentJSonSchema(scheme);
+ // skip first line
+ json = CatalogHelper.between(json, "\"component\": {", "\"componentProperties\"");
+ json = json.trim();
+ // skip last comma if not the last
+ if (i == names.size() - 1) {
+ json = json.substring(0, json.length() - 1);
+ }
+ sb.append("\n");
+ sb.append(" {\n");
+ sb.append(" ");
+ sb.append(json);
+ }
+
+ sb.append("\n]");
+ return sb.toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5ef5b04f/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 ab69fed..2f529cb 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
@@ -238,4 +238,10 @@ public class CamelCatalogTest extends TestCase {
assertEquals("jms", name);
}
+ @Test
+ public void testListComponentAsJosn() throws Exception {
+ String json = catalog.listComponentAsJson();
+ assertNotNull(json);
+ }
+
}