From 1406af8f71af973057bd168389e21c9ff34217fa Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <odrotbohm@pivotal.io>
Date: Tue, 14 Jan 2020 14:49:45 +0100
Subject: [PATCH] DATACMNS-1647 - Switched to use factory methods of
 RepresentationModel types.

---
 .../data/web/PagedResourcesAssembler.java              | 10 +++++-----
 .../data/domain/jaxb/SpringDataJaxbUnitTests.java      |  4 ++--
 .../data/web/PagedResourcesAssemblerUnitTests.java     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springframework/data/web/PagedResourcesAssembler.java b/src/main/java/org/springframework/data/web/PagedResourcesAssembler.java
index 87aee9ac2..6c94a263a 100644
--- a/src/main/java/org/springframework/data/web/PagedResourcesAssembler.java
+++ b/src/main/java/org/springframework/data/web/PagedResourcesAssembler.java
@@ -94,7 +94,7 @@ public class PagedResourcesAssembler<T> implements RepresentationModelAssembler<
 	@Override
 	@SuppressWarnings("null")
 	public PagedModel<EntityModel<T>> toModel(Page<T> entity) {
-		return toModel(entity, it -> new EntityModel<>(it));
+		return toModel(entity, it -> EntityModel.of(it));
 	}
 
 	/**
@@ -107,7 +107,7 @@ public class PagedResourcesAssembler<T> implements RepresentationModelAssembler<
 	 * @return
 	 */
 	public PagedModel<EntityModel<T>> toModel(Page<T> page, Link selfLink) {
-		return toModel(page, it -> new EntityModel<>(it), selfLink);
+		return toModel(page, it -> EntityModel.of(it), selfLink);
 	}
 
 	/**
@@ -178,7 +178,7 @@ public class PagedResourcesAssembler<T> implements RepresentationModelAssembler<
 		EmbeddedWrapper wrapper = wrappers.emptyCollectionOf(type);
 		List<EmbeddedWrapper> embedded = Collections.singletonList(wrapper);
 
-		return addPaginationLinks(new PagedModel<>(embedded, metadata), page, link);
+		return addPaginationLinks(PagedModel.of(embedded, metadata), page, link);
 	}
 
 	/**
@@ -196,7 +196,7 @@ public class PagedResourcesAssembler<T> implements RepresentationModelAssembler<
 		Assert.notNull(metadata, "PageMetadata must not be null!");
 		Assert.notNull(page, "Page must not be null!");
 
-		return new PagedModel<>(resources, metadata);
+		return PagedModel.of(resources, metadata);
 	}
 
 	private <S, R extends RepresentationModel<?>> PagedModel<R> createModel(Page<S> page,
@@ -274,7 +274,7 @@ public class PagedResourcesAssembler<T> implements RepresentationModelAssembler<
 		UriComponentsBuilder builder = fromUri(base.expand());
 		pageableResolver.enhance(builder, getMethodParameter(), pageable);
 
-		return new Link(UriTemplate.of(builder.build().toString()), relation);
+		return Link.of(UriTemplate.of(builder.build().toString()), relation);
 	}
 
 	/**
diff --git a/src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java b/src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java
index a52465ec6..7749f9645 100755
--- a/src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java
+++ b/src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java
@@ -160,8 +160,8 @@ public class SpringDataJaxbUnitTests {
 
 		@Override
 		protected List<Link> getLinks(Page<?> source) {
-			return Arrays.asList(new Link(IanaLinkRelations.NEXT.value(), IanaLinkRelations.NEXT),
-					new Link(IanaLinkRelations.PREV.value(), IanaLinkRelations.PREV));
+			return Arrays.asList(Link.of(IanaLinkRelations.NEXT.value(), IanaLinkRelations.NEXT),
+					Link.of(IanaLinkRelations.PREV.value(), IanaLinkRelations.PREV));
 		}
 	}
 }
diff --git a/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java b/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java
index 9493d01ae..b79f3c3e0 100755
--- a/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java
+++ b/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java
@@ -107,7 +107,7 @@ public class PagedResourcesAssemblerUnitTests {
 	@Test
 	public void usesCustomLinkProvided() {
 
-		Link link = new Link("https://foo:9090", "rel");
+		Link link = Link.of("https://foo:9090", "rel");
 
 		PagedModel<EntityModel<Person>> resources = assembler.toModel(createPage(1), link);