Merge branch '2.1.x'

Closes gh-17079

spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/producer/ProducerApplication.java

@@ -42,8 +42,7 @@ public class ProducerApplication implements ApplicationRunner {
 		this.serviceProperties.getInputDir().mkdirs();
 		if (args.getNonOptionArgs().size() > 0) {
 			FileOutputStream stream = new FileOutputStream(
-					new File(this.serviceProperties.getInputDir(),
-							"data" + System.currentTimeMillis() + ".txt"));
+					new File(this.serviceProperties.getInputDir(), "data" + System.currentTimeMillis() + ".txt"));
 			for (String arg : args.getNonOptionArgs()) {
 				stream.write(arg.getBytes());
 			}