From 9a73194e1b88e3b0ee9de1149d22cbb1d97bf83a Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <odrotbohm@pivotal.io>
Date: Tue, 11 Feb 2020 18:08:34 +0100
Subject: [PATCH] #1201 - Switched to EntityModel factory methods where
 possible.

---
 .../mediatype/collectionjson/Jackson2CollectionJsonModule.java  | 2 +-
 .../hateoas/server/RepresentationModelAssembler.java            | 2 +-
 .../server/reactive/ReactiveRepresentationModelAssembler.java   | 2 +-
 .../reactive/SimpleReactiveRepresentationModelAssembler.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java
index c50b57c7..6fa27a37 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java
@@ -886,7 +886,7 @@ public class Jackson2CollectionJsonModule extends SimpleModule {
 	static class CollectionJsonResourcesDeserializer extends CollectionJsonDeserializerBase<CollectionModel<?>> {
 
 		private static final long serialVersionUID = 6406522912020578141L;
-		private static final BiFunction<List<Object>, Links, CollectionModel<?>> FINISHER = CollectionModel::new;
+		private static final BiFunction<List<Object>, Links, CollectionModel<?>> FINISHER = CollectionModel::of;
 		private static final Function<JavaType, CollectionJsonDeserializerBase<CollectionModel<?>>> CONTEXTUAL_CREATOR = CollectionJsonResourcesDeserializer::new;
 
 		CollectionJsonResourcesDeserializer() {
diff --git a/src/main/java/org/springframework/hateoas/server/RepresentationModelAssembler.java b/src/main/java/org/springframework/hateoas/server/RepresentationModelAssembler.java
index 3a2b1b12..e1224af2 100755
--- a/src/main/java/org/springframework/hateoas/server/RepresentationModelAssembler.java
+++ b/src/main/java/org/springframework/hateoas/server/RepresentationModelAssembler.java
@@ -48,6 +48,6 @@ public interface RepresentationModelAssembler<T, D extends RepresentationModel<?
 
 		return StreamSupport.stream(entities.spliterator(), false) //
 				.map(this::toModel) //
-				.collect(Collectors.collectingAndThen(Collectors.toList(), CollectionModel::new));
+				.collect(Collectors.collectingAndThen(Collectors.toList(), CollectionModel::of));
 	}
 }
diff --git a/src/main/java/org/springframework/hateoas/server/reactive/ReactiveRepresentationModelAssembler.java b/src/main/java/org/springframework/hateoas/server/reactive/ReactiveRepresentationModelAssembler.java
index 45540b75..cf78d9a8 100644
--- a/src/main/java/org/springframework/hateoas/server/reactive/ReactiveRepresentationModelAssembler.java
+++ b/src/main/java/org/springframework/hateoas/server/reactive/ReactiveRepresentationModelAssembler.java
@@ -52,6 +52,6 @@ public interface ReactiveRepresentationModelAssembler<T, D extends Representatio
 
 		return entities.flatMap(entity -> toModel(entity, exchange)) //
 				.collectList() //
-				.map(CollectionModel::new);
+				.map(CollectionModel::of);
 	}
 }
diff --git a/src/main/java/org/springframework/hateoas/server/reactive/SimpleReactiveRepresentationModelAssembler.java b/src/main/java/org/springframework/hateoas/server/reactive/SimpleReactiveRepresentationModelAssembler.java
index 2b897240..84d7cf39 100644
--- a/src/main/java/org/springframework/hateoas/server/reactive/SimpleReactiveRepresentationModelAssembler.java
+++ b/src/main/java/org/springframework/hateoas/server/reactive/SimpleReactiveRepresentationModelAssembler.java
@@ -68,7 +68,7 @@ public interface SimpleReactiveRepresentationModelAssembler<T>
 		return entities //
 				.flatMap(entity -> toModel(entity, exchange)) //
 				.collectList() //
-				.map(CollectionModel::new) //
+				.map(CollectionModel::of) //
 				.map(it -> addLinks(it, exchange));
 	}