GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Consolidate partialPaths under FullPathComposite

pull/765/head
Rossen Stoyanchev 11 years ago
parent
7668ea1549
commit
3a8a28beec
2 changed files with 109 additions and 113 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 135
      spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
  2. 87
      spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java

135
spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
Unescape View File

@ -642,13 +642,49 @@ final class HierarchicalUriComponents extends UriComponents { @@ -642,13 +642,49 @@ final class HierarchicalUriComponents extends UriComponents {
public FullPathComponent(String path) {
this.partialPaths = PartialPath.parse(path);
this.partialPaths = Collections.unmodifiableList(initPartialPaths(path));
this.path = path;
}
private FullPathComponent(List<PartialPath> partialPaths) {
this.partialPaths = partialPaths;
this.path = PartialPath.getPath(partialPaths);
this.partialPaths = Collections.unmodifiableList(partialPaths);
this.path = initPath(partialPaths);
}
private static String initPath(List<PartialPath> partialPaths) {
StringBuilder builder = new StringBuilder();
for (PartialPath partialPath : partialPaths) {
builder.append(partialPath.getValue());
}
return builder.toString();
}
private static List<PartialPath> initPartialPaths(String path) {
List<PartialPath> result = new ArrayList<PartialPath>();
int startIdx;
int endIdx = 0;
while ((startIdx = path.indexOf("{/", endIdx)) != -1) {
if (startIdx > endIdx) {
String prevPart = path.substring(endIdx, startIdx);
result.add(new PartialPath(prevPart, Type.PATH));
}
endIdx = path.indexOf('}', startIdx + 2) + 1;
if (endIdx == -1) {
throw new IllegalArgumentException("Path \"" + path + "\" has no " +
"closing \"}\" after \"{/\" at index " + startIdx);
}
String part = path.substring(startIdx, endIdx);
result.add(new PartialPath(part, Type.PATH_SEGMENT));
}
if (endIdx < path.length()) {
String endPart = path.substring(endIdx);
result.add(new PartialPath(endPart, Type.PATH));
}
return result;
}
List<PartialPath> getPartialPaths() {
return this.partialPaths;
}
@Override
@ -670,21 +706,29 @@ final class HierarchicalUriComponents extends UriComponents { @@ -670,21 +706,29 @@ final class HierarchicalUriComponents extends UriComponents {
@Override
public PathComponent encode(String encoding) throws UnsupportedEncodingException {
List<PartialPath> encodedPath =
PartialPath.encode(this.partialPaths, encoding);
return new FullPathComponent(encodedPath);
List<PartialPath> result = new ArrayList<PartialPath>();
for (PartialPath partialPath : this.partialPaths) {
PartialPath encoded = partialPath.encode(encoding);
result.add(encoded);
}
return new FullPathComponent(result);
}
@Override
public void verify() {
verifyUriComponent(getPath(), Type.PATH);
for (PartialPath partialPath : this.partialPaths) {
partialPath.verify();
}
}
@Override
public PathComponent expand(UriTemplateVariables uriVariables) {
List<PartialPath> expandedPath =
PartialPath.expand(this.partialPaths, uriVariables);
return new FullPathComponent(expandedPath);
List<PartialPath> result = new ArrayList<PartialPath>();
for (PartialPath partialPath : this.partialPaths) {
PartialPath expanded = partialPath.expand(uriVariables);
result.add(expanded);
}
return new FullPathComponent(result);
}
@Override
@ -721,81 +765,31 @@ final class HierarchicalUriComponents extends UriComponents { @@ -721,81 +765,31 @@ final class HierarchicalUriComponents extends UriComponents {
this.type = type;
}
public String getValue() {
return this.value;
}
private PartialPath expand(UriTemplateVariables uriVariables) {
String expandedValue = expandUriComponent(this.value, uriVariables);
return new PartialPath(expandedValue, this.type);
}
private PartialPath encode(String encoding)
throws UnsupportedEncodingException {
private PartialPath encode(String encoding) throws UnsupportedEncodingException {
String encodedPath = encodeUriComponent(this.value, encoding, this.type);
return new PartialPath(encodedPath, this.type);
}
@Override
public String toString() {
return value;
public void verify() {
verifyUriComponent(this.value, this.type);
}
public static List<PartialPath> parse(String path) {
List<PartialPath> result = new ArrayList<PartialPath>();
int startIdx;
int endIdx = 0;
while ((startIdx = path.indexOf("{/", endIdx)) != -1) {
if (startIdx > endIdx) {
String prevPart = path.substring(endIdx, startIdx);
result.add(new PartialPath(prevPart, Type.PATH));
}
endIdx = path.indexOf('}', startIdx + 2) + 1;
if (endIdx == -1) {
throw new IllegalArgumentException("Path \"" + path + "\" has no " +
"closing \"}\" after \"{/\" at index " + startIdx);
}
String part = path.substring(startIdx, endIdx);
result.add(new PartialPath(part, Type.PATH_SEGMENT));
}
if (endIdx < path.length()) {
String endPart = path.substring(endIdx);
result.add(new PartialPath(endPart, Type.PATH));
}
return Collections.unmodifiableList(result);
}
public static String getPath(List<PartialPath> partialPaths) {
StringBuilder builder = new StringBuilder();
for (PartialPath partialPath : partialPaths) {
builder.append(partialPath.value);
}
return builder.toString();
}
public static List<PartialPath> expand(
List<PartialPath> partialPaths,
UriTemplateVariables uriVariables) {
List<PartialPath> result = new ArrayList<PartialPath>();
for (PartialPath partialPath : partialPaths) {
PartialPath expanded = partialPath.expand(uriVariables);
result.add(expanded);
}
return result;
}
public static List<PartialPath> encode(
List<PartialPath> partialPaths, String encoding)
throws UnsupportedEncodingException {
List<PartialPath> result = new ArrayList<PartialPath>();
for (PartialPath partialPath : partialPaths) {
PartialPath encoded = partialPath.encode(encoding);
result.add(encoded);
}
return result;
@Override
public String toString() {
return this.value;
}
}
}
/**
* Represents a path backed by a string list (i.e. path segments).
*/
@ -964,6 +958,7 @@ final class HierarchicalUriComponents extends UriComponents { @@ -964,6 +958,7 @@ final class HierarchicalUriComponents extends UriComponents {
@Override
public void copyToUriComponentsBuilder(UriComponentsBuilder builder) {
}
@SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
@Override
public boolean equals(Object obj) {
return (this == obj);

87
spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
Unescape View File

@ -16,6 +16,10 @@ @@ -16,6 +16,10 @@
package org.springframework.web.util;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.springframework.web.util.UriComponentsBuilder.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
@ -23,13 +27,10 @@ import java.io.ObjectOutputStream; @@ -23,13 +27,10 @@ import java.io.ObjectOutputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.List;
import org.junit.Test;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.springframework.web.util.UriComponentsBuilder.*;
import org.springframework.web.util.HierarchicalUriComponents.FullPathComponent;
/**
* @author Arjen Poutsma
@ -168,45 +169,45 @@ public class UriComponentsTests { @@ -168,45 +169,45 @@ public class UriComponentsTests {
@Test
public void partialPath() throws Exception {
List<HierarchicalUriComponents.FullPathComponent.PartialPath> l;
l = HierarchicalUriComponents.FullPathComponent.PartialPath.parse("x");
assertEquals(1, l.size());
assertEquals("x", l.get(0).value);
assertEquals(HierarchicalUriComponents.Type.PATH, l.get(0).type);
l = HierarchicalUriComponents.FullPathComponent.PartialPath.parse("/foo");
assertEquals(1, l.size());
assertEquals("/foo", l.get(0).value);
assertEquals(HierarchicalUriComponents.Type.PATH, l.get(0).type);
l = HierarchicalUriComponents.FullPathComponent.PartialPath.parse("{/foo}");
assertEquals(1, l.size());
assertEquals("{/foo}", l.get(0).value);
assertEquals(HierarchicalUriComponents.Type.PATH_SEGMENT, l.get(0).type);
l = HierarchicalUriComponents.FullPathComponent.PartialPath.parse("/foo{/bar}");
assertEquals(2, l.size());
assertEquals("/foo", l.get(0).value);
assertEquals(HierarchicalUriComponents.Type.PATH, l.get(0).type);
assertEquals("{/bar}", l.get(1).value);
assertEquals(HierarchicalUriComponents.Type.PATH_SEGMENT, l.get(1).type);
l = HierarchicalUriComponents.FullPathComponent.PartialPath.parse("{/foo}{/bar}");
assertEquals(2, l.size());
assertEquals("{/foo}", l.get(0).value);
assertEquals(HierarchicalUriComponents.Type.PATH_SEGMENT, l.get(0).type);
assertEquals("{/bar}", l.get(1).value);
assertEquals(HierarchicalUriComponents.Type.PATH_SEGMENT, l.get(1).type);
l = HierarchicalUriComponents.FullPathComponent.PartialPath.parse("foo{/bar}baz");
assertEquals(3, l.size());
assertEquals("foo", l.get(0).value);
assertEquals(HierarchicalUriComponents.Type.PATH, l.get(0).type);
assertEquals("{/bar}", l.get(1).value);
assertEquals(HierarchicalUriComponents.Type.PATH_SEGMENT, l.get(1).type);
assertEquals("baz", l.get(2).value);
assertEquals(HierarchicalUriComponents.Type.PATH, l.get(2).type);
FullPathComponent l;
l = new FullPathComponent("x");
assertEquals(1, l.getPartialPaths().size());
assertEquals("x", l.getPartialPaths().get(0).value);
assertEquals(HierarchicalUriComponents.Type.PATH, l.getPartialPaths().get(0).type);
l = new FullPathComponent("/foo");
assertEquals(1, l.getPartialPaths().size());
assertEquals("/foo", l.getPartialPaths().get(0).value);
assertEquals(HierarchicalUriComponents.Type.PATH, l.getPartialPaths().get(0).type);
l = new FullPathComponent("{/foo}");
assertEquals(1, l.getPartialPaths().size());
assertEquals("{/foo}", l.getPartialPaths().get(0).value);
assertEquals(HierarchicalUriComponents.Type.PATH_SEGMENT, l.getPartialPaths().get(0).type);
l = new FullPathComponent("/foo{/bar}");
assertEquals(2, l.getPartialPaths().size());
assertEquals("/foo", l.getPartialPaths().get(0).value);
assertEquals(HierarchicalUriComponents.Type.PATH, l.getPartialPaths().get(0).type);
assertEquals("{/bar}", l.getPartialPaths().get(1).value);
assertEquals(HierarchicalUriComponents.Type.PATH_SEGMENT, l.getPartialPaths().get(1).type);
l = new FullPathComponent("{/foo}{/bar}");
assertEquals(2, l.getPartialPaths().size());
assertEquals("{/foo}", l.getPartialPaths().get(0).value);
assertEquals(HierarchicalUriComponents.Type.PATH_SEGMENT, l.getPartialPaths().get(0).type);
assertEquals("{/bar}", l.getPartialPaths().get(1).value);
assertEquals(HierarchicalUriComponents.Type.PATH_SEGMENT, l.getPartialPaths().get(1).type);
l = new FullPathComponent("foo{/bar}baz");
assertEquals(3, l.getPartialPaths().size());
assertEquals("foo", l.getPartialPaths().get(0).value);
assertEquals(HierarchicalUriComponents.Type.PATH, l.getPartialPaths().get(0).type);
assertEquals("{/bar}", l.getPartialPaths().get(1).value);
assertEquals(HierarchicalUriComponents.Type.PATH_SEGMENT, l.getPartialPaths().get(1).type);
assertEquals("baz", l.getPartialPaths().get(2).value);
assertEquals(HierarchicalUriComponents.Type.PATH, l.getPartialPaths().get(2).type);
}

Write Preview
Loading…
Cancel
Save