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 2014/09/29 08:32:23 UTC
[1/4] git commit: Case when uri has fragment and does not have query
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x daeb5595b -> 383cce536
refs/heads/camel-2.14.x 4b9eb985b -> 9b1125b9f
refs/heads/master 61b56ee94 -> bcc37d427
Case when uri has fragment and does not have query
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/038470d2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/038470d2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/038470d2
Branch: refs/heads/master
Commit: 038470d23fb6c7eb385c486080def7477d7c876c
Parents: 17bb643
Author: Vitaly Lavrov <la...@osinka.ru>
Authored: Mon Sep 8 21:11:02 2014 +0400
Committer: Vitaly Lavrov <la...@osinka.ru>
Committed: Mon Sep 8 21:11:02 2014 +0400
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/util/URISupport.java | 3 +++
.../src/test/java/org/apache/camel/util/URISupportTest.java | 7 +++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/038470d2/camel-core/src/main/java/org/apache/camel/util/URISupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/URISupport.java b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
index 0f37a2c..607f859 100644
--- a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
@@ -321,6 +321,9 @@ public final class URISupport {
// assemble string as new uri and replace parameters with the query instead
String s = uri.toString();
String before = ObjectHelper.before(s, "?");
+ if (before == null) {
+ before = ObjectHelper.before(s, "#");
+ }
if (before != null) {
s = before;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/038470d2/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java b/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
index 0e6f1b1..cdefcec 100644
--- a/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
@@ -155,6 +155,13 @@ public class URISupportTest extends ContextTestSupport {
assertEquals("smtp://localhost#fragmentOne", resultUri.toString());
}
+ public void testCreateURIWithQueryHasOneFragmentAndQueryParameter() throws Exception {
+ URI uri = new URI("smtp://localhost#fragmentOne");
+ URI resultUri = URISupport.createURIWithQuery(uri, "utm_campaign=launch");
+ assertNotNull(resultUri);
+ assertEquals("smtp://localhost?utm_campaign=launch#fragmentOne", resultUri.toString());
+ }
+
public void testNormalizeEndpointWithEqualSignInParameter() throws Exception {
String out = URISupport.normalizeUri("jms:queue:foo?selector=somekey='somevalue'&foo=bar");
assertNotNull(out);
[2/4] git commit: Merge branch 'master' of
https://github.com/lavrov/camel
Posted by da...@apache.org.
Merge branch 'master' of https://github.com/lavrov/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bcc37d42
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bcc37d42
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bcc37d42
Branch: refs/heads/master
Commit: bcc37d4272d87d5a3f912950d5d68a7625e8c03c
Parents: 61b56ee 038470d
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Sep 29 08:18:39 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Sep 29 08:18:39 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/util/URISupport.java | 3 +++
.../src/test/java/org/apache/camel/util/URISupportTest.java | 7 +++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
[4/4] git commit: Case when uri has fragment and does not have query
Posted by da...@apache.org.
Case when uri has fragment and does not have query
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/383cce53
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/383cce53
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/383cce53
Branch: refs/heads/camel-2.12.x
Commit: 383cce5364ba209a97bf7b554d9e51d6a31bbf9d
Parents: daeb559
Author: Vitaly Lavrov <la...@osinka.ru>
Authored: Mon Sep 8 21:11:02 2014 +0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Sep 29 08:32:14 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/util/URISupport.java | 3 +++
.../src/test/java/org/apache/camel/util/URISupportTest.java | 7 +++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/383cce53/camel-core/src/main/java/org/apache/camel/util/URISupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/URISupport.java b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
index 0f37a2c..607f859 100644
--- a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
@@ -321,6 +321,9 @@ public final class URISupport {
// assemble string as new uri and replace parameters with the query instead
String s = uri.toString();
String before = ObjectHelper.before(s, "?");
+ if (before == null) {
+ before = ObjectHelper.before(s, "#");
+ }
if (before != null) {
s = before;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/383cce53/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java b/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
index 0e6f1b1..cdefcec 100644
--- a/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
@@ -155,6 +155,13 @@ public class URISupportTest extends ContextTestSupport {
assertEquals("smtp://localhost#fragmentOne", resultUri.toString());
}
+ public void testCreateURIWithQueryHasOneFragmentAndQueryParameter() throws Exception {
+ URI uri = new URI("smtp://localhost#fragmentOne");
+ URI resultUri = URISupport.createURIWithQuery(uri, "utm_campaign=launch");
+ assertNotNull(resultUri);
+ assertEquals("smtp://localhost?utm_campaign=launch#fragmentOne", resultUri.toString());
+ }
+
public void testNormalizeEndpointWithEqualSignInParameter() throws Exception {
String out = URISupport.normalizeUri("jms:queue:foo?selector=somekey='somevalue'&foo=bar");
assertNotNull(out);
[3/4] git commit: Case when uri has fragment and does not have query
Posted by da...@apache.org.
Case when uri has fragment and does not have query
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9b1125b9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9b1125b9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9b1125b9
Branch: refs/heads/camel-2.14.x
Commit: 9b1125b9f54c35d2fcdcc8153986b5ed552f6073
Parents: 4b9eb98
Author: Vitaly Lavrov <la...@osinka.ru>
Authored: Mon Sep 8 21:11:02 2014 +0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Sep 29 08:31:33 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/util/URISupport.java | 3 +++
.../src/test/java/org/apache/camel/util/URISupportTest.java | 7 +++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9b1125b9/camel-core/src/main/java/org/apache/camel/util/URISupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/URISupport.java b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
index 0f37a2c..607f859 100644
--- a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
@@ -321,6 +321,9 @@ public final class URISupport {
// assemble string as new uri and replace parameters with the query instead
String s = uri.toString();
String before = ObjectHelper.before(s, "?");
+ if (before == null) {
+ before = ObjectHelper.before(s, "#");
+ }
if (before != null) {
s = before;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9b1125b9/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java b/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
index 0e6f1b1..cdefcec 100644
--- a/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
@@ -155,6 +155,13 @@ public class URISupportTest extends ContextTestSupport {
assertEquals("smtp://localhost#fragmentOne", resultUri.toString());
}
+ public void testCreateURIWithQueryHasOneFragmentAndQueryParameter() throws Exception {
+ URI uri = new URI("smtp://localhost#fragmentOne");
+ URI resultUri = URISupport.createURIWithQuery(uri, "utm_campaign=launch");
+ assertNotNull(resultUri);
+ assertEquals("smtp://localhost?utm_campaign=launch#fragmentOne", resultUri.toString());
+ }
+
public void testNormalizeEndpointWithEqualSignInParameter() throws Exception {
String out = URISupport.normalizeUri("jms:queue:foo?selector=somekey='somevalue'&foo=bar");
assertNotNull(out);