You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2014/02/13 14:02:36 UTC
svn commit: r1567912 - in /cxf/trunk/rt/rs/extensions/search/src:
main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
Author: reta
Date: Thu Feb 13 13:02:35 2014
New Revision: 1567912
URL: http://svn.apache.org/r1567912
Log:
[CXF-5430]: Added initial support for OData 2.0 query language. Covered most of advanced use cases (JPA)
Modified:
cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
Modified: cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java?rev=1567912&r1=1567911&r2=1567912&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java (original)
+++ cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java Thu Feb 13 13:02:35 2014
@@ -175,8 +175,8 @@ public class ODataParser<T> extends Abst
property.typeInfo.getGenericType(), conditionType, condition, checkInfo);
}
- return new PrimitiveSearchCondition< T >(property.propertyName,
- typedValue, conditionType, condition);
+ return new PrimitiveSearchCondition< T >(property.propertyName, typedValue,
+ property.typeInfo.getGenericType(), conditionType, condition);
}
@Override
Modified: cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java?rev=1567912&r1=1567911&r2=1567912&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java (original)
+++ cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java Thu Feb 13 13:02:35 2014
@@ -28,7 +28,6 @@ import javax.persistence.Tuple;
import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
import org.apache.cxf.jaxrs.ext.search.odata.ODataParser;
-import org.junit.Ignore;
import org.junit.Test;
public class JPATypedQueryVisitorODataTest extends AbstractJPATypedQueryVisitorTest {
@@ -53,28 +52,28 @@ public class JPATypedQueryVisitorODataTe
assertTrue(10 == books.get(0).getId() && "num10".equals(books.get(0).getBookTitle()));
}
- @Test @Ignore("Fixing, in progress")
+ @Test
public void testQueryCollection() throws Exception {
List<Book> books =
queryBooks("reviews.authors eq 'Ted'");
assertEquals(3, books.size());
}
- @Test @Ignore("Fixing, in progress")
+ @Test
public void testQueryCollection2() throws Exception {
List<Book> books =
queryBooks("reviews.book.id eq 10");
assertEquals(1, books.size());
}
- @Test @Ignore("Fixing, in progress")
+ @Test
public void testQueryCollection3() throws Exception {
List<Book> books =
queryBooks("reviews.book.ownerInfo.name eq 'Barry'");
assertEquals(1, books.size());
}
- @Test @Ignore("Fixing, in progress")
+ @Test
public void testQueryElementCollection() throws Exception {
List<Book> books =
queryBooks("authors eq 'John'");
@@ -95,14 +94,14 @@ public class JPATypedQueryVisitorODataTe
assertEquals(0, books.size());
}
- @Test @Ignore("Fixing, in progress")
+ @Test
public void testQueryCollectionSize2() throws Exception {
List<Book> books =
queryBooks("reviews.authors gt 0");
assertEquals(3, books.size());
}
- @Test @Ignore("Fixing, in progress")
+ @Test
public void testAndQueryCollection() throws Exception {
List<Book> books =
queryBooks("id eq 10 and authors eq 'John' and reviews.review eq 'good' and reviews.authors eq 'Ted'");