camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] camel git commit: Camel catalog recent commits no need for this anymore.
Date Wed, 11 Nov 2015 10:15:38 GMT
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 <davsclaus@apache.org>
Authored: Wed Nov 11 11:18:31 2015 +0100
Committer: Claus Ibsen <davsclaus@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);
     }
 


Mime
View raw message