diff --git a/src/main/java/org/springframework/hateoas/Link.java b/src/main/java/org/springframework/hateoas/Link.java index fc4c7c39..444b25e0 100755 --- a/src/main/java/org/springframework/hateoas/Link.java +++ b/src/main/java/org/springframework/hateoas/Link.java @@ -31,6 +31,7 @@ import org.springframework.util.Assert; import org.springframework.util.StringUtils; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; /** * Value object for links. @@ -38,6 +39,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; * @author Oliver Gierke */ @XmlType(name = "link", namespace = Link.ATOM_NAMESPACE) +@JsonIgnoreProperties("templated") public class Link implements Serializable { private static final long serialVersionUID = -9037755944661782121L; @@ -162,7 +164,7 @@ public class Link implements Serializable { * @return */ @org.codehaus.jackson.annotate.JsonIgnore - public boolean isTemplate() { + public boolean isTemplated() { return !getUriTemplate().getVariables().isEmpty(); } diff --git a/src/main/java/org/springframework/hateoas/hal/LinkMixin.java b/src/main/java/org/springframework/hateoas/hal/LinkMixin.java index f3f6f8b2..493f89ae 100644 --- a/src/main/java/org/springframework/hateoas/hal/LinkMixin.java +++ b/src/main/java/org/springframework/hateoas/hal/LinkMixin.java @@ -41,5 +41,5 @@ abstract class LinkMixin extends Link { @Override @JsonInclude(Include.NON_EMPTY) @JsonSerialize(using = TrueOnlyBooleanSerializer.class) - public abstract boolean isTemplate(); + public abstract boolean isTemplated(); } diff --git a/src/test/java/org/springframework/hateoas/LinkUnitTest.java b/src/test/java/org/springframework/hateoas/LinkUnitTest.java index 30db8878..ffa209a5 100644 --- a/src/test/java/org/springframework/hateoas/LinkUnitTest.java +++ b/src/test/java/org/springframework/hateoas/LinkUnitTest.java @@ -129,7 +129,7 @@ public class LinkUnitTest { Link link = new Link("/foo{?page}"); - assertThat(link.isTemplate(), is(true)); + assertThat(link.isTemplated(), is(true)); assertThat(link.getVariableNames(), hasSize(1)); assertThat(link.getVariableNames(), hasItem("page")); assertThat(link.expand("2"), is(new Link("/foo?page=2"))); @@ -143,7 +143,7 @@ public class LinkUnitTest { Link link = new Link("/foo"); - assertThat(link.isTemplate(), is(false)); + assertThat(link.isTemplated(), is(false)); assertThat(link.getVariableNames(), hasSize(0)); } } diff --git a/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java b/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java index acc9bcb7..874f52e1 100644 --- a/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java @@ -62,12 +62,12 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg static final Links PAGINATION_LINKS = new Links(new Link("foo", Link.REL_NEXT), new Link("bar", Link.REL_PREVIOUS)); - static final String CURIED_DOCUMENT = "{\"_links\":{\"self\":{\"href\":\"foo\"},\"foo:myrel\":{\"href\":\"bar\"},\"curies\":[{\"href\":\"http://localhost:8080/rels/{rel}\",\"name\":\"foo\",\"template\":true}]}}"; + static final String CURIED_DOCUMENT = "{\"_links\":{\"self\":{\"href\":\"foo\"},\"foo:myrel\":{\"href\":\"bar\"},\"curies\":[{\"href\":\"http://localhost:8080/rels/{rel}\",\"name\":\"foo\",\"templated\":true}]}}"; static final String MULTIPLE_CURIES_DOCUMENT = "{\"_links\":{\"default:myrel\":{\"href\":\"foo\"},\"curies\":[{\"href\":\"bar\",\"name\":\"foo\"},{\"href\":\"foo\",\"name\":\"bar\"}]}}"; static final String SINGLE_NON_CURIE_LINK = "{\"_links\":{\"self\":{\"href\":\"foo\"}}}"; static final String EMPTY_DOCUMENT = "{}"; - static final String LINK_TEMPLATE = "{\"_links\":{\"search\":{\"href\":\"/foo{?bar}\",\"template\":true}}}"; + static final String LINK_TEMPLATE = "{\"_links\":{\"search\":{\"href\":\"/foo{?bar}\",\"templated\":true}}}"; @Before public void setUpModule() {