Merge branch '3.1.x'

wilkinsona · wilkinsona · commit 173e6543fd0e · 2023-11-01T15:06:20.000Z
Closes gh-38168
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoTests.java
@@ -100,7 +100,7 @@ void customNameIsReflectedInProperties() {
 	}
 
 	@Test
-	void nameCanBeExludedRemovedFromProperties() {
+	void nameCanBeExcludedFromProperties() {
 		BuildInfo task = createTask(createProject("test"));
 		task.getExcludes().add("name");
 		assertThat(buildInfoProperties(task)).doesNotContainKey("build.name");
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/Canonicalizer.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/Canonicalizer.java
@@ -41,7 +41,7 @@ static String canonicalizeAfter(String path, int pos) {
 
 	static String canonicalize(String path) {
 		path = removeEmbeddedSlashDotDotSlash(path);
-		path = removedEmbdeddedSlashDotSlash(path);
+		path = removeEmbeddedSlashDotSlash(path);
 		path = removeTrailingSlashDotDot(path);
 		path = removeTrailingSlashDot(path);
 		return path;
@@ -57,7 +57,7 @@ private static String removeEmbeddedSlashDotDotSlash(String path) {
 		return path;
 	}
 
-	private static String removedEmbdeddedSlashDotSlash(String path) {
+	private static String removeEmbeddedSlashDotSlash(String path) {
 		int index;
 		while ((index = path.indexOf("/./")) >= 0) {
 			String before = path.substring(0, index);
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/NestedJarFileTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/NestedJarFileTests.java
@@ -242,7 +242,7 @@ void sizeReturnsSize() throws IOException {
 	}
 
 	@Test
-	void sizeWhenClosedThowsException() throws Exception {
+	void sizeWhenClosedThrowsException() throws Exception {
 		try (NestedJarFile jar = new NestedJarFile(this.file)) {
 			jar.close();
 			assertThatIllegalStateException().isThrownBy(() -> jar.size()).withMessage("Zip file closed");
@@ -347,7 +347,7 @@ void closeAllowsFileToBeDeleted() throws Exception {
 	}
 
 	@Test
-	void streamStreamsEnties() throws IOException {
+	void streamStreamsEntries() throws IOException {
 		try (NestedJarFile jar = new NestedJarFile(this.file, "multi-release.jar")) {
 			assertThat(jar.stream().map((entry) -> entry.getName() + ":" + entry.getRealName())).containsExactly(
 					"META-INF/:META-INF/", "META-INF/MANIFEST.MF:META-INF/MANIFEST.MF",
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/SecurityInfoTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/SecurityInfoTests.java
@@ -55,7 +55,7 @@ void getWhenNoSignatureFileReturnsNone() throws Exception {
 	}
 
 	@Test
-	void getWhenHasSignatureFileButNoSecuityMaterialReturnsNone() throws Exception {
+	void getWhenHasSignatureFileButNoSecurityMaterialReturnsNone() throws Exception {
 		File file = new File(this.temp, "test.jar");
 		TestJar.create(file, false, true);
 		try (ZipContent content = ZipContent.open(file.toPath())) {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/launch/JarFileArchiveTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/launch/JarFileArchiveTests.java
@@ -80,7 +80,7 @@ void getManifestReturnsManifest() throws Exception {
 	}
 
 	@Test
-	void getClassPathUrlsWhenNoPredicartesReturnsUrls() throws Exception {
+	void getClassPathUrlsWhenNoPredicatesReturnsUrls() throws Exception {
 		Set<URL> urls = this.archive.getClassPathUrls(Archive.ALL_ENTRIES);
 		URL[] expected = TestJar.expectedEntries()
 			.stream()
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/CanonicalizerTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/CanonicalizerTests.java
@@ -35,12 +35,12 @@ void canonicalizeAfterOnlyChangesAfterPos() {
 	}
 
 	@Test
-	void canonicalizeWhenHasEmbdeddSlashDotDotSlash() {
+	void canonicalizeWhenHasEmbeddedSlashDotDotSlash() {
 		assertThat(Canonicalizer.canonicalize("/foo/../bar/bif/bam/../../baz")).isEqualTo("/bar/baz");
 	}
 
 	@Test
-	void canonicalizeWhenHasEmbdeddSlashDotSlash() {
+	void canonicalizeWhenHasEmbeddedSlashDotSlash() {
 		assertThat(Canonicalizer.canonicalize("/foo/./bar/bif/bam/././baz")).isEqualTo("/foo/bar/bif/bam/baz");
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/JarUrlConnectionTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/JarUrlConnectionTests.java
@@ -255,7 +255,7 @@ void getInputStreamWhenOptimizedWithoutReadAndHasCachedJarWithEntryReturnsEmptyI
 	}
 
 	@Test
-	void getInputStreamWhenNoEntryAndOptimzedThrowsException() throws Exception {
+	void getInputStreamWhenNoEntryAndOptimizedThrowsException() throws Exception {
 		JarUrlConnection setupConnection = JarUrlConnection.open(JarUrl.create(this.file, "nested.jar"));
 		setupConnection.connect();
 		assertThat(JarUrlConnection.jarFiles.getCached(setupConnection.getJarFileURL())).isNotNull();
@@ -266,7 +266,7 @@ void getInputStreamWhenNoEntryAndOptimzedThrowsException() throws Exception {
 	}
 
 	@Test
-	void getInputStreamWhenNoEntryAndNotOptimzedThrowsException() throws Exception {
+	void getInputStreamWhenNoEntryAndNotOptimizedThrowsException() throws Exception {
 		JarUrlConnection connection = JarUrlConnection.open(JarUrl.create(this.file, "nested.jar", "missing.dat"));
 		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(connection::getInputStream)
 			.withMessageContaining("JAR entry missing.dat not found in");
@@ -475,7 +475,7 @@ void connectWhenAddedToCacheReconnects() throws IOException {
 	}
 
 	@Test
-	void openWhenNestedAndInCachedWithoutEntryAndOptimzationsEnabledReturnsNoFoundConnection() throws Exception {
+	void openWhenNestedAndInCachedWithoutEntryAndOptimizationsEnabledReturnsNoFoundConnection() throws Exception {
 		JarUrlConnection setupConnection = JarUrlConnection.open(JarUrl.create(this.file, "nested.jar"));
 		setupConnection.connect();
 		assertThat(JarUrlConnection.jarFiles.getCached(setupConnection.getJarFileURL())).isNotNull();
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/UrlJarManifestTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/UrlJarManifestTests.java
@@ -58,7 +58,7 @@ void getAlwaysReturnsDeepCopy() throws Exception {
 	}
 
 	@Test
-	void getEntrtyAttributesWhenSuppliedManifestIsNullReturnsNull() throws Exception {
+	void getEntryAttributesWhenSuppliedManifestIsNullReturnsNull() throws Exception {
 		UrlJarManifest urlJarManifest = new UrlJarManifest(() -> null);
 		assertThat(urlJarManifest.getEntryAttributes(new JarEntry("test"))).isNull();
 	}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/nested/NestedLocationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/nested/NestedLocationTests.java
@@ -82,7 +82,7 @@ void fromUrlWhenNoPathThrowsException() {
 	}
 
 	@Test
-	void fromUrlWhenNoSeparatorThrowsExceptiuon() {
+	void fromUrlWhenNoSeparatorThrowsException() {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> NestedLocation.fromUrl(new URL("nested:test.jar!nested.jar")))
 			.withMessageContaining("'path' must contain '/!'");
@@ -110,7 +110,7 @@ void fromUriWhenNotNestedProtocolThrowsException() {
 	}
 
 	@Test
-	void fromUriWhenNoSeparatorThrowsExceptiuon() {
+	void fromUriWhenNoSeparatorThrowsException() {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> NestedLocation.fromUri(new URI("nested:test.jar!nested.jar")))
 			.withMessageContaining("'path' must contain '/!'");
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/nio/file/NestedByteChannelTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/nio/file/NestedByteChannelTests.java
@@ -65,7 +65,7 @@ void setup() throws Exception {
 	}
 
 	@AfterEach
-	void cleanuo() throws Exception {
+	void cleanup() throws Exception {
 		this.channel.close();
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/nio/file/NestedPathTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/nio/file/NestedPathTests.java
@@ -78,7 +78,7 @@ void getFileSystemReturnsFileSystem() {
 	}
 
 	@Test
-	void isAbsoluteRerturnsTrue() {
+	void isAbsoluteReturnsTrue() {
 		assertThat(this.path.isAbsolute()).isTrue();
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/DataBlockInputStreamTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/DataBlockInputStreamTests.java
@@ -96,7 +96,7 @@ void skipBackwardsSkipsBytes() throws IOException {
 	}
 
 	@Test
-	void skipBackwardsPastBeginingSkipsBytes() throws Exception {
+	void skipBackwardsPastBeginningSkipsBytes() throws Exception {
 		assertThat(this.inputStream.skip(1)).isEqualTo(1);
 		assertThat(this.inputStream.skip(-100)).isEqualTo(-1);
 		assertThat(this.inputStream.read()).isEqualTo(0);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
@@ -220,7 +220,7 @@ void runWhenHasActiveProfilesFromMultipleLocationsActivatesProfileFromOneLocatio
 	}
 
 	@Test
-	void runWhenHasActiveProfilesFromMultipleAdditionaLocationsWithOneSwitchedOffLoadsExpectedProperties() {
+	void runWhenHasActiveProfilesFromMultipleAdditionalLocationsWithOneSwitchedOffLoadsExpectedProperties() {
 		ConfigurableApplicationContext context = this.application.run(
 				"--spring.config.additional-location=classpath:enabletwoprofiles.properties,classpath:enableprofile.properties");
 		ConfigurableEnvironment environment = context.getEnvironment();
@@ -230,7 +230,7 @@ void runWhenHasActiveProfilesFromMultipleAdditionaLocationsWithOneSwitchedOffLoa
 	}
 
 	@Test
-	void runWhenHaslocalFileLoadsWithLocalFileTakingPrecedenceOverClasspath() throws Exception {
+	void runWhenHasLocalFileLoadsWithLocalFileTakingPrecedenceOverClasspath() throws Exception {
 		File localFile = new File(new File("."), "application.properties");
 		assertThat(localFile).doesNotExist();
 		try {
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableRuntimeHintsRegistrarTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableRuntimeHintsRegistrarTests.java
@@ -214,7 +214,7 @@ void registerHintsWhenHasCrossReference() {
 	}
 
 	@Test
-	void pregisterHintsWhenHasUnresolvedGeneric() {
+	void registerHintsWhenHasUnresolvedGeneric() {
 		RuntimeHints runtimeHints = registerHints(WithGeneric.class);
 		assertThat(runtimeHints.reflection().typeHints()).hasSize(2)
 			.anySatisfy(javaBeanBinding(WithGeneric.class, "getGeneric"))
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationAotContributionTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationAotContributionTests.java
@@ -185,7 +185,7 @@ void typeFromParentsDefaultClassAnnotatedSetterIsRegisteredForReflection() {
 	@Test
 	void componentTypesOfArraysAreRegisteredForReflection() {
 		ComponentModel component = new ComponentModel();
-		component.setClassName(ArrayParmeters.class.getName());
+		component.setClassName(ArrayParameters.class.getName());
 		TestGenerationContext generationContext = applyContribution(component);
 		assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(InetSocketAddress.class))
 			.accepts(generationContext.getRuntimeHints());
@@ -287,7 +287,7 @@ public interface Contract {
 
 	}
 
-	public static class ArrayParmeters {
+	public static class ArrayParameters {
 
 		public void addDestinations(InetSocketAddress... addresses) {
 

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ void customNameIsReflectedInProperties() {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`@Test`
`103`		`- void nameCanBeExludedRemovedFromProperties() {`
	`103`	`+ void nameCanBeExcludedFromProperties() {`
`104`	`104`	`BuildInfo task = createTask(createProject("test"));`
`105`	`105`	`task.getExcludes().add("name");`
`106`	`106`	`assertThat(buildInfoProperties(task)).doesNotContainKey("build.name");`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ void getWhenNoSignatureFileReturnsNone() throws Exception {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Test`
`58`		`- void getWhenHasSignatureFileButNoSecuityMaterialReturnsNone() throws Exception {`
	`58`	`+ void getWhenHasSignatureFileButNoSecurityMaterialReturnsNone() throws Exception {`
`59`	`59`	`File file = new File(this.temp, "test.jar");`
`60`	`60`	`TestJar.create(file, false, true);`
`61`	`61`	`try (ZipContent content = ZipContent.open(file.toPath())) {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ void getManifestReturnsManifest() throws Exception {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Test`
`83`		`- void getClassPathUrlsWhenNoPredicartesReturnsUrls() throws Exception {`
	`83`	`+ void getClassPathUrlsWhenNoPredicatesReturnsUrls() throws Exception {`
`84`	`84`	`Set<URL> urls = this.archive.getClassPathUrls(Archive.ALL_ENTRIES);`
`85`	`85`	`URL[] expected = TestJar.expectedEntries()`
`86`	`86`	`.stream()`
Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@ void canonicalizeAfterOnlyChangesAfterPos() {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Test`
`38`		`- void canonicalizeWhenHasEmbdeddSlashDotDotSlash() {`
	`38`	`+ void canonicalizeWhenHasEmbeddedSlashDotDotSlash() {`
`39`	`39`	`assertThat(Canonicalizer.canonicalize("/foo/../bar/bif/bam/../../baz")).isEqualTo("/bar/baz");`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Test`
`43`		`- void canonicalizeWhenHasEmbdeddSlashDotSlash() {`
	`43`	`+ void canonicalizeWhenHasEmbeddedSlashDotSlash() {`
`44`	`44`	`assertThat(Canonicalizer.canonicalize("/foo/./bar/bif/bam/././baz")).isEqualTo("/foo/bar/bif/bam/baz");`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ void getAlwaysReturnsDeepCopy() throws Exception {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Test`
`61`		`- void getEntrtyAttributesWhenSuppliedManifestIsNullReturnsNull() throws Exception {`
	`61`	`+ void getEntryAttributesWhenSuppliedManifestIsNullReturnsNull() throws Exception {`
`62`	`62`	`UrlJarManifest urlJarManifest = new UrlJarManifest(() -> null);`
`63`	`63`	`assertThat(urlJarManifest.getEntryAttributes(new JarEntry("test"))).isNull();`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ void setup() throws Exception {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@AfterEach`
`68`		`- void cleanuo() throws Exception {`
	`68`	`+ void cleanup() throws Exception {`
`69`	`69`	`this.channel.close();`
`70`	`70`	`}`
`71`	`71`