Merge pull request spring-projects#15799 from Johnny Lim

wilkinsona · wilkinsona · commit 5c08e23e9bcd · 2019-02-11T17:21:17.000Z
* spring-projectsgh-15799: Polish Closes spring-projectsgh-15799
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/RestTemplateExchangeTags.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/RestTemplateExchangeTags.java
@@ -131,43 +131,36 @@ public static Tag clientName(HttpRequest request) {
 	}
 
 	/**
-	 * Creates a {@code outcome} {@code Tag} derived from the
+	 * Creates an {@code outcome} {@code Tag} derived from the
 	 * {@link ClientHttpResponse#getStatusCode() status} of the given {@code response}.
 	 * @param response the response
 	 * @return the outcome tag
 	 * @since 2.2.0
 	 */
 	public static Tag outcome(ClientHttpResponse response) {
-		HttpStatus status = extractStatus(response);
-		if (status != null) {
-			if (status.is1xxInformational()) {
-				return OUTCOME_INFORMATIONAL;
-			}
-			if (status.is2xxSuccessful()) {
-				return OUTCOME_SUCCESS;
-			}
-			if (status.is3xxRedirection()) {
-				return OUTCOME_REDIRECTION;
-			}
-			if (status.is4xxClientError()) {
-				return OUTCOME_CLIENT_ERROR;
-			}
-			if (status.is5xxServerError()) {
-				return OUTCOME_SERVER_ERROR;
-			}
-		}
-		return OUTCOME_UNKNOWN;
-	}
-
-	private static HttpStatus extractStatus(ClientHttpResponse response) {
 		try {
 			if (response != null) {
-				return response.getStatusCode();
+				HttpStatus statusCode = response.getStatusCode();
+				if (statusCode.is1xxInformational()) {
+					return OUTCOME_INFORMATIONAL;
+				}
+				if (statusCode.is2xxSuccessful()) {
+					return OUTCOME_SUCCESS;
+				}
+				if (statusCode.is3xxRedirection()) {
+					return OUTCOME_REDIRECTION;
+				}
+				if (statusCode.is4xxClientError()) {
+					return OUTCOME_CLIENT_ERROR;
+				}
+				if (statusCode.is5xxServerError()) {
+					return OUTCOME_SERVER_ERROR;
+				}
 			}
-			return null;
+			return OUTCOME_UNKNOWN;
 		}
-		catch (IOException | IllegalArgumentException exc) {
-			return null;
+		catch (IOException | IllegalArgumentException ex) {
+			return OUTCOME_UNKNOWN;
 		}
 	}
 
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java
@@ -126,7 +126,7 @@ public static Tag clientName(ClientRequest request) {
 	}
 
 	/**
-	 * Creates a {@code outcome} {@code Tag} derived from the
+	 * Creates an {@code outcome} {@code Tag} derived from the
 	 * {@link ClientResponse#statusCode() status} of the given {@code response}.
 	 * @param response the response
 	 * @return the outcome tag
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/client/RestTemplateExchangeTagsTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/client/RestTemplateExchangeTagsTests.java
@@ -34,12 +34,11 @@
  *
  * @author Nishant Raut
  * @author Brian Clozel
- * @author Brian Clozel
  */
 public class RestTemplateExchangeTagsTests {
 
 	@Test
-	public void outcomeTagIsUnknownWhenResponseStatusIsNull() {
+	public void outcomeTagIsUnknownWhenResponseIsNull() {
 		Tag tag = RestTemplateExchangeTags.outcome(null);
 		assertThat(tag.getValue()).isEqualTo("UNKNOWN");
 	}
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTagsTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTagsTests.java
@@ -34,7 +34,7 @@
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link WebClientExchangeTags}
+ * Tests for {@link WebClientExchangeTags}.
  *
  * @author Brian Clozel
  * @author Nishant Raut
@@ -115,7 +115,7 @@ public void statusWhenClientException() {
 	}
 
 	@Test
-	public void outcomeTagIsUnknownWhenResponseStatusIsNull() {
+	public void outcomeTagIsUnknownWhenResponseIsNull() {
 		Tag tag = WebClientExchangeTags.outcome(null);
 		assertThat(tag.getValue()).isEqualTo("UNKNOWN");
 	}
@@ -156,7 +156,7 @@ public void outcomeTagIsServerErrorWhenResponseIs5xx() {
 	}
 
 	@Test
-	public void outcomeTagIsUknownWhenResponseStatusIsUknown() {
+	public void outcomeTagIsUnknownWhenResponseStatusIsUnknown() {
 		given(this.response.statusCode()).willThrow(IllegalArgumentException.class);
 		Tag tag = WebClientExchangeTags.outcome(this.response);
 		assertThat(tag.getValue()).isEqualTo("UNKNOWN");

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public static Tag clientName(ClientRequest request) {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`/**`
`129`		`- * Creates a {@code outcome} {@code Tag} derived from the`
	`129`	`+ * Creates an {@code outcome} {@code Tag} derived from the`
`130`	`130`	`* {@link ClientResponse#statusCode() status} of the given {@code response}.`
`131`	`131`	`* @param response the response`
`132`	`132`	`* @return the outcome tag`
Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,11 @@`
`34`	`34`	`*`
`35`	`35`	`* @author Nishant Raut`
`36`	`36`	`* @author Brian Clozel`
`37`		`- * @author Brian Clozel`
`38`	`37`	`*/`
`39`	`38`	`public class RestTemplateExchangeTagsTests {`
`40`	`39`
`41`	`40`	`@Test`
`42`		`- public void outcomeTagIsUnknownWhenResponseStatusIsNull() {`
	`41`	`+ public void outcomeTagIsUnknownWhenResponseIsNull() {`
`43`	`42`	`Tag tag = RestTemplateExchangeTags.outcome(null);`
`44`	`43`	`assertThat(tag.getValue()).isEqualTo("UNKNOWN");`
`45`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`import static org.mockito.Mockito.mock;`
`35`	`35`
`36`	`36`	`/**`
`37`		`- * Tests for {@link WebClientExchangeTags}`
	`37`	`+ * Tests for {@link WebClientExchangeTags}.`
`38`	`38`	`*`
`39`	`39`	`* @author Brian Clozel`
`40`	`40`	`* @author Nishant Raut`
`@@ -115,7 +115,7 @@ public void statusWhenClientException() {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`@Test`
`118`		`- public void outcomeTagIsUnknownWhenResponseStatusIsNull() {`
	`118`	`+ public void outcomeTagIsUnknownWhenResponseIsNull() {`
`119`	`119`	`Tag tag = WebClientExchangeTags.outcome(null);`
`120`	`120`	`assertThat(tag.getValue()).isEqualTo("UNKNOWN");`
`121`	`121`	`}`
`@@ -156,7 +156,7 @@ public void outcomeTagIsServerErrorWhenResponseIs5xx() {`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`@Test`
`159`		`- public void outcomeTagIsUknownWhenResponseStatusIsUknown() {`
	`159`	`+ public void outcomeTagIsUnknownWhenResponseStatusIsUnknown() {`
`160`	`160`	`given(this.response.statusCode()).willThrow(IllegalArgumentException.class);`
`161`	`161`	`Tag tag = WebClientExchangeTags.outcome(this.response);`
`162`	`162`	`assertThat(tag.getValue()).isEqualTo("UNKNOWN");`