Use method references when possible

See gh-40974
This commit is contained in:
Ahmed Ashour 2024-06-11 12:52:07 -07:00 committed by Phillip Webb
parent ef99ce0ba9
commit 507229eef8
7 changed files with 15 additions and 11 deletions

View File

@ -35,12 +35,12 @@ public enum UpgradePolicy implements BiPredicate<DependencyVersion, DependencyVe
/** /**
* Minor versions of the current major version. * Minor versions of the current major version.
*/ */
SAME_MAJOR_VERSION((candidate, current) -> candidate.isSameMajor(current)), SAME_MAJOR_VERSION(DependencyVersion::isSameMajor),
/** /**
* Patch versions of the current minor version. * Patch versions of the current minor version.
*/ */
SAME_MINOR_VERSION((candidate, current) -> candidate.isSameMinor(current)); SAME_MINOR_VERSION(DependencyVersion::isSameMinor);
private final BiPredicate<DependencyVersion, DependencyVersion> delegate; private final BiPredicate<DependencyVersion, DependencyVersion> delegate;

View File

@ -46,6 +46,7 @@ import org.quartz.Trigger;
import org.quartz.Trigger.TriggerState; import org.quartz.Trigger.TriggerState;
import org.quartz.TriggerKey; import org.quartz.TriggerKey;
import org.quartz.impl.matchers.GroupMatcher; import org.quartz.impl.matchers.GroupMatcher;
import org.quartz.utils.Key;
import org.springframework.boot.actuate.endpoint.OperationResponseBody; import org.springframework.boot.actuate.endpoint.OperationResponseBody;
import org.springframework.boot.actuate.endpoint.SanitizableData; import org.springframework.boot.actuate.endpoint.SanitizableData;
@ -100,7 +101,7 @@ public class QuartzEndpoint {
for (String groupName : this.scheduler.getJobGroupNames()) { for (String groupName : this.scheduler.getJobGroupNames()) {
List<String> jobs = this.scheduler.getJobKeys(GroupMatcher.jobGroupEquals(groupName)) List<String> jobs = this.scheduler.getJobKeys(GroupMatcher.jobGroupEquals(groupName))
.stream() .stream()
.map((key) -> key.getName()) .map(Key::getName)
.toList(); .toList();
result.put(groupName, Collections.singletonMap("jobs", jobs)); result.put(groupName, Collections.singletonMap("jobs", jobs));
} }
@ -121,7 +122,7 @@ public class QuartzEndpoint {
groupDetails.put("triggers", groupDetails.put("triggers",
this.scheduler.getTriggerKeys(GroupMatcher.triggerGroupEquals(groupName)) this.scheduler.getTriggerKeys(GroupMatcher.triggerGroupEquals(groupName))
.stream() .stream()
.map((key) -> key.getName()) .map(Key::getName)
.toList()); .toList());
result.put(groupName, groupDetails); result.put(groupName, groupDetails);
} }

View File

@ -148,9 +148,9 @@ public class HibernateProperties {
private void applyNamingStrategies(Map<String, Object> properties) { private void applyNamingStrategies(Map<String, Object> properties) {
applyNamingStrategy(properties, AvailableSettings.IMPLICIT_NAMING_STRATEGY, this.implicitStrategy, applyNamingStrategy(properties, AvailableSettings.IMPLICIT_NAMING_STRATEGY, this.implicitStrategy,
() -> SpringImplicitNamingStrategy.class.getName()); SpringImplicitNamingStrategy.class::getName);
applyNamingStrategy(properties, AvailableSettings.PHYSICAL_NAMING_STRATEGY, this.physicalStrategy, applyNamingStrategy(properties, AvailableSettings.PHYSICAL_NAMING_STRATEGY, this.physicalStrategy,
() -> CamelCaseToUnderscoresNamingStrategy.class.getName()); CamelCaseToUnderscoresNamingStrategy.class::getName);
} }
private void applyNamingStrategy(Map<String, Object> properties, String key, Object strategy, private void applyNamingStrategy(Map<String, Object> properties, String key, Object strategy,

View File

@ -23,6 +23,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.security.config.annotation.web.builders.HttpSecurity; 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.SecurityFilterChain;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
@ -49,7 +50,7 @@ class RemoteDevtoolsSecurityConfiguration {
SecurityFilterChain devtoolsSecurityFilterChain(HttpSecurity http) throws Exception { SecurityFilterChain devtoolsSecurityFilterChain(HttpSecurity http) throws Exception {
http.securityMatcher(new AntPathRequestMatcher(this.url)); http.securityMatcher(new AntPathRequestMatcher(this.url));
http.authorizeHttpRequests((requests) -> requests.anyRequest().anonymous()); http.authorizeHttpRequests((requests) -> requests.anyRequest().anonymous());
http.csrf((csrf) -> csrf.disable()); http.csrf(CsrfConfigurer::disable);
return http.build(); return http.build();
} }

View File

@ -24,6 +24,8 @@ import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.security.config.Customizer; import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity; 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; import org.springframework.security.web.SecurityFilterChain;
@Profile("dev") @Profile("dev")
@ -35,8 +37,8 @@ public class DevProfileSecurityConfiguration {
SecurityFilterChain h2ConsoleSecurityFilterChain(HttpSecurity http) throws Exception { SecurityFilterChain h2ConsoleSecurityFilterChain(HttpSecurity http) throws Exception {
http.securityMatcher(PathRequest.toH2Console()); http.securityMatcher(PathRequest.toH2Console());
http.authorizeHttpRequests(yourCustomAuthorization()); http.authorizeHttpRequests(yourCustomAuthorization());
http.csrf((csrf) -> csrf.disable()); http.csrf(CsrfConfigurer::disable);
http.headers((headers) -> headers.frameOptions((frame) -> frame.sameOrigin())); http.headers((headers) -> headers.frameOptions(FrameOptionsConfig::sameOrigin));
return http.build(); return http.build();
} }

View File

@ -93,7 +93,7 @@ public class SpringBootExtension {
tasks.named(JavaPlugin.CLASSES_TASK_NAME).configure((task) -> task.dependsOn(bootBuildInfo)); tasks.named(JavaPlugin.CLASSES_TASK_NAME).configure((task) -> task.dependsOn(bootBuildInfo));
bootBuildInfo.configure((buildInfo) -> buildInfo.getProperties() bootBuildInfo.configure((buildInfo) -> buildInfo.getProperties()
.getArtifact() .getArtifact()
.convention(this.project.provider(() -> determineArtifactBaseName()))); .convention(this.project.provider(this::determineArtifactBaseName)));
}); });
if (configurer != null) { if (configurer != null) {
bootBuildInfo.configure(configurer); bootBuildInfo.configure(configurer);

View File

@ -152,7 +152,7 @@ public class SpringBootAotPlugin implements Plugin<Project> {
task.getClassesOutput() task.getClassesOutput()
.set(project.getLayout().getBuildDirectory().dir("generated/" + sourceSet.getName() + "Classes")); .set(project.getLayout().getBuildDirectory().dir("generated/" + sourceSet.getName() + "Classes"));
task.getGroupId().set(project.provider(() -> String.valueOf(project.getGroup()))); 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); configureToolchainConvention(project, task);
} }