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

Consistent HttpMethod identity comparisons

Browse Source 
(cherry picked from commit 0de36d2)
This commit is contained in:
Juergen Hoeller
2018-02-18 22:01:22 +01:00
parent 87abdb92da
commit caed04473e
10 changed files with 47 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/main/java/org/springframework/http/client/SimpleBufferingAsyncClientHttpRequest.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ final class SimpleBufferingAsyncClientHttpRequest extends AbstractBufferingAsync
public ClientHttpResponse call() throws Exception { public ClientHttpResponse call() throws Exception {
SimpleBufferingClientHttpRequest.addHeaders(connection, headers); SimpleBufferingClientHttpRequest.addHeaders(connection, headers);
// JDK <1.8 doesn't support getOutputStream with HTTP DELETE // JDK <1.8 doesn't support getOutputStream with HTTP DELETE
if (HttpMethod.DELETE == getMethod() && bufferedOutput.length == 0) { if (getMethod() == HttpMethod.DELETE && bufferedOutput.length == 0) {
connection.setDoOutput(false); connection.setDoOutput(false);
} }
if (connection.getDoOutput() && outputStreaming) { if (connection.getDoOutput() && outputStreaming) {

4
spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ final class SimpleBufferingClientHttpRequest extends AbstractBufferingClientHttp
protected ClientHttpResponse executeInternal(HttpHeaders headers, byte[] bufferedOutput) throws IOException { protected ClientHttpResponse executeInternal(HttpHeaders headers, byte[] bufferedOutput) throws IOException {
addHeaders(this.connection, headers); addHeaders(this.connection, headers);
// JDK <1.8 doesn't support getOutputStream with HTTP DELETE // JDK <1.8 doesn't support getOutputStream with HTTP DELETE
if (HttpMethod.DELETE == getMethod() && bufferedOutput.length == 0) { if (getMethod() == HttpMethod.DELETE && bufferedOutput.length == 0) {
this.connection.setDoOutput(false); this.connection.setDoOutput(false);
} }
if (this.connection.getDoOutput() && this.outputStreaming) { if (this.connection.getDoOutput() && this.outputStreaming) {

8
spring-web/src/test/java/org/springframework/web/filter/HttpPutFormContentFilterTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@ public class HttpPutFormContentFilterTests {
private MockFilterChain filterChain; private MockFilterChain filterChain;
@Before @Before
public void setup() { public void setup() {
filter = new HttpPutFormContentFilter(); filter = new HttpPutFormContentFilter();
@@ -56,6 +57,7 @@ public class HttpPutFormContentFilterTests {
filterChain = new MockFilterChain(); filterChain = new MockFilterChain();
} }
@Test @Test
public void wrapPutAndPatchOnly() throws Exception { public void wrapPutAndPatchOnly() throws Exception {
request.setContent("foo=bar".getBytes("ISO-8859-1")); request.setContent("foo=bar".getBytes("ISO-8859-1"));
@@ -63,7 +65,7 @@ public class HttpPutFormContentFilterTests {
request.setMethod(method.name()); request.setMethod(method.name());
filterChain = new MockFilterChain(); filterChain = new MockFilterChain();
filter.doFilter(request, response, filterChain); filter.doFilter(request, response, filterChain);
if (method.equals(HttpMethod.PUT) || method.equals(HttpMethod.PATCH)) { if (method == HttpMethod.PUT || method == HttpMethod.PATCH) {
assertNotSame("Should wrap HTTP method " + method, request, filterChain.getRequest()); assertNotSame("Should wrap HTTP method " + method, request, filterChain.getRequest());
} }
else { else {
@@ -204,7 +206,7 @@ public class HttpPutFormContentFilterTests {
assertArrayEquals(new String[] {"value4"}, parameters.get("name4")); assertArrayEquals(new String[] {"value4"}, parameters.get("name4"));
} }
@Test // SPR-15835 @Test // SPR-15835
public void hiddenHttpMethodFilterFollowedByHttpPutFormContentFilter() throws Exception { public void hiddenHttpMethodFilterFollowedByHttpPutFormContentFilter() throws Exception {
request.addParameter("_method", "PUT"); request.addParameter("_method", "PUT");
request.addParameter("hiddenField", "testHidden"); request.addParameter("hiddenField", "testHidden");

4
spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -839,7 +839,7 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic
throws ServletException, IOException { throws ServletException, IOException {
HttpMethod httpMethod = HttpMethod.resolve(request.getMethod()); HttpMethod httpMethod = HttpMethod.resolve(request.getMethod());
if (HttpMethod.PATCH == httpMethod || httpMethod == null) { if (httpMethod == HttpMethod.PATCH || httpMethod == null) {
processRequest(request, response); processRequest(request, response);
} }
else { else {

10
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -439,16 +439,16 @@ public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMe
Set<HttpMethod> result = new LinkedHashSet<HttpMethod>(declaredMethods.size()); Set<HttpMethod> result = new LinkedHashSet<HttpMethod>(declaredMethods.size());
if (declaredMethods.isEmpty()) { if (declaredMethods.isEmpty()) {
for (HttpMethod method : HttpMethod.values()) { for (HttpMethod method : HttpMethod.values()) {
if (!HttpMethod.TRACE.equals(method)) { if (method != HttpMethod.TRACE) {
result.add(method); result.add(method);
} }
} }
} }
else { else {
boolean hasHead = declaredMethods.contains("HEAD");
for (String method : declaredMethods) { for (String method : declaredMethods) {
result.add(HttpMethod.valueOf(method)); HttpMethod httpMethod = HttpMethod.valueOf(method);
if (!hasHead && "GET".equals(method)) { result.add(httpMethod);
if (httpMethod == HttpMethod.GET) {
result.add(HttpMethod.HEAD); result.add(HttpMethod.HEAD);
} }
} }

18
spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -173,7 +173,7 @@ public abstract class WebContentGenerator extends WebApplicationObjectSupport {
if (this.supportedMethods == null) { if (this.supportedMethods == null) {
allowedMethods = new ArrayList<String>(HttpMethod.values().length - 1); allowedMethods = new ArrayList<String>(HttpMethod.values().length - 1);
for (HttpMethod method : HttpMethod.values()) { for (HttpMethod method : HttpMethod.values()) {
if (!HttpMethod.TRACE.equals(method)) { if (method != HttpMethod.TRACE) {
allowedMethods.add(method.name()); allowedMethods.add(method.name());
} }
} }
@@ -190,13 +190,13 @@ public abstract class WebContentGenerator extends WebApplicationObjectSupport {
} }
/** /**
* Return the "Allow" header value to use in response to an HTTP OPTIONS * Return the "Allow" header value to use in response to an HTTP OPTIONS request
* request based on the configured {@link #setSupportedMethods supported * based on the configured {@link #setSupportedMethods supported methods} also
* methods} also automatically adding "OPTIONS" to the list even if not * automatically adding "OPTIONS" to the list even if not present as a supported
* present as a supported method. This means sub-classes don't have to * method. This means subclasses don't have to explicitly list "OPTIONS" as a
* explicitly list "OPTIONS" as a supported method as long as HTTP OPTIONS * supported method as long as HTTP OPTIONS requests are handled before making a
* requests are handled before making a call to * call to {@link #checkRequest(HttpServletRequest)}.
* {@link #checkRequest(HttpServletRequest)}. * @since 4.3
*/ */
protected String getAllowHeader() { protected String getAllowHeader() {
return this.allowHeader; return this.allowHeader;

18
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.springframework.web.servlet.mvc.condition; package org.springframework.web.servlet.mvc.condition;
import java.util.Collections; import java.util.Collections;
import javax.servlet.DispatcherType; import javax.servlet.DispatcherType;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -27,17 +26,8 @@ import org.springframework.http.HttpHeaders;
import org.springframework.mock.web.test.MockHttpServletRequest; import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.*;
import static org.junit.Assert.assertNotNull; import static org.springframework.web.bind.annotation.RequestMethod.*;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.springframework.web.bind.annotation.RequestMethod.DELETE;
import static org.springframework.web.bind.annotation.RequestMethod.GET;
import static org.springframework.web.bind.annotation.RequestMethod.HEAD;
import static org.springframework.web.bind.annotation.RequestMethod.OPTIONS;
import static org.springframework.web.bind.annotation.RequestMethod.POST;
import static org.springframework.web.bind.annotation.RequestMethod.PUT;
/** /**
* @author Arjen Poutsma * @author Arjen Poutsma
@@ -63,7 +53,7 @@ public class RequestMethodsRequestConditionTests {
public void getMatchingConditionWithEmptyConditions() { public void getMatchingConditionWithEmptyConditions() {
RequestMethodsRequestCondition condition = new RequestMethodsRequestCondition(); RequestMethodsRequestCondition condition = new RequestMethodsRequestCondition();
for (RequestMethod method : RequestMethod.values()) { for (RequestMethod method : RequestMethod.values()) {
if (!OPTIONS.equals(method)) { if (method != OPTIONS) {
HttpServletRequest request = new MockHttpServletRequest(method.name(), ""); HttpServletRequest request = new MockHttpServletRequest(method.name(), "");
assertNotNull(condition.getMatchingCondition(request)); assertNotNull(condition.getMatchingCondition(request));
} }

32
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
package org.springframework.web.servlet.mvc.method; package org.springframework.web.servlet.mvc.method;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@@ -26,7 +23,6 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.junit.Before; import org.junit.Before;
@@ -63,6 +59,8 @@ import org.springframework.web.servlet.mvc.condition.ProducesRequestCondition;
import org.springframework.web.servlet.mvc.condition.RequestMethodsRequestCondition; import org.springframework.web.servlet.mvc.condition.RequestMethodsRequestCondition;
import org.springframework.web.util.UrlPathHelper; import org.springframework.web.util.UrlPathHelper;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
/** /**
* Test fixture with {@link RequestMappingInfoHandlerMapping}. * Test fixture with {@link RequestMappingInfoHandlerMapping}.
@@ -84,7 +82,7 @@ public class RequestMappingInfoHandlerMappingTests {
@Before @Before
public void setUp() throws Exception { public void setup() throws Exception {
TestController testController = new TestController(); TestController testController = new TestController();
this.fooMethod = new HandlerMethod(testController, "foo"); this.fooMethod = new HandlerMethod(testController, "foo");
@@ -157,9 +155,7 @@ public class RequestMappingInfoHandlerMappingTests {
} }
} }
// SPR-9603 @Test(expected = HttpMediaTypeNotAcceptableException.class) // SPR-9603
@Test(expected=HttpMediaTypeNotAcceptableException.class)
public void getHandlerRequestMethodMatchFalsePositive() throws Exception { public void getHandlerRequestMethodMatchFalsePositive() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/users"); MockHttpServletRequest request = new MockHttpServletRequest("GET", "/users");
request.addHeader("Accept", "application/xml"); request.addHeader("Accept", "application/xml");
@@ -167,9 +163,7 @@ public class RequestMappingInfoHandlerMappingTests {
this.handlerMapping.getHandler(request); this.handlerMapping.getHandler(request);
} }
// SPR-8462 @Test // SPR-8462
@Test
public void getHandlerMediaTypeNotSupported() throws Exception { public void getHandlerMediaTypeNotSupported() throws Exception {
testHttpMediaTypeNotSupportedException("/person/1"); testHttpMediaTypeNotSupportedException("/person/1");
testHttpMediaTypeNotSupportedException("/person/1/"); testHttpMediaTypeNotSupportedException("/person/1/");
@@ -197,18 +191,14 @@ public class RequestMappingInfoHandlerMappingTests {
} }
} }
// SPR-8462 @Test // SPR-8462
@Test
public void getHandlerMediaTypeNotAccepted() throws Exception { public void getHandlerMediaTypeNotAccepted() throws Exception {
testHttpMediaTypeNotAcceptableException("/persons"); testHttpMediaTypeNotAcceptableException("/persons");
testHttpMediaTypeNotAcceptableException("/persons/"); testHttpMediaTypeNotAcceptableException("/persons/");
testHttpMediaTypeNotAcceptableException("/persons.json"); testHttpMediaTypeNotAcceptableException("/persons.json");
} }
// SPR-12854 @Test // SPR-12854
@Test
public void getHandlerUnsatisfiedServletRequestParameterException() throws Exception { public void getHandlerUnsatisfiedServletRequestParameterException() throws Exception {
try { try {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/params"); MockHttpServletRequest request = new MockHttpServletRequest("GET", "/params");
@@ -275,10 +265,8 @@ public class RequestMappingInfoHandlerMappingTests {
assertEquals("2", uriVariables.get("path2")); assertEquals("2", uriVariables.get("path2"));
} }
// SPR-9098
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Test @Test // SPR-9098
public void handleMatchUriTemplateVariablesDecode() { public void handleMatchUriTemplateVariablesDecode() {
RequestMappingInfo key = RequestMappingInfo.paths("/{group}/{identifier}").build(); RequestMappingInfo key = RequestMappingInfo.paths("/{group}/{identifier}").build();
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/group/a%2Fb"); MockHttpServletRequest request = new MockHttpServletRequest("GET", "/group/a%2Fb");
@@ -502,6 +490,7 @@ public class RequestMappingInfoHandlerMappingTests {
} }
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
@Controller @Controller
private static class UserController { private static class UserController {
@@ -515,6 +504,7 @@ public class RequestMappingInfoHandlerMappingTests {
} }
} }
private static class TestRequestMappingInfoHandlerMapping extends RequestMappingInfoHandlerMapping { private static class TestRequestMappingInfoHandlerMapping extends RequestMappingInfoHandlerMapping {
public void registerHandler(Object handler) { public void registerHandler(Object handler) {

11
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
View File

@@ -23,7 +23,6 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.HashSet;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
@@ -515,7 +514,7 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig
protected void sendMethodNotAllowed(ServerHttpResponse response, HttpMethod... httpMethods) { protected void sendMethodNotAllowed(ServerHttpResponse response, HttpMethod... httpMethods) {
logger.warn("Sending Method Not Allowed (405)"); logger.warn("Sending Method Not Allowed (405)");
response.setStatusCode(HttpStatus.METHOD_NOT_ALLOWED); response.setStatusCode(HttpStatus.METHOD_NOT_ALLOWED);
response.getHeaders().setAllow(new HashSet<HttpMethod>(Arrays.asList(httpMethods))); response.getHeaders().setAllow(new LinkedHashSet<HttpMethod>(Arrays.asList(httpMethods)));
} }
@@ -545,7 +544,7 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig
@Override @Override
public void handle(ServerHttpRequest request, ServerHttpResponse response) throws IOException { public void handle(ServerHttpRequest request, ServerHttpResponse response) throws IOException {
if (HttpMethod.GET == request.getMethod()) { if (request.getMethod() == HttpMethod.GET) {
addNoCacheHeaders(response); addNoCacheHeaders(response);
if (checkOrigin(request, response)) { if (checkOrigin(request, response)) {
response.getHeaders().setContentType(new MediaType("application", "json", UTF8_CHARSET)); response.getHeaders().setContentType(new MediaType("application", "json", UTF8_CHARSET));
@@ -555,14 +554,14 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig
} }
} }
else if (HttpMethod.OPTIONS == request.getMethod()) { else if (request.getMethod() == HttpMethod.OPTIONS) {
if (checkOrigin(request, response)) { if (checkOrigin(request, response)) {
addCacheHeaders(response); addCacheHeaders(response);
response.setStatusCode(HttpStatus.NO_CONTENT); response.setStatusCode(HttpStatus.NO_CONTENT);
} }
} }
else { else {
sendMethodNotAllowed(response, HttpMethod.OPTIONS, HttpMethod.GET); sendMethodNotAllowed(response, HttpMethod.GET, HttpMethod.OPTIONS);
} }
} }
}; };
@@ -590,7 +589,7 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig
@Override @Override
public void handle(ServerHttpRequest request, ServerHttpResponse response) throws IOException { public void handle(ServerHttpRequest request, ServerHttpResponse response) throws IOException {
if (!HttpMethod.GET.equals(request.getMethod())) { if (request.getMethod() != HttpMethod.GET) {
sendMethodNotAllowed(response, HttpMethod.GET); sendMethodNotAllowed(response, HttpMethod.GET);
return; return;
} }

4
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -250,7 +250,7 @@ public class TransportHandlingSockJsService extends AbstractSockJsService implem
try { try {
HttpMethod supportedMethod = transportType.getHttpMethod(); HttpMethod supportedMethod = transportType.getHttpMethod();
if (supportedMethod != request.getMethod()) { if (supportedMethod != request.getMethod()) {
if (HttpMethod.OPTIONS == request.getMethod() && transportType.supportsCors()) { if (request.getMethod() == HttpMethod.OPTIONS && transportType.supportsCors()) {
if (checkOrigin(request, response, HttpMethod.OPTIONS, supportedMethod)) { if (checkOrigin(request, response, HttpMethod.OPTIONS, supportedMethod)) {
response.setStatusCode(HttpStatus.NO_CONTENT); response.setStatusCode(HttpStatus.NO_CONTENT);
addCacheHeaders(response); addCacheHeaders(response);