Repository: olingo-odata4 Updated Branches: refs/heads/master 56a5b08a7 -> 8bb1f0bde
Small fix Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8bb1f0bd Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8bb1f0bd Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8bb1f0bd Branch: refs/heads/master Commit: 8bb1f0bde38125d415b440063070ff6b701a7925 Parents: 56a5b08 Author: Francesco Chicchiriccò <[email protected]> Authored: Thu May 8 14:32:33 2014 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Thu May 8 14:32:33 2014 +0200 ---------------------------------------------------------------------- .../org/apache/olingo/fit/v4/QueryOptionsTestITCase.java | 3 ++- .../org/apache/olingo/client/api/uri/v4/SearchFactory.java | 2 +- .../java/org/apache/olingo/client/core/v4/LiteralSearch.java | 8 +++----- .../org/apache/olingo/client/core/v4/SearchFactoryImpl.java | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8bb1f0bd/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java index 7960376..44e860c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java @@ -214,9 +214,10 @@ public class QueryOptionsTestITCase extends AbstractTestITCase { @Test public void search() { - final URIBuilder builder = client.getURIBuilder(testStaticServiceRootURL). + final URIBuilder builder = client.getURIBuilder("http://odatae2etest.azurewebsites.net/javatest/DefaultService";). appendEntitySetSegment("People").search(client.getSearchFactory(). or(client.getSearchFactory().literal("Bob"), client.getSearchFactory().literal("Jill"))); + final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().getEntitySetRequest(builder.build()); final ODataRetrieveResponse<ODataEntitySet> res = req.execute(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8bb1f0bd/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/SearchFactory.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/SearchFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/SearchFactory.java index 55c96a7..61689e1 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/SearchFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/SearchFactory.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.uri.v4; public interface SearchFactory { - URISearch literal(Object value); + URISearch literal(String value); URISearch and(URISearch left, URISearch right); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8bb1f0bd/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/LiteralSearch.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/LiteralSearch.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/LiteralSearch.java index dc5bb72..011698c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/LiteralSearch.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/LiteralSearch.java @@ -19,19 +19,17 @@ package org.apache.olingo.client.core.v4; import org.apache.olingo.client.api.uri.v4.URISearch; -import org.apache.olingo.client.core.uri.URIUtils; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class LiteralSearch implements URISearch { - private final Object value; + private final String value; - LiteralSearch(final Object value) { + LiteralSearch(final String value) { this.value = value; } @Override public String build() { - return URIUtils.escape(ODataServiceVersion.V40, value); + return value; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8bb1f0bd/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/SearchFactoryImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/SearchFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/SearchFactoryImpl.java index 37adbda..e37c05e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/SearchFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/SearchFactoryImpl.java @@ -24,7 +24,7 @@ import org.apache.olingo.client.api.uri.v4.URISearch; public class SearchFactoryImpl implements SearchFactory { @Override - public URISearch literal(final Object value) { + public URISearch literal(final String value) { return new LiteralSearch(value); }
