|
|
|
@ -1,5 +1,5 @@ |
|
|
|
/* |
|
|
|
/* |
|
|
|
* Copyright 2002-2022 the original author or authors. |
|
|
|
* Copyright 2002-2025 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. |
|
|
|
@ -33,6 +33,8 @@ import org.springframework.core.ResolvableType; |
|
|
|
import org.springframework.http.HttpEntity; |
|
|
|
import org.springframework.http.HttpEntity; |
|
|
|
import org.springframework.http.HttpHeaders; |
|
|
|
import org.springframework.http.HttpHeaders; |
|
|
|
import org.springframework.http.HttpMethod; |
|
|
|
import org.springframework.http.HttpMethod; |
|
|
|
|
|
|
|
import org.springframework.http.HttpStatus; |
|
|
|
|
|
|
|
import org.springframework.http.HttpStatusCode; |
|
|
|
import org.springframework.http.ProblemDetail; |
|
|
|
import org.springframework.http.ProblemDetail; |
|
|
|
import org.springframework.http.RequestEntity; |
|
|
|
import org.springframework.http.RequestEntity; |
|
|
|
import org.springframework.http.ResponseEntity; |
|
|
|
import org.springframework.http.ResponseEntity; |
|
|
|
@ -239,9 +241,9 @@ public class HttpEntityMethodProcessor extends AbstractMessageConverterMethodPro |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (httpEntity instanceof ResponseEntity<?> responseEntity) { |
|
|
|
if (httpEntity instanceof ResponseEntity<?> responseEntity) { |
|
|
|
int returnStatus = responseEntity.getStatusCode().value(); |
|
|
|
HttpStatusCode returnStatus = responseEntity.getStatusCode(); |
|
|
|
outputMessage.getServletResponse().setStatus(returnStatus); |
|
|
|
outputMessage.getServletResponse().setStatus(returnStatus.value()); |
|
|
|
if (returnStatus == 200) { |
|
|
|
if (returnStatus.value() == HttpStatus.OK.value()) { |
|
|
|
HttpMethod method = inputMessage.getMethod(); |
|
|
|
HttpMethod method = inputMessage.getMethod(); |
|
|
|
if ((HttpMethod.GET.equals(method) || HttpMethod.HEAD.equals(method)) |
|
|
|
if ((HttpMethod.GET.equals(method) || HttpMethod.HEAD.equals(method)) |
|
|
|
&& isResourceNotModified(inputMessage, outputMessage)) { |
|
|
|
&& isResourceNotModified(inputMessage, outputMessage)) { |
|
|
|
@ -249,8 +251,8 @@ public class HttpEntityMethodProcessor extends AbstractMessageConverterMethodPro |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
else if (returnStatus / 100 == 3) { |
|
|
|
else if (returnStatus.is3xxRedirection()) { |
|
|
|
String location = outputHeaders.getFirst("location"); |
|
|
|
String location = outputHeaders.getFirst(HttpHeaders.LOCATION); |
|
|
|
if (location != null) { |
|
|
|
if (location != null) { |
|
|
|
saveFlashAttributes(mavContainer, webRequest, location); |
|
|
|
saveFlashAttributes(mavContainer, webRequest, location); |
|
|
|
} |
|
|
|
} |
|
|
|
|