Browse Source

Polishing contribution

Closes gh-35758
pull/36004/head
rstoyanchev 1 week ago
parent
commit
0eefac21c9
  1. 4
      framework-docs/modules/ROOT/pages/web/webflux/ann-rest-exceptions.adoc
  2. 2
      framework-docs/modules/ROOT/pages/web/webmvc/mvc-ann-rest-exceptions.adoc
  3. 6
      spring-webflux/src/main/java/org/springframework/web/reactive/resource/NoResourceFoundException.java
  4. 5
      spring-webflux/src/test/java/org/springframework/web/reactive/resource/NoResourceFoundExceptionTests.java
  5. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/resource/NoResourceFoundException.java

4
framework-docs/modules/ROOT/pages/web/webflux/ann-rest-exceptions.adoc

@ -135,6 +135,10 @@ Message codes and arguments for each error are also resolved via `MessageSource`
| `+{0}+` the list of global errors, `+{1}+` the list of field errors. | `+{0}+` the list of global errors, `+{1}+` the list of field errors.
Message codes and arguments for each error are also resolved via `MessageSource`. Message codes and arguments for each error are also resolved via `MessageSource`.
| `NoResourceFoundException`
| (default)
| `+{0}+` the request path (or portion of) used to find a resource
|=== |===
NOTE: Unlike other exceptions, the message arguments for NOTE: Unlike other exceptions, the message arguments for

2
framework-docs/modules/ROOT/pages/web/webmvc/mvc-ann-rest-exceptions.adoc

@ -171,7 +171,7 @@ Message codes and arguments for each error are also resolved via `MessageSource`
| `NoResourceFoundException` | `NoResourceFoundException`
| (default) | (default)
| `+{0}+` the resource | `+{0}+` the request path (or portion of) used to find a resource
| `TypeMismatchException` | `TypeMismatchException`
| (default) | (default)

6
spring-webflux/src/main/java/org/springframework/web/reactive/resource/NoResourceFoundException.java

@ -31,9 +31,11 @@ import org.springframework.web.server.ResponseStatusException;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class NoResourceFoundException extends ResponseStatusException { public class NoResourceFoundException extends ResponseStatusException {
public NoResourceFoundException(URI uri, String resourcePath) { public NoResourceFoundException(URI uri, String resourcePath) {
super(HttpStatus.NOT_FOUND, "No static resource " + resourcePath + " for request '" + uri + "'."); super(HttpStatus.NOT_FOUND,
"No static resource " + resourcePath + " for request '" + uri + "'.",
null, null, new Object[] { resourcePath});
setDetail("No static resource " + resourcePath + "."); setDetail("No static resource " + resourcePath + ".");
} }

5
spring-webflux/src/test/java/org/springframework/web/reactive/resource/NoResourceFoundExceptionTests.java

@ -40,4 +40,9 @@ class NoResourceFoundExceptionTests {
assertThat(noResourceFoundException.getBody().getDetail()).isEqualTo("No static resource /resource."); assertThat(noResourceFoundException.getBody().getDetail()).isEqualTo("No static resource /resource.");
} }
@Test
void messageArgumentsShouldContainResourcePath() {
var noResourceFoundException = new NoResourceFoundException(URI.create("/context/resource"), "/resource");
assertThat(noResourceFoundException.getDetailMessageArguments()).containsExactly("/resource");
}
} }

2
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/NoResourceFoundException.java

@ -80,6 +80,6 @@ public class NoResourceFoundException extends ServletException implements ErrorR
@Override @Override
public Object[] getDetailMessageArguments() { public Object[] getDetailMessageArguments() {
return new String[]{this.resourcePath}; return new String[] { this.resourcePath };
} }
} }

Loading…
Cancel
Save