#1147 - Make sure we explicitly expose all media type model properties.

Jackson can be configured to not auto-detect properties on objects to be rendered, requiring them to be explicitly annotated with @JsonProperty to be exposed. In such a configuration setup, some of our model types do not work properly as so far we have expected public properties to be included automatically.

This commit changes that to explicitly include @JsonProperty on all of the getter methods exposed.

src/main/java/org/springframework/hateoas/Link.java

@@ -37,6 +37,7 @@ import org.springframework.util.StringUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Value object for links.
@@ -46,9 +47,9 @@ import com.fasterxml.jackson.annotation.JsonInclude;
  * @author Jens Schauder
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonIgnoreProperties(value = "templated", ignoreUnknown = true)
+@JsonIgnoreProperties(value = { "templated", "template" }, ignoreUnknown = true)
 @AllArgsConstructor(access = AccessLevel.PACKAGE)
-@Getter
+@Getter(onMethod = @__(@JsonProperty))
 @EqualsAndHashCode(
 		of = { "rel", "href", "hreflang", "media", "title", "type", "deprecation", "profile", "name", "affordances" })
 public class Link implements Serializable {

src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJson.java

@@ -16,6 +16,7 @@
 package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.Wither;
 
@@ -39,6 +40,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Greg Turnquist
  */
 @Value
+@Getter(onMethod = @__(@JsonProperty))
 @Wither(AccessLevel.PACKAGE)
 class CollectionJson<T> {
 

src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonData.java

@@ -15,13 +15,13 @@
  */
 package org.springframework.hateoas.mediatype.collectionjson;
 
+import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.Wither;
 
 import org.springframework.lang.Nullable;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -30,17 +30,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Greg Turnquist
  */
 @Value
+@Getter(onMethod = @__(@JsonProperty))
+@JsonInclude(Include.NON_NULL)
 @Wither
-@JsonIgnoreProperties()
 class CollectionJsonData {
 
-	@JsonInclude(Include.NON_NULL) //
 	private @Nullable String name;
-
-	@JsonInclude(Include.NON_NULL) //
 	private @Nullable Object value;
-
-	@JsonInclude(Include.NON_NULL) //
 	private @Nullable String prompt;
 
 	@JsonCreator

src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonDocument.java

@@ -16,6 +16,7 @@
 package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
 import lombok.experimental.Wither;
@@ -33,6 +34,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Greg Turnquist
  */
 @Value
+@Getter(onMethod = @__(@JsonProperty))
 @Wither(AccessLevel.PACKAGE)
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 class CollectionJsonDocument<T> {

src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonItem.java

@@ -45,6 +45,7 @@ import com.fasterxml.jackson.databind.JavaType;
  * @author Greg Turnquist
  */
 @Value
+@Getter(onMethod = @__(@JsonProperty))
 @Wither(AccessLevel.PACKAGE)
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 class CollectionJsonItem<T> {
@@ -79,6 +80,7 @@ class CollectionJsonItem<T> {
 	 *
 	 * @return
 	 */
+	@JsonProperty
 	public List<CollectionJsonData> getData() {
 
 		if (!this.data.isEmpty()) {

src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsProperty.java

@@ -17,6 +17,7 @@ package org.springframework.hateoas.mediatype.hal.forms;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import lombok.ToString;
@@ -29,6 +30,7 @@ import org.springframework.hateoas.AffordanceModel.PropertyMetadataConfigured;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Describe a parameter for the associated state transition in a HAL-FORMS document. A {@link HalFormsTemplate} may
@@ -39,6 +41,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
 @JsonInclude(Include.NON_DEFAULT)
 @Value
 @Wither
+@Getter(onMethod = @__(@JsonProperty))
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(force = true)
 @ToString

src/main/java/org/springframework/hateoas/mediatype/uber/Uber.java

@@ -16,6 +16,7 @@
 package org.springframework.hateoas.mediatype.uber;
 
 import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.Wither;
 
@@ -37,6 +38,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @since 1.0
  */
 @Value
+@Getter(onMethod = @__(@JsonProperty))
 @Wither(AccessLevel.PACKAGE)
 @JsonInclude(Include.NON_NULL)
 class Uber {
@@ -74,5 +76,4 @@ class Uber {
 				.flatMap(uberData -> uberData.getLinks().stream()) //
 				.collect(Links.collector());
 	}
-
 }

src/main/java/org/springframework/hateoas/mediatype/uber/UberData.java

@@ -17,6 +17,7 @@ package org.springframework.hateoas.mediatype.uber;
 
 import lombok.AccessLevel;
 import lombok.Data;
+import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.Wither;
 
@@ -42,6 +43,7 @@ import org.springframework.hateoas.RepresentationModel;
 import org.springframework.hateoas.mediatype.PropertyUtils;
 import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -58,6 +60,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @since 1.0
  */
 @Value
+@Getter(onMethod = @__(@JsonProperty))
 @Wither(AccessLevel.PACKAGE)
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -105,6 +108,7 @@ class UberData {
 	 * Don't render if it's {@link UberAction#READ}.
 	 */
 	@Nullable
+	@JsonProperty
 	public UberAction getAction() {
 		return action == UberAction.READ ? null : action;
 	}
@@ -113,6 +117,7 @@ class UberData {
 	 * Use a {@link Boolean} to support returning {@literal null}, and if it is {@literal null}, don't render.
 	 */
 	@Nullable
+	@JsonProperty
 	public Boolean isTemplated() {
 
 		return Optional.ofNullable(this.url) //
@@ -124,6 +129,7 @@ class UberData {
 	 * Use a {@link Boolean} to support returning {@literal null}, and if it is {@literal null}, don't render.
 	 */
 	@Nullable
+	@JsonProperty
 	public Boolean isTransclude() {
 		return this.transclude ? true : null;
 	}
@@ -147,6 +153,10 @@ class UberData {
 				.orElse(Collections.emptyList());
 	}
 
+	private boolean hasUrl(@Nullable String url) {
+		return ObjectUtils.nullSafeEquals(this.url, url);
+	}
+
 	/**
 	 * Simple scalar types that can be encoded by value, not type.
 	 */
@@ -363,7 +373,7 @@ class UberData {
 
 		return affordanceBasedLinks.stream() //
 				.flatMap(affordance -> links.stream() //
-						.filter(link -> link.getUrl().equals(affordance.getUrl())) //
+						.filter(data -> data.hasUrl(affordance.getUrl())) //
 						.map(link -> {
 
 							if (link.getAction() == affordance.getAction()) {

src/main/java/org/springframework/hateoas/mediatype/uber/UberDocument.java

@@ -16,6 +16,7 @@
 package org.springframework.hateoas.mediatype.uber;
 
 import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
 import lombok.experimental.Wither;
@@ -34,6 +35,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @since 1.0
  */
 @Value
+@Getter(onMethod = @__(@JsonProperty))
 @Wither(AccessLevel.PACKAGE)
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 class UberDocument {