root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-09-18 11:30:44 +01:00
parent c1b864c826 6020cb67d3
commit eefa7e9f78
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/WebFluxTags.java
View File

@ -60,10 +60,10 @@ public final class WebFluxTags {
} }
/** /**
* Creates a {@code method} tag based on the response status of the given * Creates a {@code status} tag based on the response status of the given
* {@code exchange}. * {@code exchange}.
* @param exchange the exchange * @param exchange the exchange
* @return the "status" tag derived from the response status * @return the status tag derived from the response status
*/ */
public static Tag status(ServerWebExchange exchange) { public static Tag status(ServerWebExchange exchange) {
HttpStatus status = exchange.getResponse().getStatusCode(); HttpStatus status = exchange.getResponse().getStatusCode();

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcTags.java
View File

@ -70,7 +70,7 @@ public final class WebMvcTags {
} }
/** /**
* Creates a {@code method} tag based on the status of the given {@code response}. * Creates a {@code status} tag based on the status of the given {@code response}.
* @param response the HTTP response * @param response the HTTP response
* @return the status tag derived from the status of the response * @return the status tag derived from the status of the response
*/ */