Repository: olingo-odata4 Updated Branches: refs/heads/master a47e9f6ad -> d1055fd8e
[OLINGO-778] Change operation separator Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/d1055fd8 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/d1055fd8 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/d1055fd8 Branch: refs/heads/master Commit: d1055fd8ef1068036a88d617bd70c90f999a4112 Parents: a47e9f6 Author: Christian Amend <[email protected]> Authored: Wed Dec 16 15:14:04 2015 +0100 Committer: Christian Amend <[email protected]> Committed: Wed Dec 16 15:14:04 2015 +0100 ---------------------------------------------------------------------- .../olingo/client/core/uri/URIBuilderImpl.java | 4 ++-- .../olingo/client/core/uri/URIBuilderTest.java | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1055fd8/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIBuilderImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIBuilderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIBuilderImpl.java index 8950dd5..b29aca6 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIBuilderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIBuilderImpl.java @@ -191,7 +191,7 @@ public class URIBuilderImpl implements URIBuilder { segments.size() == 1 ? SegmentType.UNBOUND_ACTION : SegmentType.BOUND_ACTION, action)); return this; } - + @Override public URIBuilder appendOperationCallSegment(final String operation) { segments.add(new Segment( @@ -385,7 +385,7 @@ public class URIBuilderImpl implements URIBuilder { } protected char getBoundOperationSeparator() { - return '.'; + return '/'; } protected String getOperationInvokeMarker() { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1055fd8/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIBuilderTest.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIBuilderTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIBuilderTest.java index 6f8a363..2af662f 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIBuilderTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIBuilderTest.java @@ -183,12 +183,23 @@ public class URIBuilderTest extends AbstractTest { public void boundAction() throws URISyntaxException { final URIBuilder uriBuilder = getClient().newURIBuilder(SERVICE_ROOT). appendEntitySetSegment("Categories").appendKeySegment(1). - appendNavigationSegment("Products").appendNavigationSegment("Model"). - appendActionCallSegment("AllOrders"); + appendNavigationSegment("Products"). + appendActionCallSegment("Model.AllOrders"); assertEquals(new org.apache.http.client.utils.URIBuilder( SERVICE_ROOT + "/Categories(1)/Products/Model.AllOrders").build(), uriBuilder.build()); } + + @Test + public void boundOperation() throws URISyntaxException { + final URIBuilder uriBuilder = getClient().newURIBuilder(SERVICE_ROOT). + appendEntitySetSegment("Categories").appendKeySegment(1). + appendNavigationSegment("Products"). + appendOperationCallSegment("Model.AllOrders"); + + assertEquals(new org.apache.http.client.utils.URIBuilder( + SERVICE_ROOT + "/Categories(1)/Products/Model.AllOrders()").build(), uriBuilder.build()); + } @Test public void ref() throws URISyntaxException {
