root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x 

Closes gh-38166
This commit is contained in:
Andy Wilkinson 2023-11-01 15:00:36 +00:00
parent 8f4ea6834d 48ef78bddd
commit b7f00c1087
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoTests.java
View File

@ -100,7 +100,7 @@ class BuildInfoTests {
}
@Test
void nameCanBeExludedRemovedFromProperties() {
void nameCanBeExcludedFromProperties() {
BuildInfo task = createTask(createProject("test"));
task.getExcludes().add("name");
assertThat(buildInfoProperties(task)).doesNotContainKey("build.name");

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
View File

@ -220,7 +220,7 @@ class ConfigDataEnvironmentPostProcessorIntegrationTests {
}
@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 @@ class ConfigDataEnvironmentPostProcessorIntegrationTests {
}
@Test
void runWhenHaslocalFileLoadsWithLocalFileTakingPrecedenceOverClasspath() throws Exception {
void runWhenHasLocalFileLoadsWithLocalFileTakingPrecedenceOverClasspath() throws Exception {
File localFile = new File(new File("."), "application.properties");
assertThat(localFile).doesNotExist();
try {

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableRuntimeHintsRegistrarTests.java
View File

@ -214,7 +214,7 @@ class BindableRuntimeHintsRegistrarTests {
}
@Test
void pregisterHintsWhenHasUnresolvedGeneric() {
void registerHintsWhenHasUnresolvedGeneric() {
RuntimeHints runtimeHints = registerHints(WithGeneric.class);
assertThat(runtimeHints.reflection().typeHints()).hasSize(2)
.anySatisfy(javaBeanBinding(WithGeneric.class, "getGeneric"))

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationAotContributionTests.java
View File

@ -185,7 +185,7 @@ class LogbackConfigurationAotContributionTests {
@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 @@ class LogbackConfigurationAotContributionTests {
}
public static class ArrayParmeters {
public static class ArrayParameters {
public void addDestinations(InetSocketAddress... addresses) {