Polish "Specify language derived from Content-Type in body snippets"

See gh-797

spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/AbstractBodySnippet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -31,6 +31,7 @@ import org.springframework.restdocs.snippet.TemplatedSnippet;
  * document a RESTful resource's request or response body.
  *
  * @author Andy Wilkinson
+ * @author Achim Grimm
  */
 public abstract class AbstractBodySnippet extends TemplatedSnippet {
 
@@ -73,11 +74,7 @@ public abstract class AbstractBodySnippet extends TemplatedSnippet {
 	protected Map<String, Object> createModel(Operation operation) {
 		try {
 			MediaType contentType = getContentType(operation);
-			String language = null;
-			if (contentType != null) {
-				language = (contentType.getSubtypeSuffix() != null) ? contentType.getSubtypeSuffix()
-						: contentType.getSubtype();
-			}
+			String language = determineLanguage(contentType);
 			byte[] content = getContent(operation);
 			if (this.subsectionExtractor != null) {
 				content = this.subsectionExtractor.extractSubsection(content, contentType);
@@ -94,6 +91,13 @@ public abstract class AbstractBodySnippet extends TemplatedSnippet {
 		}
 	}
 
+	private String determineLanguage(MediaType contentType) {
+		if (contentType == null) {
+			return null;
+		}
+		return (contentType.getSubtypeSuffix() != null) ? contentType.getSubtypeSuffix() : contentType.getSubtype();
+	}
+
 	private Charset extractCharset(MediaType contentType) {
 		if (contentType == null) {
 			return null;

spring-restdocs-core/src/main/resources/org/springframework/restdocs/templates/asciidoctor/default-request-part-body.snippet

@@ -1,4 +1,4 @@
-[source,options="nowrap"]
+[source{{#language}},{{language}}{{/language}},options="nowrap"]
 ----
 {{body}}
 ----

spring-restdocs-core/src/main/resources/org/springframework/restdocs/templates/markdown/default-request-part-body.snippet

@@ -1,3 +1,3 @@
-```
+```{{#language}}{{language}}{{/language}}
 {{body}}
 ```

spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/RequestBodyPartSnippetTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -20,6 +20,8 @@ import java.io.IOException;
 
 import org.junit.Test;
 
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.restdocs.AbstractSnippetTests;
 import org.springframework.restdocs.templates.TemplateEngine;
 import org.springframework.restdocs.templates.TemplateFormat;
@@ -61,6 +63,38 @@ public class RequestBodyPartSnippetTests extends AbstractSnippetTests {
 				.is(codeBlock(null, "nowrap").withContent(""));
 	}
 
+	@Test
+	public void requestPartWithJsonMediaType() throws IOException {
+		requestPartBody("one").document(this.operationBuilder.request("http://localhost").part("one", "".getBytes())
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).build());
+		assertThat(this.generatedSnippets.snippet("request-part-one-body"))
+				.is(codeBlock("json", "nowrap").withContent(""));
+	}
+
+	@Test
+	public void requestPartWithJsonSubtypeMediaType() throws IOException {
+		requestPartBody("one").document(this.operationBuilder.request("http://localhost").part("one", "".getBytes())
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_PROBLEM_JSON_VALUE).build());
+		assertThat(this.generatedSnippets.snippet("request-part-one-body"))
+				.is(codeBlock("json", "nowrap").withContent(""));
+	}
+
+	@Test
+	public void requestPartWithXmlMediaType() throws IOException {
+		requestPartBody("one").document(this.operationBuilder.request("http://localhost").part("one", "".getBytes())
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML_VALUE).build());
+		assertThat(this.generatedSnippets.snippet("request-part-one-body"))
+				.is(codeBlock("xml", "nowrap").withContent(""));
+	}
+
+	@Test
+	public void requestPartWithXmlSubtypeMediaType() throws IOException {
+		requestPartBody("one").document(this.operationBuilder.request("http://localhost").part("one", "".getBytes())
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_ATOM_XML_VALUE).build());
+		assertThat(this.generatedSnippets.snippet("request-part-one-body"))
+				.is(codeBlock("xml", "nowrap").withContent(""));
+	}
+
 	@Test
 	public void subsectionOfRequestPartBody() throws IOException {
 		requestPartBody("one", beneathPath("a.b")).document(this.operationBuilder.request("http://localhost")

spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/RequestBodySnippetTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -61,14 +61,28 @@ public class RequestBodySnippetTests extends AbstractSnippetTests {
 	}
 
 	@Test
-	public void requestWithMediaTypeJson() throws IOException {
+	public void requestWithJsonMediaType() throws IOException {
 		requestBody().document(this.operationBuilder.request("http://localhost")
 				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).build());
 		assertThat(this.generatedSnippets.snippet("request-body")).is(codeBlock("json", "nowrap").withContent(""));
 	}
 
 	@Test
-	public void requestWithMediaTypeXml() throws IOException {
+	public void requestWithJsonSubtypeMediaType() throws IOException {
+		requestBody().document(this.operationBuilder.request("http://localhost")
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_PROBLEM_JSON_VALUE).build());
+		assertThat(this.generatedSnippets.snippet("request-body")).is(codeBlock("json", "nowrap").withContent(""));
+	}
+
+	@Test
+	public void requestWithXmlMediaType() throws IOException {
+		requestBody().document(this.operationBuilder.request("http://localhost")
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML_VALUE).build());
+		assertThat(this.generatedSnippets.snippet("request-body")).is(codeBlock("xml", "nowrap").withContent(""));
+	}
+
+	@Test
+	public void requestWithXmlSubtypeMediaType() throws IOException {
 		requestBody().document(this.operationBuilder.request("http://localhost")
 				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_ATOM_XML_VALUE).build());
 		assertThat(this.generatedSnippets.snippet("request-body")).is(codeBlock("xml", "nowrap").withContent(""));

spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/ResponseBodySnippetTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -61,14 +61,28 @@ public class ResponseBodySnippetTests extends AbstractSnippetTests {
 	}
 
 	@Test
-	public void responseWithMediaTypeJson() throws IOException {
+	public void responseWithJsonMediaType() throws IOException {
 		new ResponseBodySnippet().document(this.operationBuilder.response()
 				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).build());
 		assertThat(this.generatedSnippets.snippet("response-body")).is(codeBlock("json", "nowrap").withContent(""));
 	}
 
 	@Test
-	public void responseWithMediaTypeXml() throws IOException {
+	public void responseWithJsonSubtypeMediaType() throws IOException {
+		new ResponseBodySnippet().document(this.operationBuilder.response()
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_PROBLEM_JSON_VALUE).build());
+		assertThat(this.generatedSnippets.snippet("response-body")).is(codeBlock("json", "nowrap").withContent(""));
+	}
+
+	@Test
+	public void responseWithXmlMediaType() throws IOException {
+		new ResponseBodySnippet().document(this.operationBuilder.response()
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML_VALUE).build());
+		assertThat(this.generatedSnippets.snippet("response-body")).is(codeBlock("xml", "nowrap").withContent(""));
+	}
+
+	@Test
+	public void responseWithXmlSubtypeMediaType() throws IOException {
 		new ResponseBodySnippet().document(this.operationBuilder.response()
 				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_ATOM_XML_VALUE).build());
 		assertThat(this.generatedSnippets.snippet("response-body")).is(codeBlock("xml", "nowrap").withContent(""));