amarkevich closed pull request #389: [CXF-7672] PrimitiveTextProvider: support
java.net.URI and java.net.URL
URL: https://github.com/apache/cxf/pull/389
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
index 2f3dbfba733..2bfb69b9f81 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
@@ -38,14 +38,15 @@
import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.apache.cxf.jaxrs.utils.InjectionUtils;
-@Consumes("text/plain")
-@Produces("text/plain")
+@Consumes(MediaType.TEXT_PLAIN)
+@Produces(MediaType.TEXT_PLAIN)
public class PrimitiveTextProvider<T> extends AbstractConfigurableProvider
implements MessageBodyReader<T>, MessageBodyWriter<T> {
private static boolean isSupported(Class<?> type, MediaType mt) {
- boolean isPrimitive = InjectionUtils.isPrimitiveOnly(type) ||
Enum.class.isAssignableFrom(type);
- return isPrimitive && mt.isCompatible(MediaType.TEXT_PLAIN_TYPE);
+ boolean isPrimitive = InjectionUtils.isPrimitiveOnly(type);
+ return (isPrimitive || Enum.class.isAssignableFrom(type) ||
java.net.URI.class == type
+ || java.net.URL.class == type) &&
mt.isCompatible(MediaType.TEXT_PLAIN_TYPE);
}
public boolean isReadable(Class<?> type, Type genericType, Annotation[]
annotations, MediaType mt) {
diff --git
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
index b972c79e44f..b5c8d36b739 100644
---
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
+++
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
@@ -215,20 +215,34 @@ public void testReadChineeseChars() throws Exception {
TEST
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testEnum() throws Exception {
- PrimitiveTextProvider p = new PrimitiveTextProvider<Object>();
+ testClass(TestEnum.TEST);
+ }
+
+ @Test
+ public void testURI() throws Exception {
+ testClass(new java.net.URI("uri"));
+ }
- assertTrue(p.isWriteable(TestEnum.class, null, null,
MediaType.TEXT_PLAIN_TYPE));
+ @Test
+ public void testURL() throws Exception {
+ testClass(new java.net.URL("http://www.example.com";));
+ }
+
+ private void testClass(Object value) throws Exception {
+ final PrimitiveTextProvider<Object> p = new
PrimitiveTextProvider<Object>();
+
+ assertTrue(p.isWriteable(value.getClass(), null, null,
MediaType.TEXT_PLAIN_TYPE));
ByteArrayOutputStream os = new ByteArrayOutputStream();
- p.writeTo(TestEnum.TEST, null, null, null, MediaType.TEXT_PLAIN_TYPE,
null, os);
- assertTrue(Arrays.equals(TestEnum.TEST.toString().getBytes(),
os.toByteArray()));
+ p.writeTo(value, null, null, null, MediaType.TEXT_PLAIN_TYPE, null,
os);
+ assertTrue(Arrays.equals(value.toString().getBytes(),
os.toByteArray()));
- assertTrue(p.isReadable(TestEnum.class, null, null,
MediaType.TEXT_PLAIN_TYPE));
- TestEnum valueRead = (TestEnum) p.readFrom(TestEnum.class, null, null,
null, null,
+ assertTrue(p.isReadable(value.getClass(), null, null,
MediaType.TEXT_PLAIN_TYPE));
+ @SuppressWarnings("unchecked")
+ Object valueRead = p.readFrom((Class<Object>) value.getClass(), null,
null, null, null,
new ByteArrayInputStream(os.toByteArray()));
- assertSame(TestEnum.TEST, valueRead);
+ assertEquals(value, valueRead);
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
