Merge pull request #676 from bric3

* gh-676:
  Polish "Propagate ignoreUndocumentedParamteres with .and()"
  Propagate ignoreUndocumentedParamteres with .and()

Closes gh-676

Author: wilkinsona

spring-restdocs-core/src/main/java/org/springframework/restdocs/request/AbstractParametersSnippet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -148,6 +148,16 @@ protected final Map<String, ParameterDescriptor> getParameterDescriptors() {
 		return this.descriptorsByName;
 	}
 
+	/**
+	 * Returns whether to ignore undocumented parameters.
+	 * @return {@code true} if undocumented parameters should be ignored, otherwise
+	 * {@code false}
+	 * @since 2.0.5
+	 */
+	protected final boolean isIgnoreUndocumentedParameters() {
+		return this.ignoreUndocumentedParameters;
+	}
+
 	/**
 	 * Returns a model for the given {@code descriptor}.
 	 * @param descriptor the descriptor

spring-restdocs-core/src/main/java/org/springframework/restdocs/request/PathParametersSnippet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -170,7 +170,7 @@ public final PathParametersSnippet and(ParameterDescriptor... additionalDescript
 	public final PathParametersSnippet and(List<ParameterDescriptor> additionalDescriptors) {
 		List<ParameterDescriptor> combinedDescriptors = new ArrayList<>(getParameterDescriptors().values());
 		combinedDescriptors.addAll(additionalDescriptors);
-		return new PathParametersSnippet(combinedDescriptors, this.getAttributes());
+		return new PathParametersSnippet(combinedDescriptors, this.getAttributes(), isIgnoreUndocumentedParameters());
 	}
 
 }

spring-restdocs-core/src/main/java/org/springframework/restdocs/request/RequestParametersSnippet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -133,7 +133,8 @@ public RequestParametersSnippet and(ParameterDescriptor... additionalDescriptors
 	public RequestParametersSnippet and(List<ParameterDescriptor> additionalDescriptors) {
 		List<ParameterDescriptor> combinedDescriptors = new ArrayList<>(getParameterDescriptors().values());
 		combinedDescriptors.addAll(additionalDescriptors);
-		return new RequestParametersSnippet(combinedDescriptors, this.getAttributes());
+		return new RequestParametersSnippet(combinedDescriptors, this.getAttributes(),
+				this.isIgnoreUndocumentedParameters());
 	}
 
 }

spring-restdocs-core/src/test/java/org/springframework/restdocs/request/PathParametersSnippetTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -159,6 +159,16 @@ public void additionalDescriptors() throws IOException {
 				tableWithTitleAndHeader(getTitle(), "Parameter", "Description").row("`a`", "one").row("`b`", "two"));
 	}
 
+	@Test
+	public void additionalDescriptorsWithRelaxedRequestParameters() throws IOException {
+		RequestDocumentation.relaxedPathParameters(parameterWithName("a").description("one"))
+				.and(parameterWithName("b").description("two")).document(this.operationBuilder
+						.attribute(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE, "/{a}/{b}/{c}").build());
+		assertThat(this.generatedSnippets.pathParameters())
+				.is(tableWithTitleAndHeader(getTitle("/{a}/{b}/{c}"), "Parameter", "Description").row("`a`", "one")
+						.row("`b`", "two"));
+	}
+
 	@Test
 	public void pathParametersWithEscapedContent() throws IOException {
 		RequestDocumentation.pathParameters(parameterWithName("Foo|Bar").description("one|two"))

spring-restdocs-core/src/test/java/org/springframework/restdocs/request/RequestParametersSnippetTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -153,6 +153,16 @@ public void additionalDescriptors() throws IOException {
 				.is(tableWithHeader("Parameter", "Description").row("`a`", "one").row("`b`", "two"));
 	}
 
+	@Test
+	public void additionalDescriptorsWithRelaxedRequestParameters() throws IOException {
+		RequestDocumentation.relaxedRequestParameters(parameterWithName("a").description("one"))
+				.and(parameterWithName("b").description("two"))
+				.document(this.operationBuilder.request("http://localhost").param("a", "bravo").param("b", "bravo")
+						.param("c", "undocumented").build());
+		assertThat(this.generatedSnippets.requestParameters())
+				.is(tableWithHeader("Parameter", "Description").row("`a`", "one").row("`b`", "two"));
+	}
+
 	@Test
 	public void requestParametersWithEscapedContent() throws IOException {
 		RequestDocumentation.requestParameters(parameterWithName("Foo|Bar").description("one|two"))