Skip to content
Permalink
Browse files
[CXF-5430]: Added initial support for OData 2.0 query language. Added…
… JAX-RS test case to verify custom parser and $filter query string

git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1569150 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Andriy Redko committed Feb 18, 2014
1 parent 951584f commit 252626fff32596dccce59c8044bd32136dedda12
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 2 deletions.
@@ -61,6 +61,10 @@
<artifactId>javax.el</artifactId>
<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>
@@ -45,8 +45,20 @@

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 @@ protected void run() {
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);
@@ -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);

}
}

0 comments on commit 252626f

Please sign in to comment.