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

#137 - Improved Link and UriTemplate API.

Browse Source 
Added constructor to Link to take a UriTemplate. Added constructor to UriTemplate to take a base URI and TemplateVariables.
This commit is contained in:
Oliver Gierke
2014-01-21 14:27:17 +01:00
parent 719a4b3af3
commit 3c62de720f
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,13 +71,23 @@ public class Link implements Serializable {
* @param rel must not be {@literal null} or empty.
*/
public Link(String href, String rel) {
this(new UriTemplate(href), rel);
}
Assert.hasText(href, "Href must not be null or empty!");
/**
* Creates a new Link from the given {@link UriTemplate} and rel.
*
* @param template must not be {@literal null}.
* @param rel must not be {@literal null} or empty.
*/
public Link(UriTemplate template, String rel) {
Assert.notNull(template, "UriTempalte must not be null!");
Assert.hasText(rel, "Rel must not be null or empty!");
this.href = href;
this.template = template;
this.href = template.toString();
this.rel = rel;
this.template = new UriTemplate(href);
}
/**

14
src/main/java/org/springframework/hateoas/UriTemplate.java
View File

@@ -76,6 +76,20 @@ public class UriTemplate implements Iterable<TemplateVariable> {
this.baseUri = template.substring(0, baseUriEndIndex);
}
/**
* Creates a new {@link UriTemplate} from the given base URI and {@link TemplateVariables}.
*
* @param baseUri must not be {@literal null} or empty.
* @param variables defaults to {@link TemplateVariables#NONE}.
*/
public UriTemplate(String baseUri, TemplateVariables variables) {
Assert.hasText("Base URI must not be null or empty!");
this.baseUri = baseUri;
this.variables = variables == null ? TemplateVariables.NONE : variables;
}
/**
* Returns whether the given candidate is a URI template.
*