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/11 11:15:37 UTC
[1/2] camel git commit: Camel catalog recent commits no need for this
anymore.
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 08f531413 -> f4e95d15a
refs/heads/master ad33d9e4f -> 0e1e821c1
Camel catalog recent commits no need for this anymore.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0e1e821c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0e1e821c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0e1e821c
Branch: refs/heads/master
Commit: 0e1e821c1992522da0a37c1fd2e4e85a4581c693
Parents: ad33d9e
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Nov 11 11:18:31 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Nov 11 11:18:31 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/catalog/DefaultCamelCatalog.java | 2 --
.../src/test/java/org/apache/camel/catalog/CamelCatalogTest.java | 3 +++
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0e1e821c/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 01766fc..047167b 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
@@ -761,8 +761,6 @@ 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, encode);
- // 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/0e1e821c/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 f9a7c66..e467ecc 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
@@ -201,6 +201,9 @@ public class CamelCatalogTest {
map.put("converter", "#myConverter");
String uri = catalog.asEndpointUri("xslt", map, true);
+ assertEquals("xslt:foo.xslt?converter=%23myConverter", uri);
+
+ uri = catalog.asEndpointUri("xslt", map, false);
assertEquals("xslt:foo.xslt?converter=#myConverter", uri);
}
[2/2] camel git commit: Camel catalog recent commits no need for this
anymore.
Posted by da...@apache.org.
Camel catalog recent commits no need for this anymore.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f4e95d15
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f4e95d15
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f4e95d15
Branch: refs/heads/camel-2.16.x
Commit: f4e95d15a0fd023eb3d6c4cfc15cf3c389eb38d6
Parents: 08f5314
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Nov 11 11:18:31 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Nov 11 11:18:58 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/catalog/DefaultCamelCatalog.java | 2 --
.../src/test/java/org/apache/camel/catalog/CamelCatalogTest.java | 3 +++
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f4e95d15/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 01766fc..047167b 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
@@ -761,8 +761,6 @@ 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, encode);
- // 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/f4e95d15/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 f9a7c66..e467ecc 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
@@ -201,6 +201,9 @@ public class CamelCatalogTest {
map.put("converter", "#myConverter");
String uri = catalog.asEndpointUri("xslt", map, true);
+ assertEquals("xslt:foo.xslt?converter=%23myConverter", uri);
+
+ uri = catalog.asEndpointUri("xslt", map, false);
assertEquals("xslt:foo.xslt?converter=#myConverter", uri);
}