From f1407b253e2021de53e92e412377ee8433114208 Mon Sep 17 00:00:00 2001 From: vachillo Date: Tue, 14 Jul 2020 13:17:07 -0400 Subject: [PATCH] #1320 - Update Javadoc and toString() methods in renamed representation model classes. --- .../org/springframework/hateoas/CollectionModel.java | 9 ++++----- .../java/org/springframework/hateoas/EntityModel.java | 9 ++++----- .../java/org/springframework/hateoas/PagedModel.java | 8 ++++---- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/springframework/hateoas/CollectionModel.java b/src/main/java/org/springframework/hateoas/CollectionModel.java index 21b8cf1e..4dd86563 100644 --- a/src/main/java/org/springframework/hateoas/CollectionModel.java +++ b/src/main/java/org/springframework/hateoas/CollectionModel.java @@ -115,7 +115,6 @@ public class CollectionModel extends RepresentationModel> * Creates a {@link CollectionModel} instance with the given content. * * @param content must not be {@literal null}. - * @param links the links to be added to the {@link CollectionModel}. * @return * @since 1.1 */ @@ -189,16 +188,16 @@ public class CollectionModel extends RepresentationModel> /* * (non-Javadoc) - * @see org.springframework.hateoas.ResourceSupport#toString() + * @see org.springframework.hateoas.RepresentationModel#toString() */ @Override public String toString() { - return String.format("Resources { content: %s, %s }", getContent(), super.toString()); + return String.format("CollectionModel { content: %s, %s }", getContent(), super.toString()); } /* * (non-Javadoc) - * @see org.springframework.hateoas.ResourceSupport#equals(java.lang.Object) + * @see org.springframework.hateoas.RepresentationModel#equals(java.lang.Object) */ @Override public boolean equals(@Nullable Object obj) { @@ -219,7 +218,7 @@ public class CollectionModel extends RepresentationModel> /* * (non-Javadoc) - * @see org.springframework.hateoas.ResourceSupport#hashCode() + * @see org.springframework.hateoas.RepresentationModel#hashCode() */ @Override public int hashCode() { diff --git a/src/main/java/org/springframework/hateoas/EntityModel.java b/src/main/java/org/springframework/hateoas/EntityModel.java index d7fee163..b970f583 100644 --- a/src/main/java/org/springframework/hateoas/EntityModel.java +++ b/src/main/java/org/springframework/hateoas/EntityModel.java @@ -78,7 +78,6 @@ public class EntityModel extends RepresentationModel> { * Creates a new {@link EntityModel} with the given content. * * @param content must not be {@literal null}. - * @param links the links to add to the {@link EntityModel}. * @return * @since 1.1 */ @@ -149,16 +148,16 @@ public class EntityModel extends RepresentationModel> { /* * (non-Javadoc) - * @see org.springframework.hateoas.ResourceSupport#toString() + * @see org.springframework.hateoas.RepresentationModel#toString() */ @Override public String toString() { - return String.format("Resource { content: %s, %s }", getContent(), super.toString()); + return String.format("EntityModel { content: %s, %s }", getContent(), super.toString()); } /* * (non-Javadoc) - * @see org.springframework.hateoas.ResourceSupport#equals(java.lang.Object) + * @see org.springframework.hateoas.RepresentationModel#equals(java.lang.Object) */ @Override public boolean equals(@Nullable Object obj) { @@ -179,7 +178,7 @@ public class EntityModel extends RepresentationModel> { /* * (non-Javadoc) - * @see org.springframework.hateoas.ResourceSupport#hashCode() + * @see org.springframework.hateoas.RepresentationModel#hashCode() */ @Override public int hashCode() { diff --git a/src/main/java/org/springframework/hateoas/PagedModel.java b/src/main/java/org/springframework/hateoas/PagedModel.java index 0456a2ca..87b1aed0 100644 --- a/src/main/java/org/springframework/hateoas/PagedModel.java +++ b/src/main/java/org/springframework/hateoas/PagedModel.java @@ -234,16 +234,16 @@ public class PagedModel extends CollectionModel { /* * (non-Javadoc) - * @see org.springframework.hateoas.ResourceSupport#toString() + * @see org.springframework.hateoas.RepresentationModel#toString() */ @Override public String toString() { - return String.format("PagedResource { content: %s, metadata: %s, links: %s }", getContent(), metadata, getLinks()); + return String.format("PagedModel { content: %s, metadata: %s, links: %s }", getContent(), metadata, getLinks()); } /* * (non-Javadoc) - * @see org.springframework.hateoas.Resources#equals(java.lang.Object) + * @see org.springframework.hateoas.CollectionModel#equals(java.lang.Object) */ @Override public boolean equals(@Nullable Object obj) { @@ -264,7 +264,7 @@ public class PagedModel extends CollectionModel { /* * (non-Javadoc) - * @see org.springframework.hateoas.Resources#hashCode() + * @see org.springframework.hateoas.CollectionModel#hashCode() */ @Override public int hashCode() {