Spring/spring-hateoas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#137 - Changed Link.isTempalte() to isTemplated().

Browse Source
This commit is contained in:
Oliver Gierke
2014-01-23 08:33:11 +01:00
parent 64fd8543b6
commit c790a5d834
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/hateoas/Link.java
View File

@@ -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();
}

2
src/main/java/org/springframework/hateoas/hal/LinkMixin.java
View File

@@ -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();
}

4
src/test/java/org/springframework/hateoas/LinkUnitTest.java
View File

@@ -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));
}
}

4
src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java
View File

@@ -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() {