Polishing

This commit is contained in:
Andy Wilkinson
2015-09-30 19:28:43 +01:00
parent fb01a26a16
commit 2730a7ceef
2 changed files with 5 additions and 34 deletions

View File

@@ -75,18 +75,13 @@ public abstract class AbstractHeadersSnippet extends TemplatedSnippet {
private void validateHeaderDocumentation(Operation operation) {
List<HeaderDescriptor> missingHeaders = findMissingHeaders(operation);
if (!missingHeaders.isEmpty()) {
String message = "";
if (!missingHeaders.isEmpty()) {
List<String> names = new ArrayList<String>();
for (HeaderDescriptor headerDescriptor : missingHeaders) {
names.add(headerDescriptor.getName());
}
message += "Headers with the following names were not found in the "
+ this.type + ": " + names;
List<String> names = new ArrayList<String>();
for (HeaderDescriptor headerDescriptor : missingHeaders) {
names.add(headerDescriptor.getName());
}
throw new SnippetException(message);
throw new SnippetException("Headers with the following names were not found"
+ " in the " + this.type + ": " + names);
}
}

View File

@@ -400,30 +400,6 @@ public class MockMvcRestDocumentationIntegrationTests {
"$ curl 'http://localhost:8080/custom/' -i -H 'Accept: application/json'"))));
}
@Test
public void stackOverflowQuestion() throws Exception {
MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(this.context)
.apply(documentationConfiguration(this.restDocumentation)).build();
mockMvc.perform(get("/company/5").accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
.andDo(document(
"company",
responseFields(
fieldWithPath("companyName").description(
"The name of the company"),
fieldWithPath("employee").description(
"An array of the company's employees"))))
.andDo(document(
"employee",
responseFields(
fieldWithPath("companyName").ignored(),
fieldWithPath("employee[].name").description(
"The name of the employee"),
fieldWithPath("employee[].age").description(
"The age of the employee"))));
}
private void assertExpectedSnippetFilesExist(File directory, String... snippets) {
for (String snippet : snippets) {
assertTrue(new File(directory, snippet).isFile());