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

#831 - Introduce null handling.

Browse Source
This commit is contained in:
Greg Turnquist
2019-03-05 15:52:52 -06:00
parent c4e1bedec8
commit 40250d1738
71 changed files with 520 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/hateoas/PagedModel.java
View File

@@ -20,6 +20,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Optional;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -51,7 +52,7 @@ public class PagedModel<T> extends CollectionModel<T> {
* @param metadata
* @param links
*/
public PagedModel(Collection<T> content, PageMetadata metadata, Link... links) {
public PagedModel(Collection<T> content, @Nullable PageMetadata metadata, Link... links) {
this(content, metadata, Arrays.asList(links));
}
@@ -62,7 +63,7 @@ public class PagedModel<T> extends CollectionModel<T> {
* @param metadata
* @param links
*/
public PagedModel(Collection<T> content, PageMetadata metadata, Iterable<Link> links) {
public PagedModel(Collection<T> content, @Nullable PageMetadata metadata, Iterable<Link> links) {
super(content, links);
@@ -75,6 +76,7 @@ public class PagedModel<T> extends CollectionModel<T> {
* @return the metadata
*/
@JsonProperty("page")
@Nullable
public PageMetadata getMetadata() {
return metadata;
}