Skip to content

Commit 507229e

Browse files
asashourphilwebb
authored andcommittedJun 11, 2024
Use method references when possible
See gh-40974
1 parent ef99ce0 commit 507229e

File tree

7 files changed

+15
-11
lines changed

7 files changed

+15
-11
lines changed
 

‎buildSrc/src/main/java/org/springframework/boot/build/bom/UpgradePolicy.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ public enum UpgradePolicy implements BiPredicate<DependencyVersion, DependencyVe
3535
/**
3636
* Minor versions of the current major version.
3737
*/
38-
SAME_MAJOR_VERSION((candidate, current) -> candidate.isSameMajor(current)),
38+
SAME_MAJOR_VERSION(DependencyVersion::isSameMajor),
3939

4040
/**
4141
* Patch versions of the current minor version.
4242
*/
43-
SAME_MINOR_VERSION((candidate, current) -> candidate.isSameMinor(current));
43+
SAME_MINOR_VERSION(DependencyVersion::isSameMinor);
4444

4545
private final BiPredicate<DependencyVersion, DependencyVersion> delegate;
4646

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/quartz/QuartzEndpoint.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import org.quartz.Trigger.TriggerState;
4747
import org.quartz.TriggerKey;
4848
import org.quartz.impl.matchers.GroupMatcher;
49+
import org.quartz.utils.Key;
4950

5051
import org.springframework.boot.actuate.endpoint.OperationResponseBody;
5152
import org.springframework.boot.actuate.endpoint.SanitizableData;
@@ -100,7 +101,7 @@ public QuartzGroupsDescriptor quartzJobGroups() throws SchedulerException {
100101
for (String groupName : this.scheduler.getJobGroupNames()) {
101102
List<String> jobs = this.scheduler.getJobKeys(GroupMatcher.jobGroupEquals(groupName))
102103
.stream()
103-
.map((key) -> key.getName())
104+
.map(Key::getName)
104105
.toList();
105106
result.put(groupName, Collections.singletonMap("jobs", jobs));
106107
}
@@ -121,7 +122,7 @@ public QuartzGroupsDescriptor quartzTriggerGroups() throws SchedulerException {
121122
groupDetails.put("triggers",
122123
this.scheduler.getTriggerKeys(GroupMatcher.triggerGroupEquals(groupName))
123124
.stream()
124-
.map((key) -> key.getName())
125+
.map(Key::getName)
125126
.toList());
126127
result.put(groupName, groupDetails);
127128
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ public void setPhysicalStrategy(String physicalStrategy) {
148148

149149
private void applyNamingStrategies(Map<String, Object> properties) {
150150
applyNamingStrategy(properties, AvailableSettings.IMPLICIT_NAMING_STRATEGY, this.implicitStrategy,
151-
() -> SpringImplicitNamingStrategy.class.getName());
151+
SpringImplicitNamingStrategy.class::getName);
152152
applyNamingStrategy(properties, AvailableSettings.PHYSICAL_NAMING_STRATEGY, this.physicalStrategy,
153-
() -> CamelCaseToUnderscoresNamingStrategy.class.getName());
153+
CamelCaseToUnderscoresNamingStrategy.class::getName);
154154
}
155155

156156
private void applyNamingStrategy(Map<String, Object> properties, String key, Object strategy,

‎spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.springframework.context.annotation.Configuration;
2424
import org.springframework.core.annotation.Order;
2525
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
26+
import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer;
2627
import org.springframework.security.web.SecurityFilterChain;
2728
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
2829

@@ -49,7 +50,7 @@ class RemoteDevtoolsSecurityConfiguration {
4950
SecurityFilterChain devtoolsSecurityFilterChain(HttpSecurity http) throws Exception {
5051
http.securityMatcher(new AntPathRequestMatcher(this.url));
5152
http.authorizeHttpRequests((requests) -> requests.anyRequest().anonymous());
52-
http.csrf((csrf) -> csrf.disable());
53+
http.csrf(CsrfConfigurer::disable);
5354
return http.build();
5455
}
5556

‎spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/data/sql/h2webconsole/springsecurity/DevProfileSecurityConfiguration.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import org.springframework.core.annotation.Order;
2525
import org.springframework.security.config.Customizer;
2626
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
27+
import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer;
28+
import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer.FrameOptionsConfig;
2729
import org.springframework.security.web.SecurityFilterChain;
2830

2931
@Profile("dev")
@@ -35,8 +37,8 @@ public class DevProfileSecurityConfiguration {
3537
SecurityFilterChain h2ConsoleSecurityFilterChain(HttpSecurity http) throws Exception {
3638
http.securityMatcher(PathRequest.toH2Console());
3739
http.authorizeHttpRequests(yourCustomAuthorization());
38-
http.csrf((csrf) -> csrf.disable());
39-
http.headers((headers) -> headers.frameOptions((frame) -> frame.sameOrigin()));
40+
http.csrf(CsrfConfigurer::disable);
41+
http.headers((headers) -> headers.frameOptions(FrameOptionsConfig::sameOrigin));
4042
return http.build();
4143
}
4244

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void buildInfo(Action<BuildInfo> configurer) {
9393
tasks.named(JavaPlugin.CLASSES_TASK_NAME).configure((task) -> task.dependsOn(bootBuildInfo));
9494
bootBuildInfo.configure((buildInfo) -> buildInfo.getProperties()
9595
.getArtifact()
96-
.convention(this.project.provider(() -> determineArtifactBaseName())));
96+
.convention(this.project.provider(this::determineArtifactBaseName)));
9797
});
9898
if (configurer != null) {
9999
bootBuildInfo.configure(configurer);

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootAotPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ private void configureAotTask(Project project, SourceSet sourceSet, AbstractAot
152152
task.getClassesOutput()
153153
.set(project.getLayout().getBuildDirectory().dir("generated/" + sourceSet.getName() + "Classes"));
154154
task.getGroupId().set(project.provider(() -> String.valueOf(project.getGroup())));
155-
task.getArtifactId().set(project.provider(() -> project.getName()));
155+
task.getArtifactId().set(project.provider(project::getName));
156156
configureToolchainConvention(project, task);
157157
}
158158

0 commit comments

Comments
 (0)
Please sign in to comment.