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

#2036 - Polishing.

Browse Source
This commit is contained in:
Oliver Drotbohm
2023-11-13 15:58:12 +01:00
parent 7b41f6ae14
commit 512db00012
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/springframework/hateoas/TemplateVariable.java
View File

@@ -25,6 +25,7 @@ import java.util.EnumSet;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import org.springframework.lang.Nullable;
@@ -558,6 +559,16 @@ public final class TemplateVariable implements Serializable, UriTemplate.Expanda
return template.indexOf(key);
}
Stream<VariableType> getFollowingTypes() {
return switch (this) {
case PATH_SEGMENT -> Stream.of(PATH_STYLE_PARAMETER, REQUEST_PARAM, FRAGMENT);
case PATH_STYLE_PARAMETER -> Stream.of(REQUEST_PARAM, FRAGMENT);
case REQUEST_PARAM, REQUEST_PARAM_CONTINUED -> Stream.of(FRAGMENT);
default -> Stream.<VariableType> empty();
};
}
/**
* Returns the {@link VariableType} for the given variable key.
*

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

@@ -15,8 +15,6 @@
*/
package org.springframework.hateoas;
import static org.springframework.hateoas.TemplateVariable.VariableType.*;
import java.io.Serializable;
import java.net.URI;
import java.nio.charset.StandardCharsets;
@@ -30,7 +28,6 @@ import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.springframework.hateoas.TemplateVariable.VariableType;
import org.springframework.lang.Nullable;
@@ -481,14 +478,7 @@ public class UriTemplate implements Iterable<TemplateVariable>, Serializable {
*/
String insertInto(String template) {
var followingTypes = switch (type) {
case PATH_SEGMENT -> Stream.of(PATH_STYLE_PARAMETER, REQUEST_PARAM, FRAGMENT);
case PATH_STYLE_PARAMETER -> Stream.of(REQUEST_PARAM, FRAGMENT);
case REQUEST_PARAM, REQUEST_PARAM_CONTINUED -> Stream.of(FRAGMENT);
default -> Stream.<VariableType> empty();
};
return followingTypes.map(it -> it.findIndexWithin(template))
return type.getFollowingTypes().map(it -> it.findIndexWithin(template))
.filter(it -> it != -1)
.findFirst()
.map(it -> template.substring(0, it) + toString() + template.substring(it))