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/07/13 19:26:07 UTC
svn commit: r793633 - in /incubator/wink/trunk/wink-common/src:
main/java/org/apache/wink/common/internal/providers/entity/
test/java/org/apache/wink/common/internal/providers/entity/
Author: bluk
Date: Mon Jul 13 17:26:06 2009
New Revision: 793633
URL: http://svn.apache.org/viewvc?rev=793633&view=rev
Log:
Update reverse isAssignableFrom for readers
See [WINK-53]
Modified:
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/DataSourceProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/InputStreamProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/ReaderProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/SourceProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/DataSourceProviderTest.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ReaderProviderTest.java
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/DataSourceProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/DataSourceProvider.java?rev=793633&r1=793632&r2=793633&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/DataSourceProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/DataSourceProvider.java Mon Jul 13 17:26:06 2009
@@ -43,7 +43,7 @@
public class DataSourceProvider implements MessageBodyReader<DataSource>, MessageBodyWriter<DataSource> {
public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
- return DataSource.class == type;
+ return type.isAssignableFrom(DataSource.class);
}
public DataSource readFrom(Class<DataSource> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, String> httpHeaders,
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java?rev=793633&r1=793632&r2=793633&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java Mon Jul 13 17:26:06 2009
@@ -82,7 +82,7 @@
public boolean isReadable(Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType) {
- return File.class == type;
+ return type.isAssignableFrom(File.class);
}
public File readFrom(Class<File> type, Type genericType,
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/InputStreamProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/InputStreamProvider.java?rev=793633&r1=793632&r2=793633&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/InputStreamProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/InputStreamProvider.java Mon Jul 13 17:26:06 2009
@@ -45,7 +45,7 @@
public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations,
MediaType mediaType) {
- return type != null && InputStream.class == type;
+ return type != null && type.isAssignableFrom(InputStream.class);
}
public InputStream readFrom(Class<InputStream> type, Type genericType,
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/ReaderProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/ReaderProvider.java?rev=793633&r1=793632&r2=793633&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/ReaderProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/ReaderProvider.java Mon Jul 13 17:26:06 2009
@@ -52,7 +52,7 @@
}
public boolean isReadable(Class<?> type, Type genericType, Annotation annotations[], MediaType mediaType) {
- return Reader.class == type;
+ return type.isAssignableFrom(Reader.class);
}
public Reader readFrom(Class<Reader> type, Type genericType, Annotation annotations[], MediaType mediaType, MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/SourceProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/SourceProvider.java?rev=793633&r1=793632&r2=793633&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/SourceProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/SourceProvider.java Mon Jul 13 17:26:06 2009
@@ -67,7 +67,7 @@
public static class StreamSourceProvider extends SourceProvider implements MessageBodyReader<Source> {
public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
- return ((Source.class == type || StreamSource.class == type) && super.isReadable(mediaType));
+ return (type.isAssignableFrom(StreamSource.class) && super.isReadable(mediaType));
}
public StreamSource readFrom(Class<Source> type, Type genericType, Annotation[] annotations,
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java?rev=793633&r1=793632&r2=793633&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java Mon Jul 13 17:26:06 2009
@@ -48,7 +48,7 @@
private static final Logger logger = LoggerFactory.getLogger(StringProvider.class);
public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
- return type == String.class;
+ return type.isAssignableFrom(String.class);
}
public String readFrom(Class<String> type, Type genericType, Annotation[] annotations, MediaType mediaType,
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/DataSourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/DataSourceProviderTest.java?rev=793633&r1=793632&r2=793633&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/DataSourceProviderTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/DataSourceProviderTest.java Mon Jul 13 17:26:06 2009
@@ -50,8 +50,10 @@
DataSourceProvider.ByteArrayDataSource bads = new DataSourceProvider.ByteArrayDataSource(bais, "text/plain");
// Check if readable - assert true
- assertFalse(dsp.isReadable(DataSourceProvider.ByteArrayDataSource.class, null, null, null));
+ assertTrue(dsp.isReadable(DataSource.class, null, null, null));
+ assertTrue(dsp.isReadable(Object.class, null, null, null));
// Check if readable - assert false
+ assertFalse(dsp.isReadable(DataSourceProvider.ByteArrayDataSource.class, null, null, null));
assertFalse(" Reading to String.class is not supported", dsp.isReadable(String.class, null, null, null));
DataSource ds = null;
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ReaderProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ReaderProviderTest.java?rev=793633&r1=793632&r2=793633&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ReaderProviderTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ReaderProviderTest.java Mon Jul 13 17:26:06 2009
@@ -48,8 +48,10 @@
ReaderProvider rp = new ReaderProvider();
// Check if readable - assert true
- assertFalse(rp.isReadable(StringReader.class, null, null, null));
+ assertTrue(rp.isReadable(Reader.class, null, null, null));
+ assertTrue(rp.isReadable(Object.class, null, null, null));
// Check if readable - assert false
+ assertFalse(rp.isReadable(StringReader.class, null, null, null));
assertFalse(" Reading from String.class is not supported", rp.isReadable(String.class, null, null, null));
Reader reader = null;