You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by bl...@apache.org on 2009/08/27 04:52:06 UTC
svn commit: r808260 - in /incubator/wink/trunk: ./ wink-providers/
wink-providers/wink-jettison-provider/
wink-providers/wink-jettison-provider/src/
wink-providers/wink-jettison-provider/src/main/
wink-providers/wink-jettison-provider/src/main/java/ wi...
Author: bluk
Date: Thu Aug 27 02:52:04 2009
New Revision: 808260
URL: http://svn.apache.org/viewvc?rev=808260&view=rev
Log:
Add Jettison provider code
See [WINK-142]
Added:
incubator/wink/trunk/wink-providers/
incubator/wink/trunk/wink-providers/pom.xml (with props)
incubator/wink/trunk/wink-providers/wink-jettison-provider/
incubator/wink/trunk/wink-providers/wink-jettison-provider/pom.xml (with props)
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBElementProvider.java (with props)
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBProvider.java (with props)
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBBadgerFishTest.java (with props)
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBMappedTest.java (with props)
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/ObjectFactory.java (with props)
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/Person.java (with props)
Modified:
incubator/wink/trunk/pom.xml
Modified: incubator/wink/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/pom.xml?rev=808260&r1=808259&r2=808260&view=diff
==============================================================================
--- incubator/wink/trunk/pom.xml (original)
+++ incubator/wink/trunk/pom.xml Thu Aug 27 02:52:04 2009
@@ -45,6 +45,7 @@
<module>wink-webdav</module>
<module>wink-examples</module>
<module>wink-scripts</module>
+ <module>wink-providers</module>
</modules>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/wink/trunk</connection>
Added: incubator/wink/trunk/wink-providers/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/pom.xml?rev=808260&view=auto
==============================================================================
--- incubator/wink/trunk/wink-providers/pom.xml (added)
+++ incubator/wink/trunk/wink-providers/pom.xml Thu Aug 27 02:52:04 2009
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wink-providers</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Wink Providers</name>
+ <parent>
+ <artifactId>wink</artifactId>
+ <groupId>org.apache.wink</groupId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ </parent>
+ <modules>
+ <module>wink-jettison-provider</module>
+ </modules>
+ <dependencies>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: incubator/wink/trunk/wink-providers/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/wink/trunk/wink-providers/wink-jettison-provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/pom.xml?rev=808260&view=auto
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/pom.xml (added)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/pom.xml Thu Aug 27 02:52:04 2009
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>wink-providers</artifactId>
+ <groupId>org.apache.wink</groupId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wink-jettison-provider</artifactId>
+ <name>Apache Wink Providers :: Jettison Provider</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-component-test-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: incubator/wink/trunk/wink-providers/wink-jettison-provider/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBElementProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBElementProvider.java?rev=808260&view=auto
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBElementProvider.java (added)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBElementProvider.java Thu Aug 27 02:52:04 2009
@@ -0,0 +1,192 @@
+/*******************************************************************************
+ * 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.wink.server.internal.providers.entity.jettison;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.wink.common.internal.i18n.Messages;
+import org.apache.wink.common.internal.providers.entity.xml.AbstractJAXBProvider;
+import org.apache.wink.common.utils.ProviderUtils;
+import org.codehaus.jettison.badgerfish.BadgerFishXMLInputFactory;
+import org.codehaus.jettison.badgerfish.BadgerFishXMLStreamWriter;
+import org.codehaus.jettison.mapped.Configuration;
+import org.codehaus.jettison.mapped.MappedXMLInputFactory;
+import org.codehaus.jettison.mapped.MappedXMLOutputFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A Jettison JAXBElement provider. By default, use the MappedNamespace
+ * convention. Namespace mapping needs to be set if namespaces are used. In
+ * Application sub-class, use {@link Application#getSingletons()} to add to
+ * application.
+ */
+@Provider
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+public class JettisonJAXBElementProvider extends AbstractJAXBProvider implements
+ MessageBodyReader<JAXBElement<?>>, MessageBodyWriter<JAXBElement<?>> {
+
+ private static final Logger logger = LoggerFactory.getLogger(JettisonJAXBElementProvider.class);
+
+ final private boolean isBadgerFishConventionUsed;
+
+ final private Configuration inputConfiguration;
+
+ final private Configuration outputConfiguration;
+
+ public JettisonJAXBElementProvider() {
+ this(false, null, null);
+ }
+
+ public JettisonJAXBElementProvider(boolean isBadgerFishConventionUsed,
+ Configuration reader,
+ Configuration writer) {
+ this.isBadgerFishConventionUsed = isBadgerFishConventionUsed;
+ if (reader != null) {
+ this.inputConfiguration = reader;
+ } else {
+ this.inputConfiguration = new Configuration(new HashMap<String, String>());
+ }
+ if (writer != null) {
+ this.outputConfiguration = writer;
+ } else {
+ this.outputConfiguration = new Configuration(new HashMap<String, String>());
+ }
+ }
+
+ public boolean isReadable(Class<?> type,
+ Type genericType,
+ Annotation[] annotations,
+ MediaType mediaType) {
+ return isJAXBElement(type, genericType);
+ }
+
+ public JAXBElement<?> readFrom(Class<JAXBElement<?>> type,
+ Type genericType,
+ Annotation[] annotations,
+ MediaType mediaType,
+ MultivaluedMap<String, String> httpHeaders,
+ InputStream entityStream) throws IOException,
+ WebApplicationException {
+ ParameterizedType parameterizedType = (ParameterizedType)genericType;
+ Class<?> classToFill = (Class<?>)parameterizedType.getActualTypeArguments()[0];
+ JAXBElement<?> unmarshaledResource = null;
+ Unmarshaller unmarshaller = null;
+
+ try {
+ unmarshaller = getUnmarshaller(classToFill, mediaType);
+
+ XMLStreamReader xsr = null;
+ if (isBadgerFishConventionUsed) {
+ xsr = new BadgerFishXMLInputFactory().createXMLStreamReader(entityStream);
+ } else {
+ xsr =
+ new MappedXMLInputFactory(inputConfiguration)
+ .createXMLStreamReader(new StreamSource(entityStream));
+ }
+
+ unmarshaledResource = unmarshaller.unmarshal(xsr, classToFill);
+ } catch (JAXBException e) {
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName());
+ throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
+ } catch (XMLStreamException e) {
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName());
+ throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
+ }
+ return unmarshaledResource;
+ }
+
+ public long getSize(JAXBElement<?> t,
+ Class<?> type,
+ Type genericType,
+ Annotation[] annotations,
+ MediaType mediaType) {
+ return -1;
+ }
+
+ public boolean isWriteable(Class<?> type,
+ Type genericType,
+ Annotation[] annotations,
+ MediaType mediaType) {
+ return isJAXBElement(type, genericType);
+ }
+
+ public void writeTo(JAXBElement<?> t,
+ Class<?> type,
+ Type genericType,
+ Annotation[] annotations,
+ MediaType mediaType,
+ MultivaluedMap<String, Object> httpHeaders,
+ OutputStream entityStream) throws IOException, WebApplicationException {
+ try {
+ Marshaller marshaller = getMarshaller(t.getDeclaredType(), mediaType);
+ OutputStreamWriter writer =
+ new OutputStreamWriter(entityStream, ProviderUtils.getCharset(mediaType));
+
+ XMLStreamWriter xsw = null;
+ if (isBadgerFishConventionUsed) {
+ xsw = new BadgerFishXMLStreamWriter(writer);
+ } else {
+ try {
+ xsw =
+ new MappedXMLOutputFactory(outputConfiguration)
+ .createXMLStreamWriter(writer);
+ } catch (XMLStreamException e) {
+ logger.error(Messages.getMessage("jaxbFailToMarshal"), t.getName());
+ throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ marshaller.marshal(t, xsw);
+ writer.flush();
+ } catch (JAXBException e) {
+ logger.error(Messages.getMessage("jaxbFailToMarshal"), t.getName());
+ throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
+ }
+
+ }
+}
Propchange: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBElementProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBProvider.java?rev=808260&view=auto
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBProvider.java (added)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBProvider.java Thu Aug 27 02:52:04 2009
@@ -0,0 +1,188 @@
+/*******************************************************************************
+ * 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.wink.server.internal.providers.entity.jettison;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.wink.common.internal.i18n.Messages;
+import org.apache.wink.common.internal.providers.entity.xml.AbstractJAXBProvider;
+import org.apache.wink.common.utils.ProviderUtils;
+import org.codehaus.jettison.badgerfish.BadgerFishXMLInputFactory;
+import org.codehaus.jettison.badgerfish.BadgerFishXMLStreamWriter;
+import org.codehaus.jettison.mapped.Configuration;
+import org.codehaus.jettison.mapped.MappedNamespaceConvention;
+import org.codehaus.jettison.mapped.MappedXMLInputFactory;
+import org.codehaus.jettison.mapped.MappedXMLStreamWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A Jettison JAXB provider. By default, use the MappedNamespace convention.
+ * Namespace mapping needs to be set if namespaces are used. In Application
+ * sub-class, use {@link Application#getSingletons()} to add to application.
+ */
+@Provider
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class JettisonJAXBProvider extends AbstractJAXBProvider implements
+ MessageBodyReader<Object>, MessageBodyWriter<Object> {
+
+ private static final Logger logger = LoggerFactory.getLogger(JettisonJAXBProvider.class);
+
+ final private boolean isBadgerFishConventionUsed;
+
+ final private Configuration inputConfiguration;
+
+ final private Configuration outputConfiguration;
+
+ public JettisonJAXBProvider() {
+ this(false, null, null);
+ }
+
+ public JettisonJAXBProvider(boolean isBadgerFishConventionUsed,
+ Configuration reader,
+ Configuration writer) {
+ this.isBadgerFishConventionUsed = isBadgerFishConventionUsed;
+ if (reader != null) {
+ this.inputConfiguration = reader;
+ } else {
+ this.inputConfiguration = new Configuration(new HashMap<String, String>());
+ }
+ if (writer != null) {
+ this.outputConfiguration = writer;
+ } else {
+ this.outputConfiguration = new Configuration(new HashMap<String, String>());
+ }
+ }
+
+ public boolean isReadable(Class<?> type,
+ Type genericType,
+ Annotation[] annotations,
+ MediaType mediaType) {
+ return isJAXBObject(type, genericType);
+ }
+
+ public Object readFrom(Class<Object> type,
+ Type genericType,
+ Annotation[] annotations,
+ MediaType mediaType,
+ MultivaluedMap<String, String> httpHeaders,
+ InputStream entityStream) throws IOException, WebApplicationException {
+ Unmarshaller unmarshaller = null;
+ Object unmarshaledResource = null;
+ try {
+ unmarshaller = getUnmarshaller(type, mediaType);
+
+ XMLStreamReader xsr = null;
+ if (type.isAnnotationPresent(XmlRootElement.class)) {
+ if (isBadgerFishConventionUsed) {
+ xsr = new BadgerFishXMLInputFactory().createXMLStreamReader(entityStream);
+ } else {
+ xsr =
+ new MappedXMLInputFactory(inputConfiguration)
+ .createXMLStreamReader(entityStream);
+ }
+ unmarshaledResource = unmarshaller.unmarshal(xsr);
+ } else {
+ if (isBadgerFishConventionUsed) {
+ xsr = new BadgerFishXMLInputFactory().createXMLStreamReader(entityStream);
+ } else {
+ xsr =
+ new MappedXMLInputFactory(inputConfiguration)
+ .createXMLStreamReader(entityStream);
+ }
+ unmarshaledResource = unmarshaller.unmarshal(xsr, type).getValue();
+ }
+ } catch (JAXBException e) {
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName());
+ throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
+ } catch (XMLStreamException e) {
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName());
+ throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
+ }
+ return unmarshaledResource;
+ }
+
+ public long getSize(Object t,
+ Class<?> type,
+ Type genericType,
+ Annotation[] annotations,
+ MediaType mediaType) {
+ return -1;
+ }
+
+ public boolean isWriteable(Class<?> type,
+ Type genericType,
+ Annotation[] annotations,
+ MediaType mediaType) {
+ return isJAXBObject(type, genericType);
+ }
+
+ public void writeTo(Object t,
+ Class<?> type,
+ Type genericType,
+ Annotation[] annotations,
+ MediaType mediaType,
+ MultivaluedMap<String, Object> httpHeaders,
+ OutputStream entityStream) throws IOException, WebApplicationException {
+ try {
+ Marshaller marshaller = getMarshaller(type, mediaType);
+ marshaller.setProperty(Marshaller.JAXB_ENCODING, ProviderUtils.getCharset(mediaType));
+ Object entityToMarshal = getEntityToMarshal(t, type);
+
+ // Use an OutputStream directly instead of a Writer for performance.
+ XMLStreamWriter xsw = null;
+ if (isBadgerFishConventionUsed) {
+ xsw = new BadgerFishXMLStreamWriter(new OutputStreamWriter(entityStream));
+ } else {
+ MappedNamespaceConvention con = new MappedNamespaceConvention(outputConfiguration);
+ xsw = new MappedXMLStreamWriter(con, new OutputStreamWriter(entityStream));
+ }
+ marshaller.marshal(entityToMarshal, xsw);
+ } catch (JAXBException e) {
+ logger.error(Messages.getMessage("jaxbFailToMarshal"), type.getName());
+ throw new WebApplicationException(e);
+ }
+ }
+}
Propchange: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBBadgerFishTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBBadgerFishTest.java?rev=808260&view=auto
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBBadgerFishTest.java (added)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBBadgerFishTest.java Thu Aug 27 02:52:04 2009
@@ -0,0 +1,272 @@
+/*******************************************************************************
+ * 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.wink.server.internal.providers.entity.jettison;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.xml.bind.JAXBElement;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import org.apache.wink.common.model.atom.AtomEntry;
+import org.apache.wink.common.model.json.JSONUtils;
+import org.apache.wink.common.model.synd.SyndEntry;
+import org.apache.wink.server.internal.providers.entity.jettison.jaxb.Person;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
+import org.apache.wink.test.mock.MockRequestConstructor;
+import org.codehaus.jettison.json.JSONObject;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+/**
+ * Tests the Jettison BadgerFish format.
+ */
+public class JettisonJAXBBadgerFishTest extends MockServletInvocationTest {
+
+ @Override
+ protected Class<?>[] getClasses() {
+ return new Class<?>[] {TestResource.class, PersonResource.class};
+ }
+
+ @Override
+ protected Object[] getSingletons() {
+
+ JettisonJAXBProvider jaxbProvider = new JettisonJAXBProvider(true, null, null);
+
+ JettisonJAXBElementProvider jaxbElementProvider =
+ new JettisonJAXBElementProvider(true, null, null);
+ return new Object[] {jaxbProvider, jaxbElementProvider};
+ }
+
+ @Path("/test/person")
+ public static class PersonResource {
+
+ @GET
+ public Person getPerson() throws IOException {
+ Person p = new Person();
+ p.setName("My Name");
+ p.setDesc("My desc");
+ return p;
+ }
+
+ @POST
+ public Person postPerson(Person p) {
+ return p;
+ }
+ }
+
+ @Path("test")
+ public static class TestResource {
+
+ @GET
+ @Path("atomentry")
+ @Produces("application/json")
+ public AtomEntry getAtomEntry() throws IOException {
+ AtomEntry entry = AtomEntry.unmarshal(new StringReader(ENTRY));
+ return entry;
+ }
+
+ @GET
+ @Path("atomentryelement")
+ @Produces("application/json")
+ public JAXBElement<AtomEntry> getAtomEntryElement() throws IOException {
+ AtomEntry entry = AtomEntry.unmarshal(new StringReader(ENTRY));
+ org.apache.wink.common.model.atom.ObjectFactory of =
+ new org.apache.wink.common.model.atom.ObjectFactory();
+ return of.createEntry(entry);
+ }
+
+ @GET
+ @Path("atomsyndentry")
+ @Produces("application/json")
+ public SyndEntry getSyndEntry() throws IOException {
+ AtomEntry entry = AtomEntry.unmarshal(new StringReader(ENTRY));
+ return entry.toSynd(new SyndEntry());
+ }
+
+ @POST
+ @Path("atomentry")
+ @Produces("application/json")
+ @Consumes("application/json")
+ public AtomEntry postAtomEntry(AtomEntry entry) throws IOException {
+ return entry;
+ }
+
+ @POST
+ @Path("atomentryelement")
+ @Produces("application/json")
+ @Consumes("application/json")
+ public JAXBElement<AtomEntry> postAtomEntryElement(JAXBElement<AtomEntry> entry) {
+ return entry;
+ }
+
+ @POST
+ @Path("atomsyndentry")
+ @Produces("application/json")
+ @Consumes("application/json")
+ public SyndEntry postAtomSyndEntry(SyndEntry entry) {
+ return entry;
+ }
+ }
+
+ /**
+ * Tests a simple single JAXB Object to write.
+ *
+ * @throws Exception
+ */
+ public void testGetPerson() throws Exception {
+ MockHttpServletRequest request =
+ MockRequestConstructor.constructMockRequest("GET", "/test/person", "application/json");
+ MockHttpServletResponse response = invoke(request);
+ assertEquals(200, response.getStatus());
+
+ assertEquals(new JSONObject(
+ " {\"person\":{\"desc\":{\"$\":\"My desc\"},\"name\":{\"$\":\"My Name\"}}} ")
+ .toString(),
+ new JSONObject(response.getContentAsString()).toString());
+ }
+
+ /**
+ * Tests a simple single JAXB Object to both read and write.
+ *
+ * @throws Exception
+ */
+ public void testPostPerson() throws Exception {
+ MockHttpServletRequest request =
+ MockRequestConstructor.constructMockRequest("POST", "/test/person", "application/json");
+ request.setContentType("application/json");
+ request
+ .setContent("{\"person\":{\"desc\":{\"$\":\"My desc\"},\"name\":{\"$\":\"My Name\"}}} "
+ .getBytes());
+ MockHttpServletResponse response = invoke(request);
+ assertEquals(200, response.getStatus());
+ assertEquals(new JSONObject(
+ " {\"person\":{\"desc\":{\"$\":\"My desc\"},\"name\":{\"$\":\"My Name\"}}} ")
+ .toString(),
+ new JSONObject(response.getContentAsString()).toString());
+ }
+
+ public void testGetAtomEntry() throws Exception {
+ MockHttpServletRequest request =
+ MockRequestConstructor.constructMockRequest("GET",
+ "/test/atomentry",
+ "application/json");
+ MockHttpServletResponse response = invoke(request);
+ assertEquals(200, response.getStatus());
+ System.out.println(response.getContentAsString());
+ assertTrue(JSONUtils.equals(JSONUtils.objectForString(ENTRY_JSON), JSONUtils
+ .objectForString(response.getContentAsString())));
+ }
+
+ public void testGetAtomEntryElement() throws Exception {
+ MockHttpServletRequest request =
+ MockRequestConstructor.constructMockRequest("GET",
+ "/test/atomentryelement",
+ "application/json");
+ MockHttpServletResponse response = invoke(request);
+ assertEquals(200, response.getStatus());
+ assertTrue(JSONUtils.equals(JSONUtils.objectForString(ENTRY_JSON), JSONUtils
+ .objectForString(response.getContentAsString())));
+
+ }
+
+ public void testPostAtomEntry() throws Exception {
+ MockHttpServletRequest request =
+ MockRequestConstructor.constructMockRequest("POST",
+ "/test/atomentry",
+ "application/json");
+ request.setContentType("application/json");
+ request.setContent(ENTRY_JSON_POST.getBytes());
+ MockHttpServletResponse response = invoke(request);
+ assertEquals(200, response.getStatus());
+
+ assertTrue(JSONUtils.equals(JSONUtils.objectForString(ENTRY_JSON_POST), JSONUtils
+ .objectForString(response.getContentAsString())));
+ }
+
+ public void testPostAtomEntryElement() throws Exception {
+ MockHttpServletRequest request =
+ MockRequestConstructor.constructMockRequest("POST",
+ "/test/atomentryelement",
+ "application/json");
+ request.setContentType("application/json");
+ request.setContent(ENTRY_JSON_POST.getBytes());
+ MockHttpServletResponse response = invoke(request);
+ assertEquals(200, response.getStatus());
+ assertTrue(JSONUtils.equals(JSONUtils.objectForString(ENTRY_JSON_POST), JSONUtils
+ .objectForString(response.getContentAsString())));
+ }
+
+ private static final String ENTRY_STR =
+ "<entry xml:base=\"http://b216:8080/reporting/reports\" xmlns=\"http://www.w3.org/2005/Atom\">\n" + " <id>toptenvalidators</id>\n"
+ + " <updated>@TIME@</updated>\n"
+ + " <title type=\"text\" xml:lang=\"en\">top ten validators</title>\n"
+ + " <published>@TIME@</published>\n"
+ + " <link href=\"http://b216:8080/reporting/reports/toptenvalidators?alt=application/json\" type=\"application/json\" rel=\"alternate\"/>\n"
+ + " <author>\n"
+ + " <name>admin</name>\n"
+ + " </author>\n"
+ + " <category label=\"report definition\" scheme=\"urn:com:systinet:reporting:kind\" term=\"urn:com:systinet:reporting:kind:definition\"/>\n"
+ + "</entry>\n";
+
+ private static String ENTRY_STR_JSON =
+ "{\"entry\":{\"@xmlns\":{\"ns2\":\"http:\\/\\/a9.com\\/-\\/spec\\/opensearch\\/1.1\\/\",\"$\":\"http:\\/\\/www.w3.org\\/2005\\/Atom\"},\"@xml:base\":\"http:\\/\\/b216:8080\\/reporting\\/reports\",\"id\":{\"$\":\"toptenvalidators\"},\"updated\":{\"$\":\"@TIME@\"},\"title\":{\"@type\":\"text\",\"@xml:lang\":\"en\",\"$\":\"top ten validators\"},\"published\":{\"$\":\"@TIME@\"},\"link\":{\"@href\":\"http:\\/\\/b216:8080\\/reporting\\/reports\\/toptenvalidators?alt=application\\/json\",\"@type\":\"application\\/json\",\"@rel\":\"alternate\"},\"author\":{\"name\":{\"$\":\"admin\"}},\"category\":{\"@label\":\"report definition\",\"@scheme\":\"urn:com:systinet:reporting:kind\",\"@term\":\"urn:com:systinet:reporting:kind:definition\"}}}";
+
+ private static String ENTRY_STR_POST =
+ "{\"entry\":" + "{\"@xmlns\":"
+ + "{\"ns2\":\"http:\\/\\/a9.com\\/-\\/spec\\/opensearch\\/1.1\\/\",\"$\":\"http:\\/\\/www.w3.org\\/2005\\/Atom\"},"
+ + "\"id\":{\"$\":\"toptenvalidators\"},"
+ + "\"updated\":{\"$\":\"@TIME@\"},"
+ + "\"title\":{"
+ + "\"$\":\"top ten validators\"},"
+ + "\"published\":{\"$\":\"@TIME@\"},"
+ + "\"author\":{\"name\":{\"$\":\"admin\"}},"
+ + "}}";
+
+ private static final String ENTRY;
+
+ private static final String ENTRY_JSON;
+
+ private static final String ENTRY_JSON_POST;
+
+ static {
+ try {
+ GregorianCalendar calendar = new GregorianCalendar();
+ calendar.setTimeInMillis((new Date()).getTime());
+ XMLGregorianCalendar xmlGregCal =
+ DatatypeFactory.newInstance().newXMLGregorianCalendar(calendar);
+ ENTRY = ENTRY_STR.replaceAll("@TIME@", xmlGregCal.toString());
+ ENTRY_JSON = ENTRY_STR_JSON.replaceAll("@TIME@", xmlGregCal.toString());
+ ENTRY_JSON_POST = ENTRY_STR_POST.replaceAll("@TIME@", xmlGregCal.toString());
+ } catch (DatatypeConfigurationException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
Propchange: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBBadgerFishTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBMappedTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBMappedTest.java?rev=808260&view=auto
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBMappedTest.java (added)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBMappedTest.java Thu Aug 27 02:52:04 2009
@@ -0,0 +1,295 @@
+/*******************************************************************************
+ * 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.wink.server.internal.providers.entity.jettison;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Collections;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.xml.bind.JAXBElement;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import org.apache.wink.common.model.atom.AtomEntry;
+import org.apache.wink.common.model.json.JSONUtils;
+import org.apache.wink.common.model.synd.SyndEntry;
+import org.apache.wink.server.internal.providers.entity.jettison.jaxb.Person;
+import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
+import org.apache.wink.test.mock.MockRequestConstructor;
+import org.codehaus.jettison.json.JSONObject;
+import org.codehaus.jettison.mapped.Configuration;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+public class JettisonJAXBMappedTest extends MockServletInvocationTest {
+
+ @Override
+ protected Class<?>[] getClasses() {
+ return new Class<?>[] {TestResource.class, PersonResource.class};
+ }
+
+ @Override
+ protected Object[] getSingletons() {
+ Map<String, String> namespaceMap = new HashMap<String, String>();
+ namespaceMap.put("http://www.w3.org/2005/Atom", "http://www.w3.org/2005/Atom");
+ namespaceMap.put("http://b216:8080/reporting/reports/toptenvalidators",
+ "http://b216:8080/reporting/reports/toptenvalidators");
+ namespaceMap.put("http://www.w3.org/XML/1998/namespace",
+ "http://www.w3.org/XML/1998/namespace");
+ namespaceMap = Collections.unmodifiableMap(namespaceMap);
+
+ Map<String, String> outputNamespaceMap = new HashMap<String, String>();
+ outputNamespaceMap.put("http://www.w3.org/2005/Atom", "http://www.w3.org/2005/Atom");
+ outputNamespaceMap.put("http://b216:8080/reporting/reports/toptenvalidators",
+ "http://b216:8080/reporting/reports/toptenvalidators");
+ outputNamespaceMap.put("http://www.w3.org/XML/1998/namespace",
+ "http://www.w3.org/XML/1998/namespace");
+ outputNamespaceMap = Collections.unmodifiableMap(outputNamespaceMap);
+
+ JettisonJAXBProvider jaxbProvider =
+ new JettisonJAXBProvider(false, new Configuration(namespaceMap),
+ new Configuration(outputNamespaceMap));
+
+ JettisonJAXBElementProvider jaxbElementProvider =
+ new JettisonJAXBElementProvider(false, new Configuration(namespaceMap),
+ new Configuration(outputNamespaceMap));
+ return new Object[] {jaxbProvider, jaxbElementProvider};
+ }
+
+ @Path("/test/person")
+ public static class PersonResource {
+
+ @GET
+ public Person getPerson() throws IOException {
+ Person p = new Person();
+ p.setName("My Name");
+ p.setDesc("My desc");
+ return p;
+ }
+
+ @POST
+ public Person postPerson(Person p) {
+ return p;
+ }
+ }
+
+ @Path("test")
+ public static class TestResource {
+
+ @GET
+ @Path("atomentry")
+ @Produces("application/json")
+ public AtomEntry getAtomEntry() throws IOException {
+ AtomEntry entry = AtomEntry.unmarshal(new StringReader(ENTRY));
+ return entry;
+ }
+
+ @GET
+ @Path("atomentryelement")
+ @Produces("application/json")
+ public JAXBElement<AtomEntry> getAtomEntryElement() throws IOException {
+ AtomEntry entry = AtomEntry.unmarshal(new StringReader(ENTRY));
+ org.apache.wink.common.model.atom.ObjectFactory of =
+ new org.apache.wink.common.model.atom.ObjectFactory();
+ return of.createEntry(entry);
+ }
+
+ @GET
+ @Path("atomsyndentry")
+ @Produces("application/json")
+ public SyndEntry getSyndEntry() throws IOException {
+ AtomEntry entry = AtomEntry.unmarshal(new StringReader(ENTRY));
+ return entry.toSynd(new SyndEntry());
+ }
+
+ @POST
+ @Path("atomentry")
+ @Produces("application/json")
+ @Consumes("application/json")
+ public AtomEntry postAtomEntry(AtomEntry entry) throws IOException {
+ return entry;
+ }
+
+ @POST
+ @Path("atomentryelement")
+ @Produces("application/json")
+ @Consumes("application/json")
+ public JAXBElement<AtomEntry> postAtomEntryElement(JAXBElement<AtomEntry> entry) {
+ return entry;
+ }
+
+ @POST
+ @Path("atomsyndentry")
+ @Produces("application/json")
+ @Consumes("application/json")
+ public SyndEntry postAtomSyndEntry(SyndEntry entry) {
+ return entry;
+ }
+
+ }
+
+ /**
+ * Tests a simple single JAXB Object to write.
+ *
+ * @throws Exception
+ */
+ public void testGetPerson() throws Exception {
+ MockHttpServletRequest request =
+ MockRequestConstructor.constructMockRequest("GET", "/test/person", "application/json");
+ MockHttpServletResponse response = invoke(request);
+ assertEquals(200, response.getStatus());
+
+ assertEquals(new JSONObject(
+ " { \"person\" : { \"desc\" : \"My desc\", \"name\" : \"My Name\" } } ")
+ .toString(),
+ new JSONObject(response.getContentAsString()).toString());
+ }
+
+ /**
+ * Tests a simple single JAXB Object to both read and write.
+ *
+ * @throws Exception
+ */
+ public void testPostPerson() throws Exception {
+ MockHttpServletRequest request =
+ MockRequestConstructor.constructMockRequest("POST", "/test/person", "application/json");
+ request.setContentType("application/json");
+ request.setContent(" { \"person\" : { \"desc\" : \"My desc\", \"name\" : \"My Name\" } } "
+ .getBytes());
+ MockHttpServletResponse response = invoke(request);
+ assertEquals(200, response.getStatus());
+ assertEquals("{\"person\":{\"desc\":\"My desc\",\"name\":\"My Name\"}}", response
+ .getContentAsString());
+ }
+
+ public void testGetAtomEntry() throws Exception {
+ MockHttpServletRequest request =
+ MockRequestConstructor.constructMockRequest("GET",
+ "/test/atomentry",
+ "application/json");
+ MockHttpServletResponse response = invoke(request);
+ assertEquals(200, response.getStatus());
+
+ assertEquals(new JSONObject(ENTRY_JSON).toString(), new JSONObject(response
+ .getContentAsString()).toString());
+ }
+
+ public void testGetAtomEntryElement() throws Exception {
+ MockHttpServletRequest request =
+ MockRequestConstructor.constructMockRequest("GET",
+ "/test/atomentryelement",
+ "application/json");
+ MockHttpServletResponse response = invoke(request);
+ assertEquals(200, response.getStatus());
+ assertEquals(new JSONObject(ENTRY_JSON).toString(), new JSONObject(response
+ .getContentAsString()).toString());
+ }
+
+ public void testPostAtomEntry() throws Exception {
+ MockHttpServletRequest request =
+ MockRequestConstructor.constructMockRequest("POST",
+ "/test/atomentry",
+ "application/json");
+ request.setContentType("application/json");
+
+ request.setContent(ENTRY_JSON.getBytes());
+ MockHttpServletResponse response = invoke(request);
+ assertEquals(200, response.getStatus());
+ assertTrue(JSONUtils.equals(JSONUtils.objectForString(ENTRY_JSON), JSONUtils
+ .objectForString(response.getContentAsString())));
+ }
+
+ public void testPostAtomEntryElement() throws Exception {
+ MockHttpServletRequest request =
+ MockRequestConstructor.constructMockRequest("POST",
+ "/test/atomentryelement",
+ "application/json");
+ request.setContentType("application/json");
+ request.setContent(ENTRY_JSON.getBytes());
+ MockHttpServletResponse response = invoke(request);
+ assertEquals(200, response.getStatus());
+ assertTrue(JSONUtils.equals(JSONUtils.objectForString(ENTRY_JSON), JSONUtils
+ .objectForString(response.getContentAsString())));
+ }
+
+ private static final String ENTRY_STR =
+ "<entry xml:base=\"http://b216:8080/reporting/reports\" xmlns=\"http://www.w3.org/2005/Atom\">\n" + " <id>toptenvalidators</id>\n"
+ + " <updated>@TIME@</updated>\n"
+ + " <title type=\"text\" xml:lang=\"en\">top ten validators</title>\n"
+ + " <published>@TIME@</published>\n"
+ + " <link href=\"http://b216:8080/reporting/reports/toptenvalidators?alt=application/json\" type=\"application/json\" rel=\"alternate\"/>\n"
+ + " <author>\n"
+ + " <name>admin</name>\n"
+ + " </author>\n"
+ + " <category label=\"report definition\" scheme=\"urn:com:systinet:reporting:kind\" term=\"urn:com:systinet:reporting:kind:definition\"/>\n"
+ + "</entry>\n";
+
+ private static String ENTRY_STR_JSON =
+
+ "{" + "\"http:\\/\\/www.w3.org\\/2005\\/Atom.entry\":"
+ + "{"
+ + "\"@http:\\/\\/www.w3.org\\/XML\\/1998\\/namespace.base\":\"http:\\/\\/b216:8080\\/reporting\\/reports\","
+ + "\"http:\\/\\/www.w3.org\\/2005\\/Atom.id\":\"toptenvalidators\","
+ + "\"http:\\/\\/www.w3.org\\/2005\\/Atom.updated\":\"@TIME@\","
+ + "\"http:\\/\\/www.w3.org\\/2005\\/Atom.title\":{"
+ + "\"@type\":\"text\","
+ + "\"@http:\\/\\/www.w3.org\\/XML\\/1998\\/namespace.lang\":\"en\","
+ + "\"$\":\"top ten validators\"},"
+ + "\"http:\\/\\/www.w3.org\\/2005\\/Atom.published\":\"@TIME@\","
+ + "\"http:\\/\\/www.w3.org\\/2005\\/Atom.link\":"
+ + "{\"@href\":\"http:\\/\\/b216:8080\\/reporting\\/reports\\/toptenvalidators?alt=application\\/json\","
+ + "\"@type\":\"application\\/json\","
+ + "\"@rel\":\"alternate\"},"
+ + "\"http:\\/\\/www.w3.org\\/2005\\/Atom.author\":"
+ + "{\"http:\\/\\/www.w3.org\\/2005\\/Atom.name\":\"admin\"},"
+ + "\"http:\\/\\/www.w3.org\\/2005\\/Atom.category\":"
+ + "{\"@label\":\"report definition\","
+ + "\"@scheme\":\"urn:com:systinet:reporting:kind\","
+ + "\"@term\":\"urn:com:systinet:reporting:kind:definition\"},"
+ + "}"
+ + "}";
+
+ private static final String ENTRY;
+
+ private static final String ENTRY_JSON;
+
+ static {
+ try {
+ GregorianCalendar calendar = new GregorianCalendar();
+ calendar.setTimeInMillis((new Date()).getTime());
+ XMLGregorianCalendar xmlGregCal =
+ DatatypeFactory.newInstance().newXMLGregorianCalendar(calendar);
+ ENTRY = ENTRY_STR.replaceAll("@TIME@", xmlGregCal.toString());
+ ENTRY_JSON = ENTRY_STR_JSON.replaceAll("@TIME@", xmlGregCal.toString());
+ } catch (DatatypeConfigurationException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
Propchange: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/JettisonJAXBMappedTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/ObjectFactory.java?rev=808260&view=auto
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/ObjectFactory.java (added)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/ObjectFactory.java Thu Aug 27 02:52:04 2009
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * 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.wink.server.internal.providers.entity.jettison.jaxb;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+@XmlRegistry
+public class ObjectFactory {
+
+ public Person createPerson() {
+ return new Person();
+ }
+}
Propchange: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/ObjectFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/Person.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/Person.java?rev=808260&view=auto
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/Person.java (added)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/Person.java Thu Aug 27 02:52:04 2009
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * 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.wink.server.internal.providers.entity.jettison.jaxb;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class Person {
+
+ private String name;
+
+ private String desc;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
+}
Propchange: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/test/java/org/apache/wink/server/internal/providers/entity/jettison/jaxb/Person.java
------------------------------------------------------------------------------
svn:eol-style = native