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

#1648 - Removed further deprecations.

Browse Source
This commit is contained in:
Oliver Drotbohm
2021-09-21 17:46:04 +02:00
parent 054d2bf7d1
commit fe1657386d
13 changed files with 20 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/springframework/hateoas/CollectionModel.java
View File

@@ -50,31 +50,11 @@ public class CollectionModel<T> extends RepresentationModel<CollectionModel<T>>
* Creates an empty {@link CollectionModel} instance.
*/
protected CollectionModel() {
this(new ArrayList<>());
this(Collections.emptyList());
}
/**
* Creates a {@link CollectionModel} instance with the given content and {@link Link}s (optional).
*
* @param content must not be {@literal null}.
* @param links the links to be added to the {@link CollectionModel}.
* @deprecated since 1.1, use {@link #of(Iterable, Link...)} instead.
*/
@Deprecated
public CollectionModel(Iterable<T> content, Link... links) {
this(content, Arrays.asList(links));
}
/**
* Creates a {@link CollectionModel} instance with the given content and {@link Link}s.
*
* @param content must not be {@literal null}.
* @param links the links to be added to the {@link CollectionModel}.
* @deprecated since 1.1, use {@link #of(Iterable, Iterable)} instead.
*/
@Deprecated
public CollectionModel(Iterable<T> content, Iterable<Link> links) {
this(content, links, null);
protected CollectionModel(Iterable<T> content) {
this(content, Links.NONE, null);
}
protected CollectionModel(Iterable<T> content, Iterable<Link> links, @Nullable ResolvableType fallbackType) {
@@ -200,7 +180,7 @@ public class CollectionModel<T> extends RepresentationModel<CollectionModel<T>>
* @see #withFallbackType(ResolvableType)
*/
public static <T> CollectionModel<T> of(Iterable<T> content, Iterable<Link> links) {
return new CollectionModel<>(content, links);
return new CollectionModel<>(content, links, null);
}
/**