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

Polish Cookie abstraction in http packge of spring-web

Browse Source 
A getCookies method is now available on ServerHttpRequest with one
ServletServerCookie implementation that wraps a Servlet cookie.

The SockJS service makes use of this to check for an existing session
cookie in the request.
This commit is contained in:
Rossen Stoyanchev
2013-08-02 12:23:48 -04:00
parent c26272cef6
commit 0d5901ffb6
26 changed files with 258 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java
View File

@@ -31,8 +31,6 @@ public class MockHttpInputMessage implements HttpInputMessage {
private final InputStream body;
private final Cookies cookies = new Cookies();
public MockHttpInputMessage(byte[] contents) {
Assert.notNull(contents, "'contents' must not be null");
@@ -53,9 +51,4 @@ public class MockHttpInputMessage implements HttpInputMessage {
public InputStream getBody() throws IOException {
return body;
}
@Override
public Cookies getCookies() {
return this.cookies ;
}
}

10
spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
View File

@@ -21,7 +21,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.Charset;
import static org.mockito.BDDMockito.*;
import static org.mockito.Mockito.*;
/**
* @author Arjen Poutsma
@@ -32,9 +32,6 @@ public class MockHttpOutputMessage implements HttpOutputMessage {
private final ByteArrayOutputStream body = spy(new ByteArrayOutputStream());
private final Cookies cookies = new Cookies();
@Override
public HttpHeaders getHeaders() {
return headers;
@@ -53,9 +50,4 @@ public class MockHttpOutputMessage implements HttpOutputMessage {
byte[] bytes = getBodyAsBytes();
return new String(bytes, charset);
}
@Override
public Cookies getCookies() {
return this.cookies;
}
}

16
spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
View File

@@ -28,8 +28,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.springframework.http.Cookies;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpRequest;
@@ -254,8 +252,6 @@ public class InterceptingClientHttpRequestFactoryTests {
private boolean executed = false;
private Cookies cookies = new Cookies();
private RequestMock() {
}
@@ -292,11 +288,6 @@ public class InterceptingClientHttpRequestFactoryTests {
executed = true;
return responseMock;
}
@Override
public Cookies getCookies() {
return this.cookies ;
}
}
private static class ResponseMock implements ClientHttpResponse {
@@ -307,8 +298,6 @@ public class InterceptingClientHttpRequestFactoryTests {
private HttpHeaders headers = new HttpHeaders();
private Cookies cookies = new Cookies();
@Override
public HttpStatus getStatusCode() throws IOException {
return statusCode;
@@ -337,10 +326,5 @@ public class InterceptingClientHttpRequestFactoryTests {
@Override
public void close() {
}
@Override
public Cookies getCookies() {
return this.cookies ;
}
}
}