Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-846] Trim query option values

This commit is contained in:
Christian Amend 2016-03-18 14:59:00 +01:00
parent e5d1e823c5
commit 570f4317ce
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java
View File

@ -48,7 +48,8 @@ public class UriDecoder {
for (final String option : split(queryOptionString, '&')) { for (final String option : split(queryOptionString, '&')) {
final int pos = option.indexOf('='); final int pos = option.indexOf('=');
final String name = pos >= 0 ? option.substring(0, pos) : option; final String name = pos >= 0 ? option.substring(0, pos) : option;
final String text = pos >= 0 ? option.substring(pos + 1) : ""; //OLINGO-846 We trim the query option text to be more lenient to wrong uri constructors
final String text = pos >= 0 ? option.substring(pos + 1).trim() : "";
queryOptions.add(new CustomQueryOptionImpl() queryOptions.add(new CustomQueryOptionImpl()
.setName(decode(name)) .setName(decode(name))
.setText(decode(text))); .setText(decode(text)));

15
lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java
View File

@ -57,6 +57,17 @@ public class TestFullResourcePath {
private final TestUriValidator testUri = new TestUriValidator().setEdm(edm); private final TestUriValidator testUri = new TestUriValidator().setEdm(edm);
private final FilterValidator testFilter = new FilterValidator().setEdm(edm); private final FilterValidator testFilter = new FilterValidator().setEdm(edm);
@Test
public void trimQueryOptionsValue() throws Exception {
// OLINGO-846 trim query option value
testUri.run("ESAllPrim", "$filter= PropertyInt16 eq 12 ")
.isKind(UriInfoKind.resource).goPath()
.first().isEntitySet("ESAllPrim");
// OLINGO-846 trim query option value
testUri.run("ESAllPrim", "$filter= PropertyInt16 eq 12 ")
.isKind(UriInfoKind.resource).goFilter().isBinary(BinaryOperatorKind.EQ).is("<<PropertyInt16> eq <12>>");
}
@Test @Test
public void valueOnNonMediaEntity() throws Exception { public void valueOnNonMediaEntity() throws Exception {
testUri.runEx("ESAllPrim/$value").isExSemantic(UriParserSemanticException.MessageKeys.ONLY_FOR_TYPED_PARTS); testUri.runEx("ESAllPrim/$value").isExSemantic(UriParserSemanticException.MessageKeys.ONLY_FOR_TYPED_PARTS);
@ -952,14 +963,14 @@ public class TestFullResourcePath {
"$expand=ESTwoPrim") "$expand=ESTwoPrim")
.goExpand() .goExpand()
.first().goPath().first().isEntitySet("ESTwoPrim"); .first().goPath().first().isEntitySet("ESTwoPrim");
testUri.run("$crossjoin(ESTwoPrim,ESAllPrim)", testUri.run("$crossjoin(ESTwoPrim,ESAllPrim)",
"$expand=ESTwoPrim,ESAllPrim") "$expand=ESTwoPrim,ESAllPrim")
.goExpand() .goExpand()
.first().goPath().first().isEntitySet("ESTwoPrim") .first().goPath().first().isEntitySet("ESTwoPrim")
.goUpExpandValidator().next().goPath().first().isEntitySet("ESAllPrim"); .goUpExpandValidator().next().goPath().first().isEntitySet("ESAllPrim");
//TODO: Once crossjoin is implemented these tests should no longer result in errors // TODO: Once crossjoin is implemented these tests should no longer result in errors
// testUri.run("$crossjoin(ESTwoPrim,ESAllPrim)", // testUri.run("$crossjoin(ESTwoPrim,ESAllPrim)",
// "$expand=ESAllPrim/NavPropertyETTwoPrimOne") // "$expand=ESAllPrim/NavPropertyETTwoPrimOne")
// .goExpand() // .goExpand()