From c9bf87be7da7b47e29d3bcd72b884ada7a505f41 Mon Sep 17 00:00:00 2001
From: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
Date: Fri, 23 May 2025 01:17:06 +0700
Subject: [PATCH] Make all @ConfigurationPropertiesBinding @Bean methods static

See gh-45640

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
---
 .../autoconfigure/flyway/FlywayAutoConfiguration.java  |  2 +-
 .../servlet/SecurityAutoConfigurationTests.java        |  2 +-
 .../properties/ConfigurationPropertiesTests.java       | 10 +++++-----
 .../properties/ConversionServiceDeducerTests.java      |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
index bf20e885d9..90776bd26b 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
@@ -112,7 +112,7 @@ public class FlywayAutoConfiguration {
 
 	@Bean
 	@ConfigurationPropertiesBinding
-	public StringOrNumberToMigrationVersionConverter stringOrNumberMigrationVersionConverter() {
+	public static StringOrNumberToMigrationVersionConverter stringOrNumberMigrationVersionConverter() {
 		return new StringOrNumberToMigrationVersionConverter();
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java
index 43aea7e4a1..79ae9792c9 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java
@@ -264,7 +264,7 @@ class SecurityAutoConfigurationTests {
 
 		@Bean
 		@ConfigurationPropertiesBinding
-		Converter<String, TargetType> targetTypeConverter() {
+		static Converter<String, TargetType> targetTypeConverter() {
 			return new Converter<>() {
 
 				@Override
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
index f666137e21..9ff182223f 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
@@ -1560,7 +1560,7 @@ class ConfigurationPropertiesTests {
 
 		@Bean
 		@ConfigurationPropertiesBinding
-		Converter<String, Person> personConverter() {
+		static Converter<String, Person> personConverter() {
 			return new PersonConverter();
 		}
 
@@ -1571,7 +1571,7 @@ class ConfigurationPropertiesTests {
 
 		@Bean
 		@ConfigurationPropertiesBinding
-		Converter<String, Alien> alienConverter() {
+		static Converter<String, Alien> alienConverter() {
 			return new AlienConverter();
 		}
 
@@ -1592,7 +1592,7 @@ class ConfigurationPropertiesTests {
 
 		@Bean
 		@ConfigurationPropertiesBinding
-		GenericConverter genericPersonConverter() {
+		static GenericConverter genericPersonConverter() {
 			return new GenericPersonConverter();
 		}
 
@@ -1603,7 +1603,7 @@ class ConfigurationPropertiesTests {
 
 		@Bean
 		@ConfigurationPropertiesBinding
-		Formatter<Person> personFormatter() {
+		static Formatter<Person> personFormatter() {
 			return new PersonFormatter();
 		}
 
@@ -3031,7 +3031,7 @@ class ConfigurationPropertiesTests {
 
 		@Bean
 		@ConfigurationPropertiesBinding
-		WithObjectToObjectMethodConverter withObjectToObjectMethodConverter() {
+		static WithObjectToObjectMethodConverter withObjectToObjectMethodConverter() {
 			return new WithObjectToObjectMethodConverter();
 		}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConversionServiceDeducerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConversionServiceDeducerTests.java
index 0027cb1d7c..e861a8011d 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConversionServiceDeducerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConversionServiceDeducerTests.java
@@ -102,13 +102,13 @@ class ConversionServiceDeducerTests {
 
 		@Bean
 		@ConfigurationPropertiesBinding
-		TestConverter testConverter() {
+		static TestConverter testConverter() {
 			return new TestConverter();
 		}
 
 		@Bean
 		@ConfigurationPropertiesBinding
-		StringConverter stringConverter() {
+		static StringConverter stringConverter() {
 			return new StringConverter();
 		}