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 2008/12/02 11:20:55 UTC
svn commit: r722412 - in /cxf/trunk:
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/
rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/
rt/frontend/jaxrs/src/test/java/org/apache...
Author: sergeyb
Date: Tue Dec 2 02:20:54 2008
New Revision: 722412
URL: http://svn.apache.org/viewvc?rev=722412&view=rev
Log:
JAXRS : fixing issues with the lists of HTTP header values
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java?rev=722412&r1=722411&r2=722412&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java Tue Dec 2 02:20:54 2008
@@ -74,12 +74,14 @@
public MultivaluedMap<String, String> getRequestHeaders() {
// should we really worry about immutability given that the Message does not ?
MultivaluedMap<String, String> map = new MetadataMap<String, String>();
- map.putAll(headers);
+ for (String key : headers.keySet()) {
+ map.put(key, getRequestHeader(key));
+ }
return map;
}
public List<Locale> getAcceptableLanguages() {
- List<String> values = getRequestHeader(HttpHeaders.ACCEPT_LANGUAGE);
+ List<String> values = headers.get(HttpHeaders.ACCEPT_LANGUAGE);
if (values == null || values.isEmpty()) {
return Collections.emptyList();
}
@@ -113,7 +115,16 @@
}
public List<String> getRequestHeader(String name) {
- return headers.get(name);
+ List<String> values = headers.get(name);
+ if (values == null || values.isEmpty()) {
+ return Collections.emptyList();
+ }
+ List<String> hValues = new ArrayList<String>();
+ String[] ls = values.get(0).split(",");
+ for (String s : ls) {
+ hValues.add(s.trim());
+ }
+ return hValues;
}
private static class AcceptLanguageComparator implements Comparator<Locale> {
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java?rev=722412&r1=722411&r2=722412&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java Tue Dec 2 02:20:54 2008
@@ -32,7 +32,6 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -550,21 +549,23 @@
}
@SuppressWarnings("unchecked")
- private static Object processHeaderParam(Message m, String header,
- Class<?> pClass, Type genericType, String defaultValue) {
- Map<String, List<String>> headers = (Map<String, List<String>>)m.get(Message.PROTOCOL_HEADERS);
- List<String> values = headers.get(header);
- StringBuilder sb = new StringBuilder();
- if (values != null) {
- for (Iterator<String> it = values.iterator(); it.hasNext();) {
- sb.append(it.next());
- if (it.hasNext()) {
- sb.append(',');
- }
- }
- }
- return sb.length() > 0 ? InjectionUtils.handleParameter(sb.toString(), pClass, false)
- : defaultValue;
+ private static Object processHeaderParam(Message m,
+ String header,
+ Class<?> pClass,
+ Type genericType,
+ String defaultValue) {
+
+ List<String> values = new HttpHeadersImpl(m).getRequestHeader(header);
+
+ return InjectionUtils.createParameterObject(values,
+ pClass,
+ genericType,
+ defaultValue,
+ false,
+ false,
+ false);
+
+
}
@SuppressWarnings("unchecked")
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java?rev=722412&r1=722411&r2=722412&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java Tue Dec 2 02:20:54 2008
@@ -237,7 +237,8 @@
@Context Request r,
@Context SecurityContext s,
@Context Providers workers,
- @HeaderParam("Foo") String h) {
+ @HeaderParam("Foo") String h,
+ @HeaderParam("Foo") List<String> l) {
// complete
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java?rev=722412&r1=722411&r2=722412&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java Tue Dec 2 02:20:54 2008
@@ -52,11 +52,31 @@
control.replay();
HttpHeaders h = new HttpHeadersImpl(m);
MultivaluedMap<String, String> hs = h.getRequestHeaders();
- assertEquals(hs.getFirst("Accept"), "text/*");
+ List<String> acceptValues = hs.get("Accept");
+ assertEquals("text/*;q=1", acceptValues.get(0));
+ assertEquals("application/xml", acceptValues.get(1));
assertEquals(hs.getFirst("Content-Type"), "*/*");
}
@Test
+ public void testGetHeader() throws Exception {
+
+ Message m = control.createMock(Message.class);
+ m.get(Message.PROTOCOL_HEADERS);
+ EasyMock.expectLastCall().andReturn(createHeaders());
+ control.replay();
+ HttpHeaders h = new HttpHeadersImpl(m);
+ List<String> acceptValues = h.getRequestHeader("Accept");
+ assertEquals(2, acceptValues.size());
+ assertEquals("text/*;q=1", acceptValues.get(0));
+ assertEquals("application/xml", acceptValues.get(1));
+ List<String> contentValues = h.getRequestHeader("Content-Type");
+ assertEquals(1, contentValues.size());
+ assertEquals("*/*", contentValues.get(0));
+
+ }
+
+ @Test
public void testGetNullLanguage() throws Exception {
Message m = control.createMock(Message.class);
@@ -116,7 +136,7 @@
private MetadataMap<String, String> createHeaders() {
MetadataMap<String, String> hs = new MetadataMap<String, String>();
- hs.putSingle("Accept", "text/*");
+ hs.putSingle("Accept", "text/*;q=1,application/xml");
hs.putSingle("Content-Type", "*/*");
return hs;
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java?rev=722412&r1=722411&r2=722412&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java Tue Dec 2 02:20:54 2008
@@ -704,6 +704,7 @@
assertSame(ori, ori2);
}
+ @SuppressWarnings("unchecked")
@Test
public void testHttpContextParameters() throws Exception {
@@ -716,26 +717,30 @@
Request.class,
SecurityContext.class,
Providers.class,
- String.class}),
+ String.class,
+ List.class}),
cri);
ori.setHttpMethod("GET");
MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
- headers.add("Foo", "bar");
- headers.add("Foo", "baz");
+ headers.add("Foo", "bar, baz");
Message m = new MessageImpl();
m.put(Message.PROTOCOL_HEADERS, headers);
List<Object> params =
JAXRSUtils.processParameters(ori, new MetadataMap<String, String>(), m);
- assertEquals("6 parameters expected", 6, params.size());
+ assertEquals("7 parameters expected", 7, params.size());
assertSame(UriInfoImpl.class, params.get(0).getClass());
assertSame(HttpHeadersImpl.class, params.get(1).getClass());
assertSame(RequestImpl.class, params.get(2).getClass());
assertSame(SecurityContextImpl.class, params.get(3).getClass());
assertSame(MessageBodyWorkersImpl.class, params.get(4).getClass());
assertSame(String.class, params.get(5).getClass());
- assertEquals("Wrong header param", "bar,baz", params.get(5));
+ assertEquals("Wrong header param", "bar", params.get(5));
+ List<String> values = (List<String>)params.get(6);
+ assertEquals("Wrong headers size", 2, values.size());
+ assertEquals("Wrong 1st header param", "bar", values.get(0));
+ assertEquals("Wrong 2nd header param", "baz", values.get(1));
}
@Test
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=722412&r1=722411&r2=722412&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Tue Dec 2 02:20:54 2008
@@ -24,12 +24,14 @@
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
import javax.ws.rs.MatrixParam;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
@@ -116,6 +118,13 @@
}
@GET
+ @Path("/bookheaders/")
+ public Book getBookByHeader(@HeaderParam("BOOK") List<String> ids) throws Exception {
+
+ return doGetBook(ids.get(0) + ids.get(1) + ids.get(2));
+ }
+
+ @GET
@Path("/bookquery")
public Book getBookByURLQuery(@QueryParam("urlid") String urlValue) throws Exception {
String url2 = new URL(urlValue).toString();
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=722412&r1=722411&r2=722412&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java Tue Dec 2 02:20:54 2008
@@ -218,6 +218,13 @@
}
@Test
+ public void testGetBookByHeader() throws Exception {
+ getAndCompareAsStrings("http://localhost:9080/bookstore/bookheaders",
+ "resources/expected_get_book123.txt",
+ "application/xml", 200);
+ }
+
+ @Test
public void testGetBookByMatrixParameters() throws Exception {
getAndCompareAsStrings("http://localhost:9080/bookstore/segment/matrix;first=12;second=3",
"resources/expected_get_book123.txt",
@@ -660,6 +667,7 @@
GetMethod get = new GetMethod(address);
get.setRequestHeader("Accept", acceptType);
get.setRequestHeader("Accept-Language", "en,da;q=0.8");
+ get.setRequestHeader("BOOK", "1,2,3");
HttpClient httpClient = new HttpClient();
try {
int result = httpClient.executeMethod(get);