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

#1044 - Restore visibility of UriTemplate constructors.

Browse Source 
Visibility must only be removed after publishing a deprecated API.

See #1045 to track reducing the visibility of these constructor calls.
This commit is contained in:
Greg Turnquist
2019-08-06 10:30:02 -05:00
parent c53b72f1cc
commit ecbcdef870
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,8 +57,10 @@ public class UriTemplate implements Iterable<TemplateVariable>, Serializable {
* Creates a new {@link UriTemplate} using the given template string.
*
* @param template must not be {@literal null} or empty.
* @deprecated Migrate to {@link UriTemplate#of(String)}.
*/
private UriTemplate(String template) {
@Deprecated
public UriTemplate(String template) {
Assert.hasText(template, "Template must not be null or empty!");
@@ -100,8 +102,10 @@ public class UriTemplate implements Iterable<TemplateVariable>, Serializable {
*
* @param baseUri must not be {@literal null} or empty.
* @param variables must not be {@literal null}.
* @deprecated Migrate to {@link UriTemplate#of(String, TemplateVariables)}.
*/
UriTemplate(String baseUri, TemplateVariables variables) {
@Deprecated
public UriTemplate(String baseUri, TemplateVariables variables) {
Assert.hasText(baseUri, "Base URI must not be null or empty!");
Assert.notNull(variables, "Template variables must not be null!");
@@ -123,6 +127,19 @@ public class UriTemplate implements Iterable<TemplateVariable>, Serializable {
return CACHE.computeIfAbsent(template, UriTemplate::new);
}
/**
* Returns a {@link UriTemplate} for the given {@link String} template.
*
* @param template must not be {@literal null} or empty.
* @return
*/
public static UriTemplate of(String template, TemplateVariables variables) {
Assert.hasText(template, "Template must not be null or empty!");
return CACHE.computeIfAbsent(template, UriTemplate::new).with(variables);
}
/**
* Creates a new {@link UriTemplate} with the current {@link TemplateVariable}s augmented with the given ones.
*