ResponseStatusException sets detail from reason again, again

- leftover item that was not fully resolved in a27f2e9
spring-projects · Nov 29, 2022 · 3a37e18 · 3a37e18
1 parent 61d8774
commit 3a37e18
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/spring-web/src/main/java/org/springframework/web/server/MethodNotAllowedException.java b/spring-web/src/main/java/org/springframework/web/server/MethodNotAllowedException.java
@@ -56,7 +56,9 @@ public MethodNotAllowedException(String method, @Nullable Collection<HttpMethod>
 		}
 		this.method = method;
 		this.httpMethods = Collections.unmodifiableSet(new LinkedHashSet<>(supportedMethods));
-		setDetail(this.httpMethods.isEmpty() ? getReason() : "Supported methods: " + this.httpMethods);
+		if (!this.httpMethods.isEmpty()) {
+			setDetail("Supported methods: " + this.httpMethods);
+		}
 	}
 
 

diff --git a/spring-web/src/main/java/org/springframework/web/server/MissingRequestValueException.java b/spring-web/src/main/java/org/springframework/web/server/MissingRequestValueException.java
@@ -42,7 +42,6 @@ public MissingRequestValueException(String name, Class<?> type, String label, Me
 		this.name = name;
 		this.type = type;
 		this.label = label;
-		setDetail(getReason());
 	}
 
 

diff --git a/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java b/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java
@@ -78,6 +78,7 @@ public ResponseStatusException(int rawStatusCode, @Nullable String reason, @Null
 	public ResponseStatusException(HttpStatusCode status, @Nullable String reason, @Nullable Throwable cause) {
 		super(status, cause);
 		this.reason = reason;
+		setDetail(reason);
 	}
 
 	/**

diff --git a/.../org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java b/.../org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java
@@ -111,22 +111,22 @@ public void notAnnotated() {
 	}
 
 	@Test // SPR-12903
-	public void nestedException() throws Exception {
+	public void nestedException() {
 		Exception cause = new StatusCodeAndReasonMessageException();
 		TypeMismatchException ex = new TypeMismatchException("value", ITestBean.class, cause);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, null, ex);
 		assertResolved(mav, 410, "gone.reason");
 	}
 
 	@Test
-	public void responseStatusException() throws Exception {
+	public void responseStatusException() {
 		ResponseStatusException ex = new ResponseStatusException(HttpStatus.BAD_REQUEST);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, null, ex);
 		assertResolved(mav, 400, null);
 	}
 
 	@Test  // SPR-15524
-	public void responseStatusExceptionWithReason() throws Exception {
+	public void responseStatusExceptionWithReason() {
 		ResponseStatusException ex = new ResponseStatusException(HttpStatus.BAD_REQUEST, "The reason");
 		ModelAndView mav = exceptionResolver.resolveException(request, response, null, ex);
 		assertResolved(mav, 400, "The reason");