svn commit: r1569150 - in /cxf/trunk/systests/jaxrs: pom.xml src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java

[re...@apache.org]

Author: reta
Date: Tue Feb 18 00:29:53 2014
New Revision: 1569150

URL: http://svn.apache.org/r1569150
Log:
[CXF-5430]: Added initial support for OData 2.0 query language. Added JAX-RS test case to verify custom parser and $filter query string

Added:
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java
Modified:
    cxf/trunk/systests/jaxrs/pom.xml
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java

Modified: cxf/trunk/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/pom.xml?rev=1569150&r1=1569149&r2=1569150&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/pom.xml (original)
+++ cxf/trunk/systests/jaxrs/pom.xml Tue Feb 18 00:29:53 2014
@@ -62,6 +62,10 @@
             <version>${cxf.glassfish.el.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.olingo</groupId>
+            <artifactId>olingo-odata2-core-incubating</artifactId>
+        </dependency>
+        <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
         </dependency>

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java?rev=1569150&r1=1569149&r2=1569150&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java Tue Feb 18 00:29:53 2014
@@ -45,8 +45,20 @@ import org.apache.cxf.testutil.common.Ab
     
 public class BookServer extends AbstractBusTestServerBase {
     public static final String PORT = allocatePort(BookServer.class);
- 
-    org.apache.cxf.endpoint.Server server; 
+     
+    org.apache.cxf.endpoint.Server server;
+    private Map< ? extends String, ? extends Object > properties;
+    
+    public BookServer() {
+        this(Collections.< String, Object >emptyMap());
+    }
+    
+    /**
+     * Allow to specified custom contextual properties to be passed to factory bean
+     */
+    public BookServer(final Map< ? extends String, ? extends Object > properties) {
+        this.properties = properties;
+    }
     
     protected void run() {
         Bus bus = BusFactory.getDefaultBus();
@@ -97,6 +109,7 @@ public class BookServer extends Abstract
         sf.getProperties().put("search.visitor", new SQLPrinterVisitor<SearchBean>("books"));
         sf.getProperties().put("org.apache.cxf.http.header.split", true);
         sf.getProperties().put("default.content.type", "*/*");
+        sf.getProperties().putAll(properties);
         server = sf.create();
         BusFactory.setDefaultBus(null);
         BusFactory.setThreadDefaultBus(null);

Added: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java?rev=1569150&view=auto
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java (added)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java Tue Feb 18 00:29:53 2014
@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.jaxrs.ext.search.odata.ODataParser;
+import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class JAXRSClientServerODataSearchTest extends AbstractBusClientServerTestBase {
+    public static final String PORT = BookServer.PORT;
+    
+    @BeforeClass
+    public static void startServers() throws Exception {
+        final Map< String, Object > properties = new HashMap< String, Object >();        
+        properties.put("search.query.parameter.name", "$filter");
+        properties.put("search.parser", new ODataParser< Book >(Book.class));
+        
+        AbstractResourceInfo.clearAllMaps();
+        assertTrue("server did not launch correctly", launchServer(new BookServer(properties)));
+        createStaticBus();
+    }
+        
+    @Test
+    public void testSearchBook123WithWebClient() throws Exception {
+        String address = "http://localhost:" + PORT + "/bookstore/books/search";
+                          
+        WebClient client = WebClient.create(address);
+        Book b = client.query("$filter", "name eq 'CXF*' and id ge 123 and id lt 124").get(Book.class);
+        assertEquals(b.getId(), 123L);
+        
+    }
+}