Author: sergeyb
Date: Tue Apr 5 12:35:08 2011
New Revision: 1089004
URL: http://svn.apache.org/viewvc?rev=1089004&view=rev
Log:
Merged revisions 1087817 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1087817 | sergeyb | 2011-04-01 18:16:55 +0100 (Fri, 01 Apr 2011) | 1 line
[CXF-2716] Support for reading JSON collections with tests disabled for now
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1087817
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java?rev=1089004&r1=1089003&r2=1089004&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
Tue Apr 5 12:35:08 2011
@@ -337,6 +337,12 @@ public abstract class AbstractJAXBProvid
}
public boolean isReadable(Class<?> type, Type genericType, Annotation[]
anns, MediaType mt) {
+ if (InjectionUtils.isSupportedCollectionOrArray(type)) {
+ type = InjectionUtils.getActualType(genericType);
+ if (type == null) {
+ return false;
+ }
+ }
return canBeReadAsJaxbElement(type) || isSupported(type, genericType,
anns);
}
@@ -910,6 +916,34 @@ public abstract class AbstractJAXBProvid
this.writeCharacters(value);
this.writeEndElement();
}
+ }
+ protected static class JAXBCollectionWrapperReader extends
DepthXMLStreamReader {
+
+ private boolean firstName;
+ private boolean firstNs;
+
+ public JAXBCollectionWrapperReader(XMLStreamReader reader) {
+ super(reader);
+ }
+
+ @Override
+ public String getNamespaceURI() {
+ if (!firstNs) {
+ firstNs = true;
+ return "";
+ }
+ return super.getNamespaceURI();
+ }
+
+ @Override
+ public String getLocalName() {
+ if (!firstName) {
+ firstName = true;
+ return "collectionWrapper";
+ }
+
+ return super.getLocalName();
+ }
}
private static class QNamesMap {
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java?rev=1089004&r1=1089003&r2=1089004&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
Tue Apr 5 12:35:08 2011
@@ -62,7 +62,6 @@ import org.apache.cxf.jaxrs.utils.Inject
import org.apache.cxf.jaxrs.utils.schemas.SchemaHandler;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Message;
-import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
@Produces({"application/xml", "application/*+xml", "text/xml" })
@@ -84,18 +83,6 @@ public class JAXBElementProvider extends
}
- @Override
- public boolean isReadable(Class<?> type, Type genericType, Annotation[]
anns, MediaType mt) {
-
- if (InjectionUtils.isSupportedCollectionOrArray(type)) {
- type = InjectionUtils.getActualType(genericType);
- if (type == null) {
- return false;
- }
- }
-
- return super.isReadable(type, genericType, anns, mt);
- }
@Override
protected boolean canBeReadAsJaxbElement(Class<?> type) {
@@ -466,36 +453,4 @@ public class JAXBElementProvider extends
ms.marshal(obj, writer);
}
-
- protected static class JAXBCollectionWrapperReader extends
DepthXMLStreamReader {
-
- private boolean firstName;
- private boolean firstNs;
-
- public JAXBCollectionWrapperReader(XMLStreamReader reader) {
- super(reader);
- }
-
- @Override
- public String getNamespaceURI() {
- if (!firstNs) {
- firstNs = true;
- return "";
- }
- return super.getNamespaceURI();
- }
-
- @Override
- public String getLocalName() {
- if (!firstName) {
- firstName = true;
- return "collectionWrapper";
- }
-
- return super.getLocalName();
- }
-
- }
-
-
}
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java?rev=1089004&r1=1089003&r2=1089004&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
Tue Apr 5 12:35:08 2011
@@ -53,6 +53,7 @@ import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import org.apache.cxf.jaxrs.ext.MessageContext;
+import org.apache.cxf.jaxrs.provider.AbstractJAXBProvider.CollectionWrapper;
import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.apache.cxf.jaxrs.utils.InjectionUtils;
import org.apache.cxf.jaxrs.utils.schemas.SchemaHandler;
@@ -171,24 +172,32 @@ public class JSONProvider extends Abstra
throws IOException {
try {
- Class<?> theType = getActualType(type, genericType, anns);
- Unmarshaller unmarshaller = createUnmarshaller(theType,
genericType);
+ boolean isCollection =
InjectionUtils.isSupportedCollectionOrArray(type);
+ Class<?> theType = isCollection ?
InjectionUtils.getActualType(genericType) : type;
+ theType = getActualType(theType, genericType, anns);
+
+ Unmarshaller unmarshaller = createUnmarshaller(theType,
genericType, isCollection);
InputStream realStream = getInputStream(type, genericType, is);
- XMLStreamReader xsw = createReader(type, realStream);
+ XMLStreamReader xsr = createReader(type, realStream, isCollection);
Object response = null;
if (JAXBElement.class.isAssignableFrom(type)
|| unmarshalAsJaxbElement
|| jaxbElementClassMap != null &&
jaxbElementClassMap.containsKey(theType.getName())) {
- response = unmarshaller.unmarshal(xsw, theType);
+ response = unmarshaller.unmarshal(xsr, theType);
} else {
- response = unmarshaller.unmarshal(xsw);
+ response = unmarshaller.unmarshal(xsr);
}
if (response instanceof JAXBElement &&
!JAXBElement.class.isAssignableFrom(type)) {
response = ((JAXBElement)response).getValue();
}
- response = checkAdapter(response, type, anns, false);
+ if (isCollection) {
+ response =
((CollectionWrapper)response).getCollectionOrArray(theType, type,
+ getAdapter(theType,
anns));
+ } else {
+ response = checkAdapter(response, type, anns, false);
+ }
return response;
} catch (JAXBException e) {
@@ -204,6 +213,12 @@ public class JSONProvider extends Abstra
return null;
}
+ protected XMLStreamReader createReader(Class<?> type, InputStream is,
boolean isCollection)
+ throws Exception {
+ XMLStreamReader reader = createReader(type, is);
+ return isCollection ? new JAXBCollectionWrapperReader(reader) : reader;
+ }
+
protected XMLStreamReader createReader(Class<?> type, InputStream is)
throws Exception {
if (BADGER_FISH_CONVENTION.equals(convention)) {
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java?rev=1089004&r1=1089003&r2=1089004&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
Tue Apr 5 12:35:08 2011
@@ -81,6 +81,7 @@ import org.apache.cxf.jaxrs.resources.Ta
import org.apache.cxf.jaxrs.utils.ResourceUtils;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
public class JAXBElementProviderTest extends Assert {
@@ -932,12 +933,14 @@ public class JAXBElementProviderTest ext
@Test
+ @Ignore
public void testReadQualifiedCollection() throws Exception {
String data = "<ns1:tags
xmlns:ns1=\"http://tags\";><ns1:thetag><group>B</group><name>A</name>"
+
"</ns1:thetag><ns1:thetag><group>D</group><name>C</name></ns1:thetag></ns1:tags>";
doReadQualifiedCollection(data, false);
}
+ @Ignore
@Test
public void testReadQualifiedArray() throws Exception {
String data = "<ns1:tags
xmlns:ns1=\"http://tags\";><ns1:thetag><group>B</group><name>A</name>"
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java?rev=1089004&r1=1089003&r2=1089004&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
Tue Apr 5 12:35:08 2011
@@ -29,6 +29,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.MessageBodyReader;
@@ -58,6 +60,7 @@ import org.junit.Test;
public class JSONProviderTest extends Assert {
+
@Test
public void testWriteCollectionWithoutXmlRootElement()
throws Exception {
@@ -324,17 +327,60 @@ public class JSONProviderTest extends As
}
@Test
- @Ignore
+ @Ignore("Enable once http://jira.codehaus.org/browse/JETTISON-104 gets
resolved")
+ public void testReadUnqualifiedCollection() throws Exception {
+ String data = "{\"Book\":[{\"id\":\"123\",\"name\":\"CXF in Action\"}"
+ + ",{\"id\":\"124\",\"name\":\"CXF Rocks\"}]}";
+ doReadUnqualifiedCollection(data, "setBooks", List.class);
+ }
+
+ @SuppressWarnings("unchecked")
+ private void doReadUnqualifiedCollection(String data, String mName,
Class<?> type) throws Exception {
+ JSONProvider provider = new JSONProvider();
+ Method m = CollectionsResource.class.getMethod(mName,
+ new Class[]{type});
+ ByteArrayInputStream is = new ByteArrayInputStream(data.getBytes());
+ Object o = provider.readFrom(
+ (Class)m.getParameterTypes()[0],
m.getGenericParameterTypes()[0],
+ new Annotation[0], MediaType.APPLICATION_JSON_TYPE,
+ new MetadataMap<String, String>(), is);
+ assertNotNull(o);
+ Book b1 = null;
+ Book b2 = null;
+ if (type.isArray()) {
+ assertEquals(2, ((Book[])o).length);
+ b1 = ((Book[])o)[0];
+ b2 = ((Book[])o)[1];
+ } else if (type == Set.class) {
+ Set<Book> set = (Set)o;
+ List<Book> books = new ArrayList<Book>(new TreeSet<Book>(set));
+ b1 = books.get(0);
+ b2 = books.get(1);
+ } else {
+ List<Book> books = (List<Book>)o;
+ b1 = books.get(0);
+ b2 = books.get(1);
+ }
+
+ assertEquals(123, b1.getId());
+ assertEquals("CXF in Action", b1.getName());
+
+ assertEquals(124, b2.getId());
+ assertEquals("CXF Rocks", b2.getName());
+ }
+
+ @Test
+ @Ignore("Enable once http://jira.codehaus.org/browse/JETTISON-104 gets
resolved")
public void testReadQualifiedCollection() throws Exception {
- String data = "{\"ns1.tag\":[{\"group\":\"b\",\"name\":\"a\"}"
+ String data = "{\"ns1.thetag\":[{\"group\":\"b\",\"name\":\"a\"}"
+ ",{\"group\":\"d\",\"name\":\"c\"}]}";
doReadQualifiedCollection(data, false);
}
@Test
- @Ignore
+ @Ignore("Enable once http://jira.codehaus.org/browse/JETTISON-104 gets
resolved")
public void testReadQualifiedArray() throws Exception {
- String data = "{\"ns1.tag\":[{\"group\":\"b\",\"name\":\"a\"}"
+ String data = "{\"ns1.thetag\":[{\"group\":\"b\",\"name\":\"a\"}"
+ ",{\"group\":\"d\",\"name\":\"c\"}]}";
doReadQualifiedCollection(data, true);
}
@@ -343,7 +389,6 @@ public class JSONProviderTest extends As
public void doReadQualifiedCollection(String data, boolean isArray) throws
Exception {
JSONProvider provider = new JSONProvider();
- provider.setCollectionWrapperName("{http://tags}tag";);
Map<String, String> namespaceMap = new HashMap<String, String>();
namespaceMap.put("http://tags";, "ns1");
provider.setNamespaceMap(namespaceMap);
@@ -372,11 +417,11 @@ public class JSONProviderTest extends As
t1 = (TagVO2)((Object[])o)[0];
t2 = (TagVO2)((Object[])o)[1];
}
- assertEquals("A", t1.getName());
- assertEquals("B", t1.getGroup());
+ assertEquals("a", t1.getName());
+ assertEquals("b", t1.getGroup());
- assertEquals("C", t2.getName());
- assertEquals("D", t2.getGroup());
+ assertEquals("c", t2.getName());
+ assertEquals("d", t2.getGroup());
}
@Test
