You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/02/11 14:28:04 UTC
svn commit: r1567115 - in /cxf/trunk/rt/rs/extensions/search/src: main/java/org/apache/cxf/jaxrs/ext/search/odata/ test/java/org/apache/cxf/jaxrs/ext/search/odata/

Author: sergeyb
Date: Tue Feb 11 13:28:04 2014
New Revision: 1567115

URL: http://svn.apache.org/r1567115
Log:
[CXF-5430] Renaming OData2Parser to ODataParser for now

Added:
    cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
      - copied, changed from r1567073, cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/OData2Parser.java
    cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java
      - copied, changed from r1567073, cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/OData2ParserTest.java
Removed:
    cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/OData2Parser.java
    cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/OData2ParserTest.java

Copied: cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java (from r1567073, cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/OData2Parser.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?p2=cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java&p1=cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/OData2Parser.java&r1=1567073&r2=1567115&rev=1567115&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/OData2Parser.java (original)
+++ cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java Tue Feb 11 13:28:04 2014
@@ -54,7 +54,7 @@ import org.apache.olingo.odata2.api.uri.
 import org.apache.olingo.odata2.core.uri.expression.FilterParser;
 import org.apache.olingo.odata2.core.uri.expression.FilterParserImpl;
 
-public class OData2Parser<T> extends AbstractSearchConditionParser<T> {
+public class ODataParser<T> extends AbstractSearchConditionParser<T> {
     private final FilterParser parser;
     
     private static class TypedProperty {
@@ -235,7 +235,7 @@ public class OData2Parser<T> extends Abs
      *            accessible no-arguments constructor and complementary setters to these used in 
      *            OData 2.0 $filter expressions.
      */
-    public OData2Parser(final Class< T > conditionClass) {    
+    public ODataParser(final Class< T > conditionClass) {    
         super(conditionClass);
         this.parser = new FilterParserImpl(null);
     }

Copied: cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java (from r1567073, cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/OData2ParserTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java?p2=cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java&p1=cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/OData2ParserTest.java&r1=1567073&r2=1567115&rev=1567115&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/OData2ParserTest.java (original)
+++ cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParserTest.java Tue Feb 11 13:28:04 2014
@@ -20,12 +20,13 @@ package org.apache.cxf.jaxrs.ext.search.
 
 import org.apache.cxf.jaxrs.ext.search.SearchCondition;
 import org.apache.cxf.jaxrs.ext.search.SearchParseException;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public class OData2ParserTest extends Assert {
-    private OData2Parser<Person> parser;
+public class ODataParserTest extends Assert {
+    private ODataParser<Person> parser;
 
     public static class Person {
         private String firstName;
@@ -72,7 +73,7 @@ public class OData2ParserTest extends As
 
     @Before
     public void setUp() {
-        parser = new OData2Parser<Person>(Person.class);
+        parser = new ODataParser<Person>(Person.class);
     }
 
     @Test
@@ -95,6 +96,7 @@ public class OData2ParserTest extends As
             parser.parse("FirstName eq 'Tom' or FirstName eq 'Peter' and LastName eq 'Bombadil'");
         assertTrue(filter.isMet(new Person("Tom", "Bombadil")));
         assertTrue(filter.isMet(new Person("Peter", "Bombadil")));
+        assertFalse(filter.isMet(new Person("Barry", "Bombadil")));
     }
     
     @Test