Replace "folder" with "directory"

Consistently use the term "directory" instead of "folder"

Closes gh-21218

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayersIndexTests.java

@@ -85,7 +85,7 @@ class LayersIndexTests {
 	}
 
 	@Test
-	void writeToWhenAllFilesInFolderAreInSameLayerUsesFolder() {
+	void writeToWhenAllFilesInDirectoryAreInSameLayerUsesDirectory() {
 		LayersIndex index = new LayersIndex(LAYER_A, LAYER_B, LAYER_C);
 		index.add(LAYER_A, "a1/b1/c1");
 		index.add(LAYER_A, "a1/b1/c2");
@@ -96,7 +96,7 @@ class LayersIndexTests {
 	}
 
 	@Test
-	void writeToWhenAllFilesInFolderAreInNotInSameLayerUsesFiles() {
+	void writeToWhenAllFilesInDirectoryAreInNotInSameLayerUsesFiles() {
 		LayersIndex index = new LayersIndex(LAYER_A, LAYER_B, LAYER_C);
 		index.add(LAYER_A, "a1/b1/c1");
 		index.add(LAYER_B, "a1/b1/c2");

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-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.
@@ -60,7 +60,7 @@ class MainClassFinderTests {
 	}
 
 	@Test
-	void findMainClassInJarSubFolder() throws Exception {
+	void findMainClassInJarSubDirectory() throws Exception {
 		this.testJarFile.addClass("a/b/c/D.class", ClassWithMainMethod.class);
 		this.testJarFile.addClass("a/b/c/E.class", ClassWithoutMainMethod.class);
 		this.testJarFile.addClass("a/b/F.class", ClassWithoutMainMethod.class);
@@ -114,7 +114,7 @@ class MainClassFinderTests {
 	}
 
 	@Test
-	void findMainClassInFolder() throws Exception {
+	void findMainClassInDirectory() throws Exception {
 		this.testJarFile.addClass("B.class", ClassWithMainMethod.class);
 		this.testJarFile.addClass("A.class", ClassWithoutMainMethod.class);
 		String actual = MainClassFinder.findMainClass(this.testJarFile.getJarSource());
@@ -122,7 +122,7 @@ class MainClassFinderTests {
 	}
 
 	@Test
-	void findMainClassInSubFolder() throws Exception {
+	void findMainClassInSubDirectory() throws Exception {
 		this.testJarFile.addClass("a/b/c/D.class", ClassWithMainMethod.class);
 		this.testJarFile.addClass("a/b/c/E.class", ClassWithoutMainMethod.class);
 		this.testJarFile.addClass("a/b/F.class", ClassWithoutMainMethod.class);
@@ -131,7 +131,7 @@ class MainClassFinderTests {
 	}
 
 	@Test
-	void usesBreadthFirstFolderSearch() throws Exception {
+	void usesBreadthFirstDirectorySearch() throws Exception {
 		this.testJarFile.addClass("a/B.class", ClassWithMainMethod.class);
 		this.testJarFile.addClass("a/b/c/E.class", ClassWithMainMethod.class);
 		String actual = MainClassFinder.findMainClass(this.testJarFile.getJarSource());
@@ -139,7 +139,7 @@ class MainClassFinderTests {
 	}
 
 	@Test
-	void findSingleFolderSearch() throws Exception {
+	void findSingleDirectorySearch() throws Exception {
 		this.testJarFile.addClass("a/B.class", ClassWithMainMethod.class);
 		this.testJarFile.addClass("a/b/c/E.class", ClassWithMainMethod.class);
 		assertThatIllegalStateException()
@@ -149,7 +149,7 @@ class MainClassFinderTests {
 	}
 
 	@Test
-	void findSingleFolderSearchPrefersAnnotatedMainClass() throws Exception {
+	void findSingleDirectorySearchPrefersAnnotatedMainClass() throws Exception {
 		this.testJarFile.addClass("a/B.class", ClassWithMainMethod.class);
 		this.testJarFile.addClass("a/b/c/E.class", AnnotatedClassWithMainMethod.class);
 		String mainClass = MainClassFinder.findSingleMainClass(this.testJarFile.getJarSource(),
@@ -158,7 +158,7 @@ class MainClassFinderTests {
 	}
 
 	@Test
-	void doWithFolderMainMethods() throws Exception {
+	void doWithDirectoryMainMethods() throws Exception {
 		this.testJarFile.addClass("a/b/c/D.class", ClassWithMainMethod.class);
 		this.testJarFile.addClass("a/b/c/E.class", ClassWithoutMainMethod.class);
 		this.testJarFile.addClass("a/b/F.class", ClassWithoutMainMethod.class);

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/TestJarFile.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-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.
@@ -40,15 +40,15 @@ public class TestJarFile {
 
 	private final byte[] buffer = new byte[4096];
 
-	private final File temporaryFolder;
+	private final File temporaryDirectory;
 
 	private final File jarSource;
 
 	private final List<ZipEntrySource> entries = new ArrayList<>();
 
-	public TestJarFile(File temporaryFolder) throws IOException {
-		this.temporaryFolder = temporaryFolder;
-		this.jarSource = new File(temporaryFolder, "jar-source");
+	public TestJarFile(File temporaryDirectory) throws IOException {
+		this.temporaryDirectory = temporaryDirectory;
+		this.jarSource = new File(temporaryDirectory, "jar-source");
 	}
 
 	public void addClass(String filename, Class<?> classToCopy) throws IOException {
@@ -120,7 +120,7 @@ public class TestJarFile {
 	}
 
 	public File getFile(String extension) throws IOException {
-		File file = new File(this.temporaryFolder, UUID.randomUUID() + "." + extension);
+		File file = new File(this.temporaryDirectory, UUID.randomUUID() + "." + extension);
 		ZipUtil.pack(this.entries.toArray(new ZipEntrySource[0]), file);
 		return file;
 	}