Merge branch '1.2.x'

Author: wilkinsona

spring-restdocs-core/src/main/java/org/springframework/restdocs/cli/CliOperationRequest.java

@@ -103,7 +103,6 @@ private boolean allowedHeader(Map.Entry<String, List<String>> header) {
 			}
 		}
 		return true;
-
 	}
 
 	@Override

spring-restdocs-core/src/main/java/org/springframework/restdocs/cli/ConcatenatingCommandFormatter.java

@@ -44,14 +44,12 @@ public String format(List<String> elements) {
 		if (CollectionUtils.isEmpty(elements)) {
 			return "";
 		}
-
 		StringBuilder result = new StringBuilder();
-
 		for (String element : elements) {
 			result.append(String.format(this.separator));
 			result.append(element);
 		}
-
 		return result.toString();
 	}
+
 }

spring-restdocs-core/src/main/java/org/springframework/restdocs/cli/CurlRequestSnippet.java

@@ -161,7 +161,6 @@ private void writeHeaders(CliOperationRequest request, List<String> lines) {
 
 	private void writePartsIfNecessary(OperationRequest request, List<String> lines) {
 		for (OperationRequestPart part : request.getParts()) {
-
 			StringBuilder oneLine = new StringBuilder();
 			oneLine.append(String.format("-F '%s=", part.getName()));
 			if (!StringUtils.hasText(part.getSubmittedFileName())) {
@@ -174,7 +173,6 @@ private void writePartsIfNecessary(OperationRequest request, List<String> lines)
 				oneLine.append(";type=");
 				oneLine.append(part.getHeaders().getContentType().toString());
 			}
-
 			oneLine.append("'");
 			lines.add(oneLine.toString());
 		}

spring-restdocs-core/src/main/java/org/springframework/restdocs/cli/HttpieRequestSnippet.java

@@ -214,4 +214,5 @@ private void writeContentUsingParameters(Parameters parameters, List<String> lin
 			}
 		}
 	}
+
 }

spring-restdocs-core/src/main/java/org/springframework/restdocs/config/NestedConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 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,4 +31,5 @@ interface NestedConfigurer<PARENT> {
 	 * @return the parent
 	 */
 	PARENT and();
+
 }

spring-restdocs-core/src/main/java/org/springframework/restdocs/constraints/ConstraintDescriptionResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 the original author or authors.
+ * Copyright 2014-2017 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,7 +20,6 @@
  * Resolves a description for a {@link Constraint}.
  *
  * @author Andy Wilkinson
- *
  */
 public interface ConstraintDescriptionResolver {
 
@@ -31,4 +30,5 @@ public interface ConstraintDescriptionResolver {
 	 * @return the description
 	 */
 	String resolveDescription(Constraint constraint);
+
 }

spring-restdocs-core/src/main/java/org/springframework/restdocs/constraints/ValidatorConstraintResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 the original author or authors.
+ * Copyright 2014-2017 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.
@@ -77,4 +77,5 @@ public List<Constraint> resolveForProperty(String property, Class<?> clazz) {
 		}
 		return constraints;
 	}
+
 }

spring-restdocs-core/src/main/java/org/springframework/restdocs/hypermedia/ContentTypeLinkExtractor.java

@@ -30,7 +30,6 @@
  * content type.
  *
  * @author Andy Wilkinson
- *
  */
 class ContentTypeLinkExtractor implements LinkExtractor {
 

spring-restdocs-core/src/main/java/org/springframework/restdocs/hypermedia/HypermediaDocumentation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 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.
@@ -472,4 +472,5 @@ public static LinkExtractor halLinks() {
 	public static LinkExtractor atomLinks() {
 		return new AtomLinkExtractor();
 	}
+
 }

spring-restdocs-core/src/main/java/org/springframework/restdocs/operation/preprocess/HeaderRemovingOperationPreprocessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 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.
@@ -66,4 +66,5 @@ private HttpHeaders removeHeaders(HttpHeaders originalHeaders) {
 		}
 		return processedHeaders;
 	}
+
 }