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 08:53:42 UTC
[1/5] camel git commit: Add version to camel-catalog api
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 79081600b -> 73ef3c6d4
refs/heads/camel-2.16.x 8425e975d -> 3a56fa8f6
refs/heads/master ea6f85025 -> c483e0505
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/23daa099
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/23daa099
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/23daa099
Branch: refs/heads/master
Commit: 23daa09946bf1f4664c9a4998fc0c57c7a61b8c6
Parents: 03c25ca
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 08:54:42 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/23daa099/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/23daa099/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/23daa099/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/23daa099/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();
[5/5] camel git commit: CAMEL-9233 fix Exchange is added as parameter
for the TypeConverter
Posted by da...@apache.org.
CAMEL-9233 fix
Exchange is added as parameter for the TypeConverter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/73ef3c6d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/73ef3c6d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/73ef3c6d
Branch: refs/heads/camel-2.15.x
Commit: 73ef3c6d46eef0b23c06b226af4ce1bf1e9949ab
Parents: 7908160
Author: rendesg <ga...@gmail.com>
Authored: Sat Oct 17 21:38:40 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Oct 18 08:56:08 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/73ef3c6d/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
index 884c608..f3bb63b 100644
--- a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
+++ b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
@@ -55,7 +55,7 @@ public class ZipFileDataFormat implements DataFormat {
ZipOutputStream zos = new ZipOutputStream(stream);
zos.putNextEntry(new ZipEntry(filename));
- InputStream is = exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, graph);
+ InputStream is = exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, exchange, graph);
try {
IOHelper.copy(is, zos);
[2/5] camel git commit: CAMEL-9233 fix Exchange is added as parameter
for the TypeConverter
Posted by da...@apache.org.
CAMEL-9233 fix
Exchange is added as parameter for the TypeConverter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/03c25ca7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/03c25ca7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/03c25ca7
Branch: refs/heads/master
Commit: 03c25ca7060c0f072d22f27789e485eda732ea55
Parents: ea6f850
Author: rendesg <ga...@gmail.com>
Authored: Sat Oct 17 21:38:40 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Oct 18 08:54:42 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/03c25ca7/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
index 1dd79e7..e5cffac 100644
--- a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
+++ b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
@@ -58,7 +58,7 @@ public class ZipFileDataFormat extends ServiceSupport implements DataFormat, Dat
ZipOutputStream zos = new ZipOutputStream(stream);
zos.putNextEntry(new ZipEntry(filename));
- InputStream is = exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, graph);
+ InputStream is = exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, exchange, graph);
try {
IOHelper.copy(is, zos);
[4/5] camel git commit: CAMEL-9233 fix Exchange is added as parameter
for the TypeConverter
Posted by da...@apache.org.
CAMEL-9233 fix
Exchange is added as parameter for the TypeConverter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3a56fa8f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3a56fa8f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3a56fa8f
Branch: refs/heads/camel-2.16.x
Commit: 3a56fa8f66ca07d796462eb36a531079f8c88178
Parents: 8425e97
Author: rendesg <ga...@gmail.com>
Authored: Sat Oct 17 21:38:40 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Oct 18 08:55:45 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3a56fa8f/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
index 1dd79e7..e5cffac 100644
--- a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
+++ b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
@@ -58,7 +58,7 @@ public class ZipFileDataFormat extends ServiceSupport implements DataFormat, Dat
ZipOutputStream zos = new ZipOutputStream(stream);
zos.putNextEntry(new ZipEntry(filename));
- InputStream is = exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, graph);
+ InputStream is = exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, exchange, graph);
try {
IOHelper.copy(is, zos);
[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/c483e050
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c483e050
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c483e050
Branch: refs/heads/master
Commit: c483e050563ed44030a7cc1ad83969165560dd4d
Parents: 23daa09
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 08:54:43 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/c483e050/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/c483e050/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/c483e050/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/c483e050/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);
+ }
+
}