Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set detail from reason in both constructors of ResponseStatusException #29608

Closed
wants to merge 1 commit into from
+7 −7
Closed

Set detail from reason in both constructors of ResponseStatusException #29608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion spring-web/src/main/java/org/springframework/web/server/MethodNotAllowedException.java
View file
Open in desktop
Expand Up @@ -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);
}
}


Expand Down
1 change: 0 additions & 1 deletion spring-web/src/main/java/org/springframework/web/server/MissingRequestValueException.java
View file
Open in desktop
Expand Up @@ -42,7 +42,6 @@ public MissingRequestValueException(String name, Class<?> type, String label, Me
this.name = name;
this.type = type;
this.label = label;
setDetail(getReason());
}


Expand Down
3 changes: 1 addition & 2 deletions spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java
View file
Open in desktop
Expand Up @@ -76,8 +76,7 @@ public ResponseStatusException(int rawStatusCode, @Nullable String reason, @Null
* @param cause a nested exception (optional)
*/
public ResponseStatusException(HttpStatusCode status, @Nullable String reason, @Nullable Throwable cause) {
super(status, cause);
this.reason = reason;
this(status, reason, cause, null, null);
}
singhbaljit marked this conversation as resolved.
Show resolved Hide resolved

/**
Expand Down
6 changes: 3 additions & 3 deletions .../org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java
View file
Open in desktop
Expand Up @@ -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");
Expand Down