svn commit: r1551197 - in /stanbol/trunk/entityhub/jersey: ./ src/main/java/org/apache/stanbol/entityhub/web/writer/

[rwesten]

Author: rwesten
Date: Mon Dec 16 12:23:29 2013
New Revision: 1551197

URL: http://svn.apache.org/r1551197
Log:
STANBOL-1237: some bug fixes in the Writer

Modified:
    stanbol/trunk/entityhub/jersey/pom.xml
    
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/EntityWriter.java
    
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/RepresentationWriter.java
    
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ResultListWriter.java

Modified: stanbol/trunk/entityhub/jersey/pom.xml
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/pom.xml?rev=1551197&r1=1551196&r2=1551197&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/pom.xml (original)
+++ stanbol/trunk/entityhub/jersey/pom.xml Mon Dec 16 12:23:29 2013
@@ -65,6 +65,7 @@
               org.apache.stanbol.entityhub.jersey.*; 
version=${project.version},
               org.apache.stanbol.entityhub.web.impl; 
version=${project.version},
               org.apache.stanbol.entityhub.web.writer; 
version=${project.version},
+              org.apache.stanbol.entityhub.web.reader; 
version=${project.version}
             </Private-Package>
           </instructions>
         </configuration>

Modified: 
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/EntityWriter.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/EntityWriter.java?rev=1551197&r1=1551196&r2=1551197&view=diff
==============================================================================
--- 
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/EntityWriter.java
 (original)
+++ 
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/EntityWriter.java
 Mon Dec 16 12:23:29 2013
@@ -61,10 +61,14 @@ public class EntityWriter implements Mes
 
     @Override
     public boolean isWriteable(Class<?> type, Type genericType, Annotation[] 
annotations, MediaType mediaType) {
-        if(mediaType.isWildcardType() && mediaType.isWildcardSubtype()){
-            mediaType = ModelWriter.DEFAULT_MEDIA_TYPE;
+        if(Entity.class.isAssignableFrom(type)){
+            if(mediaType.isWildcardType() && mediaType.isWildcardSubtype()){
+                mediaType = ModelWriter.DEFAULT_MEDIA_TYPE;
+            }
+            return writerRegistry.isWriteable(getMatchType(mediaType), null);
+        } else {
+            return false;
         }
-        return writerRegistry.isWriteable(getMatchType(mediaType), null);
     }
 
     @Override

Modified: 
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/RepresentationWriter.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/RepresentationWriter.java?rev=1551197&r1=1551196&r2=1551197&view=diff
==============================================================================
--- 
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/RepresentationWriter.java
 (original)
+++ 
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/RepresentationWriter.java
 Mon Dec 16 12:23:29 2013
@@ -61,10 +61,14 @@ public class RepresentationWriter implem
 
     @Override
     public boolean isWriteable(Class<?> type, Type genericType, Annotation[] 
annotations, MediaType mediaType) {
-        if(mediaType.isWildcardType() && mediaType.isWildcardSubtype()){
-            mediaType = ModelWriter.DEFAULT_MEDIA_TYPE;
+        if(Representation.class.isAssignableFrom(type)){
+            if(mediaType.isWildcardType() && mediaType.isWildcardSubtype()){
+                mediaType = ModelWriter.DEFAULT_MEDIA_TYPE;
+            }
+            return writerRegistry.isWriteable(getMatchType(mediaType), null);
+        } else {
+            return false;
         }
-        return writerRegistry.isWriteable(getMatchType(mediaType), null);
     }
 
     @Override

Modified: 
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ResultListWriter.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ResultListWriter.java?rev=1551197&r1=1551196&r2=1551197&view=diff
==============================================================================
--- 
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ResultListWriter.java
 (original)
+++ 
stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/web/writer/ResultListWriter.java
 Mon Dec 16 12:23:29 2013
@@ -61,10 +61,14 @@ public class ResultListWriter implements
 
     @Override
     public boolean isWriteable(Class<?> type, Type genericType, Annotation[] 
annotations, MediaType mediaType) {
-        if(mediaType.isWildcardType() && mediaType.isWildcardSubtype()){
-            mediaType = ModelWriter.DEFAULT_MEDIA_TYPE;
+        if(QueryResultList.class.isAssignableFrom(type)){
+            if(mediaType.isWildcardType() && mediaType.isWildcardSubtype()){
+                mediaType = ModelWriter.DEFAULT_MEDIA_TYPE;
+            }
+            return writerRegistry.isWriteable(getMatchType(mediaType), null);
+        } else {
+            return false;
         }
-        return writerRegistry.isWriteable(getMatchType(mediaType), null);
     }
 
     @Override