From 60211dab868767711a47dc3f4ad5e19cad213869 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Oct 2016 16:10:49 +0100 Subject: [PATCH] Polishing - Pass attributes into RequestPartFieldsSnippet - Add missing package.info.java for new asciidoctor package --- .../restdocs/asciidoctor/package-info.java | 20 +++++++++++++++++++ .../payload/PayloadDocumentation.java | 8 ++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 spring-restdocs-asciidoctor/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java diff --git a/spring-restdocs-asciidoctor/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java b/spring-restdocs-asciidoctor/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java new file mode 100644 index 000000000..45e050e7f --- /dev/null +++ b/spring-restdocs-asciidoctor/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2014-2016 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Spring REST Docs Asciidoctor extensions. + */ +package org.springframework.restdocs.asciidoctor; diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/PayloadDocumentation.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/PayloadDocumentation.java index 2e1d8ea2f..bb6bbbc28 100644 --- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/PayloadDocumentation.java +++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/PayloadDocumentation.java @@ -381,7 +381,7 @@ public static RequestPartFieldsSnippet relaxedRequestPartFields(String part, */ public static RequestPartFieldsSnippet requestPartFields(String part, Map attributes, FieldDescriptor... descriptors) { - return requestPartFields(part, Arrays.asList(descriptors)); + return requestPartFields(part, attributes, Arrays.asList(descriptors)); } /** @@ -409,7 +409,7 @@ public static RequestPartFieldsSnippet requestPartFields(String part, */ public static RequestPartFieldsSnippet requestPartFields(String part, Map attributes, List descriptors) { - return new RequestPartFieldsSnippet(part, descriptors); + return new RequestPartFieldsSnippet(part, descriptors, attributes); } /** @@ -429,7 +429,7 @@ public static RequestPartFieldsSnippet requestPartFields(String part, */ public static RequestPartFieldsSnippet relaxedRequestPartFields(String part, Map attributes, FieldDescriptor... descriptors) { - return relaxedRequestPartFields(part, Arrays.asList(descriptors)); + return relaxedRequestPartFields(part, attributes, Arrays.asList(descriptors)); } /** @@ -449,7 +449,7 @@ public static RequestPartFieldsSnippet relaxedRequestPartFields(String part, */ public static RequestPartFieldsSnippet relaxedRequestPartFields(String part, Map attributes, List descriptors) { - return new RequestPartFieldsSnippet(part, descriptors, true); + return new RequestPartFieldsSnippet(part, descriptors, attributes, true); } /**