You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/04/05 15:09:06 UTC
[cxf] branch master updated: CXF-7702 - Remove methods in
QueryContext that don't use a custom bean class.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new af9ca4f CXF-7702 - Remove methods in QueryContext that don't use a custom bean class.
af9ca4f is described below
commit af9ca4f31a8068e94f5afea6b1506eec909f1ba8
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 5 14:34:22 2018 +0100
CXF-7702 - Remove methods in QueryContext that don't use a custom bean class.
---
.../org/apache/cxf/jaxrs/ext/search/QueryContext.java | 18 ------------------
.../cxf/jaxrs/ext/search/QueryContextProvider.java | 11 ++---------
.../java/org/apache/cxf/systest/jaxrs/BookStore.java | 6 +++---
.../cxf/systest/jaxrs/JAXRSClientServerBookTest.java | 18 ++++++++++++++----
4 files changed, 19 insertions(+), 34 deletions(-)
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContext.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContext.java
index 64dac6d..f6ece6a 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContext.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContext.java
@@ -24,15 +24,6 @@ package org.apache.cxf.jaxrs.ext.search;
public interface QueryContext {
/**
- * Uses {@link SearchBean} and a visitor registered with
- * "search.visitor" contextual property to capture and
- * convert the original expression
- *
- * @return converted search expression
- */
- String getConvertedExpression();
-
- /**
* Uses a custom bean and a visitor registered with
* "search.visitor" contextual property to capture and
* convert the original expression
@@ -51,15 +42,6 @@ public interface QueryContext {
<T, E> E getConvertedExpression(Class<T> beanClass, Class<E> queryClass);
/**
- * Uses {@link SearchBean} and a visitor registered with
- * "search.visitor" contextual property to capture and
- * convert the original expression
- *
- * @return converted search expression
- */
- String getConvertedExpression(String originalExpression);
-
- /**
* Uses a custom bean and a visitor registered with
* "search.visitor" contextual property to capture and
* convert the original expression
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContextProvider.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContextProvider.java
index 1ec0b50..41d8e5f 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContextProvider.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/QueryContextProvider.java
@@ -40,11 +40,6 @@ public class QueryContextProvider implements ContextProvider<QueryContext> {
}
@Override
- public String getConvertedExpression() {
- return getConvertedExpression((String)null);
- }
-
- @Override
public <T> String getConvertedExpression(Class<T> beanClass) {
return getConvertedExpression((String)null, beanClass);
}
@@ -54,15 +49,13 @@ public class QueryContextProvider implements ContextProvider<QueryContext> {
return getConvertedExpression((String)null, beanClass, queryClass);
}
- public String getConvertedExpression(String originalExpression) {
- return getConvertedExpression(originalExpression, SearchBean.class);
- }
-
+ @Override
public <T> String getConvertedExpression(String originalExpression, Class<T> beanClass) {
return getConvertedExpression(originalExpression, beanClass, String.class);
}
+ @Override
public <T, E> E getConvertedExpression(String originalExpression,
Class<T> beanClass,
Class<E> queryClass) {
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index 538b99b..7c5d880 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -1096,7 +1096,7 @@ public class BookStore {
public String getBookQueryContext(@PathParam("expression") String expression,
@Context QueryContext searchContext)
throws BookNotFoundFault {
- return searchContext.getConvertedExpression(expression);
+ return searchContext.getConvertedExpression(expression, Book.class);
}
@GET
@@ -1361,7 +1361,7 @@ public class BookStore {
public Book2 getBookSubResourceInstanceRC(@Context ResourceContext rc) {
return rc.initResource(book2Sub);
}
-
+
@Path("/booksubresource/class/context")
public Class<Book2> getBookSubResourceClass() {
return Book2.class;
@@ -1668,7 +1668,7 @@ public class BookStore {
public BookSubresource getBookFromSubresource() {
return new BookSubresourceImpl();
}
-
+
@POST
@Path("/entityecho")
@Consumes("text/plain")
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index 3fb110c..e63b515 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
@@ -37,6 +37,7 @@ import java.util.List;
import java.util.Map;
import java.util.zip.GZIPInputStream;
+import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.NotAcceptableException;
import javax.ws.rs.ProcessingException;
import javax.ws.rs.ServerErrorException;
@@ -933,7 +934,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
List<Object> cookies = r.getMetadata().get("Set-Cookie");
assertNotNull(cookies);
assertEquals(3, cookies.size());
-
+
boolean hasDummy1 = false;
boolean hasDummy2 = false;
boolean hasJSESSION = false;
@@ -1815,6 +1816,15 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
assertEquals("SELECT * FROM books WHERE id >= '123'", sql);
}
+ @Test (expected = InternalServerErrorException.class)
+ public void testSearchUnknownParameter() throws Exception {
+ String address = "http://localhost:" + PORT
+ + "/bookstore/books/querycontext/id=ge=123%2C1==1";
+
+ WebClient client = WebClient.create(address);
+ client.accept("text/plain");
+ client.get(String.class);
+ }
@Test
public void testGetBook123CGLIB() throws Exception {
@@ -2091,7 +2101,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
Book book = wc.post(new Book("\"Jack\" & \"Jill\"", 123L), Book.class);
assertEquals(123L, book.getId());
assertEquals("\"Jack\" & \"Jill\"", book.getName());
-
+
wc = WebClient.create("http://localhost:" + PORT + "/bookstore/books/element/echo");
wc.type("application/xml").accept("application/xml");
book = wc.post(new Book("Jack & Jill", 123L), Book.class);
@@ -2237,7 +2247,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
String address = "http://localhost:" + PORT + "/bookstore/booksubresource/instance/context/rc";
doTestGetBookWithResourceContext(address);
}
-
+
@Test
public void testGetBookWithResourceContextClass() throws Exception {
String address = "http://localhost:" + PORT + "/bookstore/booksubresource/class/context/rc";
@@ -2503,7 +2513,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
}
}
-
+
@Test
public void testMutipleAcceptHeader() throws Exception {
String endpointAddress =
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.