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/11/09 15:29:07 UTC
[1/2] camel git commit: Camel catalog should output endpoint uri
where # notation is preserved
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x f4137661e -> 675b780fa
refs/heads/master 8517f85a5 -> cfb3c1dcc
Camel catalog should output endpoint uri where # notation is preserved
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cfb3c1dc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cfb3c1dc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cfb3c1dc
Branch: refs/heads/master
Commit: cfb3c1dccddbebca13804b6a51563e50d49312b5
Parents: 8517f85
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Nov 9 15:32:11 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Nov 9 15:32:11 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/catalog/DefaultCamelCatalog.java | 2 ++
.../java/org/apache/camel/catalog/CamelCatalogTest.java | 11 +++++++++++
2 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cfb3c1dc/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 41b07fa..2471bb7 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
@@ -758,6 +758,8 @@ public class DefaultCamelCatalog implements CamelCatalog {
// the last option may already contain a ? char, if so we should use & instead of ?
sb.append(hasQuestionmark ? ampersand : '?');
String query = createQueryString(copy, ampersand);
+ // we do not want to use %23 for # syntax
+ query = query.replaceAll("\\=\\%23", "=#");
sb.append(query);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/cfb3c1dc/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 b2f7861..4bc8fee 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
@@ -180,6 +180,17 @@ public class CamelCatalogTest {
assertEquals("timer:foo?period=5000", uri);
}
+
+ @Test
+ public void testAsEndpointUriBeanLookup() throws Exception {
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("resourceUri", "foo.xslt");
+ map.put("converter", "#myConverter");
+
+ String uri = catalog.asEndpointUri("xslt", map);
+ assertEquals("xslt:foo.xslt?converter=#myConverter", uri);
+ }
+
@Test
public void testAsEndpointUriMapJmsRequiredOnly() throws Exception {
Map<String, String> map = new HashMap<String, String>();
[2/2] camel git commit: Camel catalog should output endpoint uri
where # notation is preserved
Posted by da...@apache.org.
Camel catalog should output endpoint uri where # notation is preserved
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/675b780f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/675b780f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/675b780f
Branch: refs/heads/camel-2.16.x
Commit: 675b780fa6d9f5849cfa4f37aba206ed740f3dee
Parents: f413766
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Nov 9 15:32:11 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Nov 9 15:32:28 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/catalog/DefaultCamelCatalog.java | 2 ++
.../java/org/apache/camel/catalog/CamelCatalogTest.java | 11 +++++++++++
2 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/675b780f/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 41b07fa..2471bb7 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
@@ -758,6 +758,8 @@ public class DefaultCamelCatalog implements CamelCatalog {
// the last option may already contain a ? char, if so we should use & instead of ?
sb.append(hasQuestionmark ? ampersand : '?');
String query = createQueryString(copy, ampersand);
+ // we do not want to use %23 for # syntax
+ query = query.replaceAll("\\=\\%23", "=#");
sb.append(query);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/675b780f/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 b2f7861..4bc8fee 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
@@ -180,6 +180,17 @@ public class CamelCatalogTest {
assertEquals("timer:foo?period=5000", uri);
}
+
+ @Test
+ public void testAsEndpointUriBeanLookup() throws Exception {
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("resourceUri", "foo.xslt");
+ map.put("converter", "#myConverter");
+
+ String uri = catalog.asEndpointUri("xslt", map);
+ assertEquals("xslt:foo.xslt?converter=#myConverter", uri);
+ }
+
@Test
public void testAsEndpointUriMapJmsRequiredOnly() throws Exception {
Map<String, String> map = new HashMap<String, String>();