Skip to content

Polish #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Polish #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ...stdocs-core/src/main/java/org/springframework/restdocs/payload/AbstractFieldsSnippet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,9 @@ private FieldDescriptor copyWithType(FieldDescriptor source, Object type) {
}

private static Attribute[] asArray(Map<String, Object> attributeMap) {
List<Attributes.Attribute> attributes = new ArrayList<>();
for (Map.Entry<String, Object> attribute : attributeMap.entrySet()) {
attributes
.add(Attributes.key(attribute.getKey()).value(attribute.getValue()));
}
return attributes.toArray(new Attribute[attributes.size()]);
return attributeMap.entrySet().stream()
.map((attribute) -> Attributes.key(attribute.getKey()).value(attribute.getValue()))
.toArray(Attribute[]::new);
}

}
9 changes: 3 additions & 6 deletions ...estdocs-core/src/main/java/org/springframework/restdocs/payload/PayloadDocumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,12 +1644,9 @@ public static PayloadSubsectionExtractor<?> beneathPath(String path) {
}

private static Attribute[] asArray(Map<String, Object> attributeMap) {
List<Attributes.Attribute> attributes = new ArrayList<>();
for (Map.Entry<String, Object> attribute : attributeMap.entrySet()) {
attributes
.add(Attributes.key(attribute.getKey()).value(attribute.getValue()));
}
return attributes.toArray(new Attribute[attributes.size()]);
return attributeMap.entrySet().stream()
.map((attribute) -> Attributes.key(attribute.getKey()).value(attribute.getValue()))
.toArray(Attribute[]::new);
}

}
19 changes: 8 additions & 11 deletions ...docs-core/src/test/java/org/springframework/restdocs/payload/JsonContentHandlerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.springframework.restdocs.payload;

import java.io.IOException;
import java.util.Arrays;
import java.util.List;

Expand All @@ -39,64 +38,62 @@ public class JsonContentHandlerTests {
public ExpectedException thrown = ExpectedException.none();

@Test
public void typeForFieldWithNullValueMustMatch() throws IOException {
public void typeForFieldWithNullValueMustMatch() {
this.thrown.expect(FieldTypesDoNotMatchException.class);
new JsonContentHandler("{\"a\": null}".getBytes())
.determineFieldType(new FieldDescriptor("a").type(JsonFieldType.STRING));
}

@Test
public void typeForFieldWithNotNullAndThenNullValueMustMatch() throws IOException {
public void typeForFieldWithNotNullAndThenNullValueMustMatch() {
this.thrown.expect(FieldTypesDoNotMatchException.class);
new JsonContentHandler("{\"a\":[{\"id\":1},{\"id\":null}]}".getBytes())
.determineFieldType(
new FieldDescriptor("a[].id").type(JsonFieldType.STRING));
}

@Test
public void typeForFieldWithNullAndThenNotNullValueMustMatch() throws IOException {
public void typeForFieldWithNullAndThenNotNullValueMustMatch() {
this.thrown.expect(FieldTypesDoNotMatchException.class);
new JsonContentHandler("{\"a\":[{\"id\":null},{\"id\":1}]}".getBytes())
.determineFieldType(
new FieldDescriptor("a.[].id").type(JsonFieldType.STRING));
}

@Test
public void typeForOptionalFieldWithNumberAndThenNullValueIsNumber()
throws IOException {
public void typeForOptionalFieldWithNumberAndThenNullValueIsNumber() {
Object fieldType = new JsonContentHandler(
"{\"a\":[{\"id\":1},{\"id\":null}]}\"".getBytes())
.determineFieldType(new FieldDescriptor("a[].id").optional());
assertThat((JsonFieldType) fieldType, is(equalTo(JsonFieldType.NUMBER)));
}

@Test
public void typeForOptionalFieldWithNullAndThenNumberIsNumber() throws IOException {
public void typeForOptionalFieldWithNullAndThenNumberIsNumber() {
Object fieldType = new JsonContentHandler(
"{\"a\":[{\"id\":null},{\"id\":1}]}".getBytes())
.determineFieldType(new FieldDescriptor("a[].id").optional());
assertThat((JsonFieldType) fieldType, is(equalTo(JsonFieldType.NUMBER)));
}

@Test
public void typeForFieldWithNumberAndThenNullValueIsVaries() throws IOException {
public void typeForFieldWithNumberAndThenNullValueIsVaries() {
Object fieldType = new JsonContentHandler(
"{\"a\":[{\"id\":1},{\"id\":null}]}\"".getBytes())
.determineFieldType(new FieldDescriptor("a[].id"));
assertThat((JsonFieldType) fieldType, is(equalTo(JsonFieldType.VARIES)));
}

@Test
public void typeForFieldWithNullAndThenNumberIsVaries() throws IOException {
public void typeForFieldWithNullAndThenNumberIsVaries() {
Object fieldType = new JsonContentHandler(
"{\"a\":[{\"id\":null},{\"id\":1}]}".getBytes())
.determineFieldType(new FieldDescriptor("a[].id"));
assertThat((JsonFieldType) fieldType, is(equalTo(JsonFieldType.VARIES)));
}

@Test
public void typeForOptionalFieldWithNullValueCanBeProvidedExplicitly()
throws IOException {
public void typeForOptionalFieldWithNullValueCanBeProvidedExplicitly() {
Object fieldType = new JsonContentHandler("{\"a\": null}".getBytes())
.determineFieldType(
new FieldDescriptor("a").type(JsonFieldType.STRING).optional());
Expand Down