[OLINGO-1497]System Query options no longer working for Function Imports
diff --git a/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/uri/UriParserTest.java b/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/uri/UriParserTest.java
index 21394c1..c654e62 100644
--- a/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/uri/UriParserTest.java
+++ b/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/uri/UriParserTest.java
@@ -40,6 +40,7 @@
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.edm.EdmEntitySet;
import org.apache.olingo.odata2.api.edm.EdmException;
+import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
import org.apache.olingo.odata2.api.edm.EdmTypeKind;
import org.apache.olingo.odata2.api.exception.MessageReference;
@@ -688,6 +689,7 @@
parseWrongUri("MaximalAge/somethingwrong", UriSyntaxException.INVALIDSEGMENT);
parseWrongUri("ManagerPhoto", UriSyntaxException.MISSINGPARAMETER);
parseWrongUri("ManagerPhoto?Id='", UriSyntaxException.UNKNOWNLITERAL);
+ parseWrongUri("OldestEmployee?$filter=EmployeeId%20eq%20%271%27", UriSyntaxException.INCOMPATIBLESYSTEMQUERYOPTION);
}
@Test
@@ -768,6 +770,12 @@
assertNotNull(result.getFilter());
assertNotNull(result.getOrderBy());
assertEquals("EmployeeName desc", result.getOrderBy().getUriLiteral());
+
+ result = parse("EmployeeSearch?$filter=EmployeeId%20eq%20%271%27");
+ assertEquals("Employee", result.getFunctionImport().getReturnType().getType().getName());
+ assertEquals(EdmMultiplicity.MANY, result.getFunctionImport().getReturnType().getMultiplicity());
+ assertEquals(UriType.URI10a, result.getUriType());
+ assertNotNull(result.getFilter());
}
@Test(expected=UriSyntaxException.class)
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java
index 3a0772f..9827c11 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java
@@ -84,7 +84,9 @@
/**
* Function import returning an entity set
*/
- URI10a(SystemQueryOption.$format),
+ URI10a(SystemQueryOption.$format, SystemQueryOption.$filter, SystemQueryOption.$inlinecount,
+ SystemQueryOption.$orderby, SystemQueryOption.$skiptoken, SystemQueryOption.$skip, SystemQueryOption.$top,
+ SystemQueryOption.$expand, SystemQueryOption.$select),
/**
* Function import returning a collection of complex-type instances
*/
