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

#440 - Links now parses URIs containing commas correctly.

Browse Source 
Switched to a regular expression based split of links to make sure URIs that contain commas do not interfere with the rather simplified splitting algorithm we used before.
This commit is contained in:
Oliver Gierke
2016-06-06 11:47:24 +02:00
parent 078e1126c9
commit cbbc2b2d84
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/springframework/hateoas/Links.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013 the original author or authors.
* Copyright 2013-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.springframework.util.StringUtils;
@@ -30,6 +32,8 @@ import org.springframework.util.StringUtils;
*/
public class Links implements Iterable<Link> {
private static final Pattern LINK_HEADER_PATTERN = Pattern.compile("(<[^>]*>;rel=\"[^\"]*\")");
static final Links NO_LINKS = new Links(Collections.<Link> emptyList());
private final List<Link> links;
@@ -109,12 +113,12 @@ public class Links implements Iterable<Link> {
return NO_LINKS;
}
String[] elements = source.split(",");
List<Link> links = new ArrayList<Link>(elements.length);
Matcher matcher = LINK_HEADER_PATTERN.matcher(source);
List<Link> links = new ArrayList<Link>();
for (String element : elements) {
while (matcher.find()) {
Link link = Link.valueOf(element);
Link link = Link.valueOf(matcher.group());
if (link != null) {
links.add(link);
@@ -122,6 +126,7 @@ public class Links implements Iterable<Link> {
}
return new Links(links);
}
/**