Polish "Fix NPE in HttpResponseSnippet when response has custom status"

See gh-653

Author: wilkinsona

spring-restdocs-core/src/main/java/org/springframework/restdocs/http/HttpResponseSnippet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,17 +56,17 @@ protected HttpResponseSnippet(Map<String, Object> attributes) {
 	@Override
 	protected Map<String, Object> createModel(Operation operation) {
 		OperationResponse response = operation.getResponse();
-		HttpStatus status = response.getStatus();
 		Map<String, Object> model = new HashMap<>();
 		model.put("responseBody", responseBody(response));
 		model.put("headers", headers(response));
+		HttpStatus status = response.getStatus();
 		if (status != null) {
 			model.put("statusCode", status.value());
 			model.put("statusReason", status.getReasonPhrase());
 		}
 		else {
 			model.put("statusCode", response.getStatusCode());
-			model.put("statusReason", "Http custom status.");
+			model.put("statusReason", "");
 		}
 		return model;
 	}

spring-restdocs-core/src/test/java/org/springframework/restdocs/AbstractSnippetTests.java

@@ -89,8 +89,8 @@ public HttpResponseCondition httpResponse(HttpStatus responseStatus) {
 		return SnippetConditions.httpResponse(this.templateFormat, responseStatus);
 	}
 
-	public HttpResponseCondition httpResponse(Integer responseStatusCode, String responseStatusReason) {
-		return SnippetConditions.httpResponse(this.templateFormat, responseStatusCode, responseStatusReason);
+	public HttpResponseCondition httpResponse(int responseStatusCode) {
+		return SnippetConditions.httpResponse(this.templateFormat, responseStatusCode, "");
 	}
 
 	protected FileSystemResource snippetResource(String name) {

spring-restdocs-core/src/test/java/org/springframework/restdocs/http/HttpResponseSnippetTests.java

@@ -100,6 +100,7 @@ public void responseWithCustomSnippetAttributes() throws IOException {
 	@Test
 	public void responseWithCustomStatus() throws IOException {
 		new HttpResponseSnippet().document(this.operationBuilder.response().status(215).build());
-		assertThat(this.generatedSnippets.httpResponse()).is(httpResponse(215,"Http custom status."));
+		assertThat(this.generatedSnippets.httpResponse()).is(httpResponse(215));
 	}
+
 }

spring-restdocs-core/src/test/java/org/springframework/restdocs/test/SnippetConditions.java

@@ -71,11 +71,14 @@ public static HttpResponseCondition httpResponse(TemplateFormat format, HttpStat
 		return new HttpResponseCondition(status, new MarkdownCodeBlockCondition<>("http"), 2);
 	}
 
-	public static HttpResponseCondition httpResponse(TemplateFormat format, Integer responseStatusCode, String responseStatusReason) {
+	public static HttpResponseCondition httpResponse(TemplateFormat format, Integer responseStatusCode,
+			String responseStatusReason) {
 		if ("adoc".equals(format.getFileExtension())) {
-			return new HttpResponseCondition(responseStatusCode, responseStatusReason, new AsciidoctorCodeBlockCondition<>("http", "nowrap"), 3);
+			return new HttpResponseCondition(responseStatusCode, responseStatusReason,
+					new AsciidoctorCodeBlockCondition<>("http", "nowrap"), 3);
 		}
-		return new HttpResponseCondition(responseStatusCode, responseStatusReason, new MarkdownCodeBlockCondition<>("http"), 2);
+		return new HttpResponseCondition(responseStatusCode, responseStatusReason,
+				new MarkdownCodeBlockCondition<>("http"), 2);
 	}
 
 	@SuppressWarnings({ "rawtypes" })
@@ -242,7 +245,8 @@ private HttpResponseCondition(HttpStatus status, CodeBlockCondition<?> delegate,
 			this.content("");
 		}
 
-		private HttpResponseCondition(Integer responseStatusCode, String responseStatusReason, CodeBlockCondition<?> delegate, int headerOffset) {
+		private HttpResponseCondition(int responseStatusCode, String responseStatusReason,
+				CodeBlockCondition<?> delegate, int headerOffset) {
 			super(delegate, headerOffset);
 			this.content("HTTP/1.1 " + responseStatusCode + " " + responseStatusReason);
 			this.content("");