diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/UpgradePolicy.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/UpgradePolicy.java index e9d72393965..f6967d5b34f 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/UpgradePolicy.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/UpgradePolicy.java @@ -35,12 +35,12 @@ public enum UpgradePolicy implements BiPredicate candidate.isSameMajor(current)), + SAME_MAJOR_VERSION(DependencyVersion::isSameMajor), /** * Patch versions of the current minor version. */ - SAME_MINOR_VERSION((candidate, current) -> candidate.isSameMinor(current)); + SAME_MINOR_VERSION(DependencyVersion::isSameMinor); private final BiPredicate delegate; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/quartz/QuartzEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/quartz/QuartzEndpoint.java index 0e0b64cd325..3ea26d7d8c5 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/quartz/QuartzEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/quartz/QuartzEndpoint.java @@ -46,6 +46,7 @@ import org.quartz.Trigger; import org.quartz.Trigger.TriggerState; import org.quartz.TriggerKey; import org.quartz.impl.matchers.GroupMatcher; +import org.quartz.utils.Key; import org.springframework.boot.actuate.endpoint.OperationResponseBody; import org.springframework.boot.actuate.endpoint.SanitizableData; @@ -100,7 +101,7 @@ public class QuartzEndpoint { for (String groupName : this.scheduler.getJobGroupNames()) { List jobs = this.scheduler.getJobKeys(GroupMatcher.jobGroupEquals(groupName)) .stream() - .map((key) -> key.getName()) + .map(Key::getName) .toList(); result.put(groupName, Collections.singletonMap("jobs", jobs)); } @@ -121,7 +122,7 @@ public class QuartzEndpoint { groupDetails.put("triggers", this.scheduler.getTriggerKeys(GroupMatcher.triggerGroupEquals(groupName)) .stream() - .map((key) -> key.getName()) + .map(Key::getName) .toList()); result.put(groupName, groupDetails); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java index d155a00c2b0..7f1e26af812 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java @@ -148,9 +148,9 @@ public class HibernateProperties { private void applyNamingStrategies(Map properties) { applyNamingStrategy(properties, AvailableSettings.IMPLICIT_NAMING_STRATEGY, this.implicitStrategy, - () -> SpringImplicitNamingStrategy.class.getName()); + SpringImplicitNamingStrategy.class::getName); applyNamingStrategy(properties, AvailableSettings.PHYSICAL_NAMING_STRATEGY, this.physicalStrategy, - () -> CamelCaseToUnderscoresNamingStrategy.class.getName()); + CamelCaseToUnderscoresNamingStrategy.class::getName); } private void applyNamingStrategy(Map properties, String key, Object strategy, diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java index eba98a6b028..fd0c6375296 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java @@ -23,6 +23,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; @@ -49,7 +50,7 @@ class RemoteDevtoolsSecurityConfiguration { SecurityFilterChain devtoolsSecurityFilterChain(HttpSecurity http) throws Exception { http.securityMatcher(new AntPathRequestMatcher(this.url)); http.authorizeHttpRequests((requests) -> requests.anyRequest().anonymous()); - http.csrf((csrf) -> csrf.disable()); + http.csrf(CsrfConfigurer::disable); return http.build(); } diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/data/sql/h2webconsole/springsecurity/DevProfileSecurityConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/data/sql/h2webconsole/springsecurity/DevProfileSecurityConfiguration.java index 22cef68bd47..34fcb68ea05 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/data/sql/h2webconsole/springsecurity/DevProfileSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/data/sql/h2webconsole/springsecurity/DevProfileSecurityConfiguration.java @@ -24,6 +24,8 @@ import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer; +import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer.FrameOptionsConfig; import org.springframework.security.web.SecurityFilterChain; @Profile("dev") @@ -35,8 +37,8 @@ public class DevProfileSecurityConfiguration { SecurityFilterChain h2ConsoleSecurityFilterChain(HttpSecurity http) throws Exception { http.securityMatcher(PathRequest.toH2Console()); http.authorizeHttpRequests(yourCustomAuthorization()); - http.csrf((csrf) -> csrf.disable()); - http.headers((headers) -> headers.frameOptions((frame) -> frame.sameOrigin())); + http.csrf(CsrfConfigurer::disable); + http.headers((headers) -> headers.frameOptions(FrameOptionsConfig::sameOrigin)); return http.build(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java index 3aded1cb5ac..d082ee8ad13 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java @@ -93,7 +93,7 @@ public class SpringBootExtension { tasks.named(JavaPlugin.CLASSES_TASK_NAME).configure((task) -> task.dependsOn(bootBuildInfo)); bootBuildInfo.configure((buildInfo) -> buildInfo.getProperties() .getArtifact() - .convention(this.project.provider(() -> determineArtifactBaseName()))); + .convention(this.project.provider(this::determineArtifactBaseName))); }); if (configurer != null) { bootBuildInfo.configure(configurer); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootAotPlugin.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootAotPlugin.java index 6c9af4b8530..600808d1725 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootAotPlugin.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootAotPlugin.java @@ -152,7 +152,7 @@ public class SpringBootAotPlugin implements Plugin { task.getClassesOutput() .set(project.getLayout().getBuildDirectory().dir("generated/" + sourceSet.getName() + "Classes")); task.getGroupId().set(project.provider(() -> String.valueOf(project.getGroup()))); - task.getArtifactId().set(project.provider(() -> project.getName())); + task.getArtifactId().set(project.provider(project::getName)); configureToolchainConvention(project, task); }