Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREST-47 Skip links property when value is null, not just an empty list.

Browse Source
This commit is contained in:
Jon Brisbin
2012-09-11 08:30:05 -05:00
committed by Jon Brisbin
parent 61de409f90
commit 143ae89c6d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/RepositoryAwareJacksonModule.java
View File

@@ -261,6 +261,8 @@ public class RepositoryAwareJacksonModule extends SimpleModule implements Initia
while((tok = jp.nextToken()) != JsonToken.END_ARRAY) {
// Advance past the links
}
} else if(tok == JsonToken.VALUE_NULL) {
// skip null value
} else {
throw new HttpMessageNotReadableException(
"Property 'links' is not of array type. Either eliminate this property from the document or make it an array.");
@@ -282,7 +284,7 @@ public class RepositoryAwareJacksonModule extends SimpleModule implements Initia
}
if((tok = jp.nextToken()) == JsonToken.START_ARRAY) {
while((tok = jp.nextToken()) != JsonToken.END_ARRAY) {
while((tok = jp.nextToken()) != JsonToken.END_ARRAY) {
Object cval = jp.readValueAs(attrMeta.elementType());
c.add(cval);
}
@@ -301,7 +303,7 @@ public class RepositoryAwareJacksonModule extends SimpleModule implements Initia
}
if((tok = jp.nextToken()) == JsonToken.START_ARRAY) {
while((tok = jp.nextToken()) != JsonToken.END_ARRAY) {
while((tok = jp.nextToken()) != JsonToken.END_ARRAY) {
Object sval = jp.readValueAs(attrMeta.elementType());
s.add(sval);
}