Author: sergeyb
Date: Fri Mar 15 17:08:40 2013
New Revision: 1457021
URL: http://svn.apache.org/r1457021
Log:
[CXF-4891] Adding a test where the content type is modified directly from MBW
Added:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContentTypeModifyingMBW.java
(with props)
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java?rev=1457021&r1=1457020&r2=1457021&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
Fri Mar 15 17:08:40 2013
@@ -63,6 +63,7 @@ public class BookServer extends Abstract
p.setEnableBuffering(true);
p.setReportByteArraySize(true);
providers.add(p);
+ providers.add(new ContentTypeModifyingMBW());
JAXBElementProvider<?> jaxbProvider = new
JAXBElementProvider<Object>();
Map<String, String> jaxbElementClassMap = new HashMap<String,
String>();
jaxbElementClassMap.put(BookNoXmlRootElement.class.getName(),
"BookNoXmlRootElement");
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1457021&r1=1457020&r2=1457021&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
Fri Mar 15 17:08:40 2013
@@ -134,6 +134,13 @@ public class BookStore {
}
@GET
+ @Path("/customtext")
+ @Produces("text/custom")
+ public String getCustomBookTest() {
+ return "Good book";
+ }
+
+ @GET
@Path("/booknames/123")
@Produces("application/bar")
public byte[] getBookName123() {
Added:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContentTypeModifyingMBW.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContentTypeModifyingMBW.java?rev=1457021&view=auto
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContentTypeModifyingMBW.java
(added)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContentTypeModifyingMBW.java
Fri Mar 15 17:08:40 2013
@@ -0,0 +1,51 @@
+/**
+ * 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.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+public class ContentTypeModifyingMBW implements MessageBodyWriter<String> {
+
+ @Override
+ public long getSize(String arg0, Class<?> arg1, Type arg2, Annotation[]
arg3, MediaType arg4) {
+ return -1;
+ }
+
+ @Override
+ public boolean isWriteable(Class<?> arg0, Type arg1, Annotation[] arg2,
MediaType mt) {
+ return mt.toString().equals("text/custom");
+ }
+
+ @Override
+ public void writeTo(String str, Class<?> arg1, Type arg2, Annotation[]
arg3, MediaType mt,
+ MultivaluedMap<String, Object> headers, OutputStream
os) throws IOException,
+ WebApplicationException {
+ headers.putSingle("Content-Type", mt.toString() + ";charset=us-ascii");
+ os.write(str.getBytes());
+ }
+
+}
Propchange:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContentTypeModifyingMBW.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ContentTypeModifyingMBW.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=1457021&r1=1457020&r2=1457021&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Fri Mar 15 17:08:40 2013
@@ -87,6 +87,18 @@ public class JAXRSClientServerBookTest e
createStaticBus();
}
+
+
+ @Test
+ public void testGetCustomBookText() {
+ String address = "http://localhost:"; + PORT + "/bookstore/customtext";
+ WebClient wc = WebClient.create(address);
+ Response r = wc.accept("text/custom").get();
+ String name = r.readEntity(String.class);
+ assertEquals("Good book", name);
+ assertEquals("text/custom;charset=us-ascii",
r.getMediaType().toString());
+ }
+
@Test
public void testGetBookNameAsByteArray() {
String address = "http://localhost:"; + PORT +
"/bookstore/booknames/123";
