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

#165 - Removed support for Jackson 1.x.

Browse Source
This commit is contained in:
Oliver Gierke
2014-03-21 17:35:05 +01:00
parent d11bec0bc3
commit 8436e9ed4e
20 changed files with 63 additions and 1052 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/org/springframework/hateoas/PagedResources.java
View File

@@ -24,6 +24,9 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.springframework.util.Assert;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* DTO to implement binding response representations of pageable collections.
*
@@ -71,8 +74,7 @@ public class PagedResources<T> extends Resources<T> {
*
* @return the metadata
*/
@org.codehaus.jackson.annotate.JsonProperty("page")
@com.fasterxml.jackson.annotation.JsonProperty("page")
@JsonProperty("page")
public PageMetadata getMetadata() {
return metadata;
}
@@ -103,8 +105,7 @@ public class PagedResources<T> extends Resources<T> {
* @see #addPaginationLinks(Link)
* @return
*/
@com.fasterxml.jackson.annotation.JsonIgnore
@org.codehaus.jackson.annotate.JsonIgnore
@JsonIgnore
public Link getNextLink() {
return getLink(Link.REL_NEXT);
}
@@ -115,8 +116,7 @@ public class PagedResources<T> extends Resources<T> {
* @see #addPaginationLinks(Link)
* @return
*/
@com.fasterxml.jackson.annotation.JsonIgnore
@org.codehaus.jackson.annotate.JsonIgnore
@JsonIgnore
public Link getPreviousLink() {
return getLink(Link.REL_PREVIOUS);
}
@@ -170,25 +170,10 @@ public class PagedResources<T> extends Resources<T> {
*/
public static class PageMetadata {
@XmlAttribute//
@org.codehaus.jackson.annotate.JsonProperty//
@com.fasterxml.jackson.annotation.JsonProperty//
private long size;
@XmlAttribute//
@org.codehaus.jackson.annotate.JsonProperty//
@com.fasterxml.jackson.annotation.JsonProperty//
private long totalElements;
@XmlAttribute//
@org.codehaus.jackson.annotate.JsonProperty//
@com.fasterxml.jackson.annotation.JsonProperty//
private long totalPages;
@XmlAttribute//
@org.codehaus.jackson.annotate.JsonProperty//
@com.fasterxml.jackson.annotation.JsonProperty//
private long number;
@XmlAttribute @JsonProperty private long size;
@XmlAttribute @JsonProperty private long totalElements;
@XmlAttribute @JsonProperty private long totalPages;
@XmlAttribute @JsonProperty private long number;
protected PageMetadata() {