diff --git a/pom.xml b/pom.xml index 65fd404a50..ec8b26764d 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ main.basedir=${main.basedir} ${basedir} **/* - .git/**/*,target/**/,**/.flattened-pom.xml + .git/**/*,target/**/,**/.flattened-pom.xml,**/*.class,**/spring-boot-gradle-plugin/build/** check diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointTests.java index a2e40ee1a1..11fedd9ed0 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointTests.java @@ -63,7 +63,7 @@ class ConditionsReportEndpointTests { private final ConfigurableApplicationContext context; - public Config(ConfigurableApplicationContext context) { + Config(ConfigurableApplicationContext context) { this.context = context; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointSerializationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointSerializationTests.java index b6d365f9c2..fcedb9c411 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointSerializationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointSerializationTests.java @@ -392,7 +392,7 @@ class ConfigurationPropertiesReportEndpointSerializationTests { private Foo self; - public SelfReferential() { + SelfReferential() { this.self = this; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java index 31c2ffeb43..ed3bbfd6cf 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java @@ -266,7 +266,7 @@ class ConfigurationPropertiesReportEndpointTests { private Duration duration = Duration.ofSeconds(10); - public TestProperties() { + TestProperties() { this.secrets.put("mine", "myPrivateThing"); this.secrets.put("yours", "yourPrivateThing"); this.listItems.add(new ListItem()); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointIntegrationTests.java index 685145a68c..4108fb6550 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointIntegrationTests.java @@ -57,7 +57,7 @@ import static org.assertj.core.api.Assertions.assertThat; class WebFluxEndpointIntegrationTests extends AbstractWebEndpointIntegrationTests { - public WebFluxEndpointIntegrationTests() { + WebFluxEndpointIntegrationTests() { super(WebFluxEndpointIntegrationTests::createApplicationContext, WebFluxEndpointIntegrationTests::applyAuthenticatedConfiguration); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java index cbf49e6996..6dfdd85732 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java @@ -67,7 +67,7 @@ import static org.assertj.core.api.Assertions.assertThat; class MvcWebEndpointIntegrationTests extends AbstractWebEndpointIntegrationTests { - public MvcWebEndpointIntegrationTests() { + MvcWebEndpointIntegrationTests() { super(MvcWebEndpointIntegrationTests::createApplicationContext, MvcWebEndpointIntegrationTests::applyAuthenticatedConfiguration); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mail/MailHealthIndicatorTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mail/MailHealthIndicatorTests.java index 0915077162..004174957f 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mail/MailHealthIndicatorTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mail/MailHealthIndicatorTests.java @@ -83,7 +83,7 @@ class MailHealthIndicatorTests { public static class SuccessTransport extends Transport { - public SuccessTransport(Session session, URLName urlName) { + SuccessTransport(Session session, URLName urlName) { super(session, urlName); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java index acde1ec70c..7ddd3db686 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java @@ -477,7 +477,7 @@ class ConditionalOnBeanTests { private String value; - public ExampleBean(String value) { + ExampleBean(String value) { this.value = value; } @@ -490,7 +490,7 @@ class ConditionalOnBeanTests { public static class CustomExampleBean extends ExampleBean { - public CustomExampleBean() { + CustomExampleBean() { super("custom subclass"); } @@ -498,7 +498,7 @@ class ConditionalOnBeanTests { public static class OtherExampleBean extends ExampleBean { - public OtherExampleBean() { + OtherExampleBean() { super("other subclass"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java index bc400c8a04..da460435f6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java @@ -400,7 +400,7 @@ class JacksonAutoConfigurationTests { public static class MyDateFormat extends SimpleDateFormat { - public MyDateFormat() { + MyDateFormat() { super("yyyy-MM-dd HH:mm:ss"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java index 38ba5be574..e5ed2a0a89 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java @@ -77,7 +77,7 @@ class JerseyAutoConfigurationCustomFilterContextPathTests { return "Hello " + this.msg; } - public Application() { + Application() { register(Application.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java index 264447c0ba..3e5a624154 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java @@ -76,7 +76,7 @@ class JerseyAutoConfigurationCustomFilterPathTests { return "Hello " + this.msg; } - public Application() { + Application() { register(Application.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java index 045f4bb518..1d8fdb3b06 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java @@ -57,7 +57,7 @@ class JerseyAutoConfigurationCustomLoadOnStartupTests { @MinimalWebConfiguration public static class Application extends ResourceConfig { - public Application() { + Application() { register(Application.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java index e1e23f002e..ff353d6655 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java @@ -75,7 +75,7 @@ class JerseyAutoConfigurationCustomObjectMapperProviderTests { return new Message("Jersey", null); } - public Application() { + Application() { register(Application.class); } @@ -91,7 +91,7 @@ class JerseyAutoConfigurationCustomObjectMapperProviderTests { private String body; - public Message(String subject, String body) { + Message(String subject, String body) { this.subject = subject; this.body = body; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java index d7969492ba..6aebc92d44 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java @@ -76,7 +76,7 @@ class JerseyAutoConfigurationCustomServletContextPathTests { return "Hello " + this.msg; } - public Application() { + Application() { register(Application.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java index d44065628a..cd46ade247 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java @@ -76,7 +76,7 @@ class JerseyAutoConfigurationCustomServletPathTests { return "Hello " + this.msg; } - public Application() { + Application() { register(Application.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java index 4d00211166..cb18b55a73 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java @@ -74,7 +74,7 @@ class JerseyAutoConfigurationDefaultFilterPathTests { return "Hello " + this.msg; } - public Application() { + Application() { register(Application.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java index 665f768db6..f7e0d41e84 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java @@ -69,7 +69,7 @@ class JerseyAutoConfigurationDefaultServletPathTests { @Value("${message:World}") private String msg; - public Application() { + Application() { register(Application.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java index dc3d1ae2ec..0b1861167c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java @@ -77,7 +77,7 @@ class JerseyAutoConfigurationObjectMapperProviderTests { return new Message("Jersey", null); } - public Application() { + Application() { register(Application.class); } @@ -93,11 +93,10 @@ class JerseyAutoConfigurationObjectMapperProviderTests { private String body; - public Message() { - + Message() { } - public Message(String subject, String body) { + Message(String subject, String body) { this.subject = subject; this.body = body; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java index 825f31b53e..2d73e2a931 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java @@ -74,7 +74,7 @@ class JerseyAutoConfigurationWithoutApplicationPathTests { return "Hello " + this.msg; } - public Application() { + Application() { register(Application.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java index 0915e48a08..e14d4a59fe 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java @@ -373,7 +373,7 @@ abstract class AbstractJpaAutoConfigurationTests { private final DataSource dataSource; - public TestConfigurationWithCustomPersistenceUnitManager(DataSource dataSource) { + TestConfigurationWithCustomPersistenceUnitManager(DataSource dataSource) { this.dataSource = dataSource; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index e52a024bc8..cab7ba8f85 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -87,7 +87,7 @@ import static org.mockito.Mockito.mock; */ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTests { - public HibernateJpaAutoConfigurationTests() { + HibernateJpaAutoConfigurationTests() { super(HibernateJpaAutoConfiguration.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java index 9f6c4e3560..e66ebcfe16 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java @@ -388,7 +388,7 @@ class QuartzAutoConfigurationTests { public static class ComponentThatUsesScheduler { - public ComponentThatUsesScheduler(Scheduler scheduler) { + ComponentThatUsesScheduler(Scheduler scheduler) { Assert.notNull(scheduler, "Scheduler must not be null"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfigurationEarlyInitializationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfigurationEarlyInitializationTests.java index c2aac19b84..42d2737f26 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfigurationEarlyInitializationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfigurationEarlyInitializationTests.java @@ -103,7 +103,7 @@ class SecurityFilterAutoConfigurationEarlyInitializationTests { private static final long serialVersionUID = 1L; - public JacksonModuleBean(DeserializerBean myDeser) { + JacksonModuleBean(DeserializerBean myDeser) { addDeserializer(SourceType.class, myDeser); } @@ -115,7 +115,7 @@ class SecurityFilterAutoConfigurationEarlyInitializationTests { @Autowired ConversionService conversionService; - public DeserializerBean() { + DeserializerBean() { super(SourceType.class); } diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/app/SpringApplicationLauncher.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/app/SpringApplicationLauncher.java index 76bfa1d54b..08a9d3ee1b 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/app/SpringApplicationLauncher.java +++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/app/SpringApplicationLauncher.java @@ -60,7 +60,8 @@ public class SpringApplicationLauncher { Map defaultProperties = new HashMap<>(); defaultProperties.put("spring.groovy.template.check-template-location", "false"); Class applicationClass = this.classLoader.loadClass(getSpringApplicationClassName()); - Constructor constructor = applicationClass.getConstructor(Class[].class); + Constructor constructor = applicationClass.getDeclaredConstructor(Class[].class); + constructor.setAccessible(true); Object application = constructor.newInstance((Object) sources); applicationClass.getMethod("setDefaultProperties", Map.class).invoke(application, defaultProperties); Method method = applicationClass.getMethod("run", String[].class); diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java index 14b22e9cbd..c431d22a66 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java @@ -122,7 +122,7 @@ class SpringApplicationLauncherTests { private static String[] args; - public TestSpringApplication(Class[] sources) { + TestSpringApplication(Class[] sources) { TestSpringApplication.sources = sources; } diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java index 67eb369cbb..ac6e3bb09a 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java @@ -59,7 +59,7 @@ class InitCommandTests extends AbstractHttpClientMockTests { MockitoAnnotations.initMocks(this); } - public InitCommandTests() { + InitCommandTests() { InitializrService initializrService = new InitializrService(this.http); this.handler = new TestableInitCommandOptionHandler(initializrService); this.command = new InitCommand(this.handler); diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java index a04d1c37aa..ca28210348 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java @@ -90,7 +90,7 @@ class ClassPathFileSystemWatcherTests { public final Environment environment; - public Config(Environment environment) { + Config(Environment environment) { this.environment = environment; } diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java index 104551f795..7a5afd98aa 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java @@ -72,7 +72,7 @@ class RestartScopeInitializerTests { public static class ScopeTestBean implements ApplicationListener { - public ScopeTestBean() { + ScopeTestBean() { createCount.incrementAndGet(); } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/LocalHostWebClientTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/LocalHostWebClientTests.java index ff9dfabc57..aa102543d8 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/LocalHostWebClientTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/LocalHostWebClientTests.java @@ -49,7 +49,7 @@ class LocalHostWebClientTests { @Captor private ArgumentCaptor requestCaptor; - public LocalHostWebClientTests() { + LocalHostWebClientTests() { MockitoAnnotations.initMocks(this); } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/webdriver/LocalHostWebConnectionHtmlUnitDriverTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/webdriver/LocalHostWebConnectionHtmlUnitDriverTests.java index 09c82005f3..8a543805cf 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/webdriver/LocalHostWebConnectionHtmlUnitDriverTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/webdriver/LocalHostWebConnectionHtmlUnitDriverTests.java @@ -50,7 +50,7 @@ class LocalHostWebConnectionHtmlUnitDriverTests { @Mock private WebClient webClient; - public LocalHostWebConnectionHtmlUnitDriverTests() { + LocalHostWebConnectionHtmlUnitDriverTests() { MockitoAnnotations.initMocks(this); given(this.webClient.getOptions()).willReturn(new WebClientOptions()); given(this.webClient.getWebConsole()).willReturn(new WebConsole()); @@ -108,7 +108,7 @@ class LocalHostWebConnectionHtmlUnitDriverTests { public class TestLocalHostWebConnectionHtmlUnitDriver extends LocalHostWebConnectionHtmlUnitDriver { - public TestLocalHostWebConnectionHtmlUnitDriver(Environment environment) { + TestLocalHostWebConnectionHtmlUnitDriver(Environment environment) { super(environment); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java index 0257d9e4b7..9cacdb1220 100755 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java @@ -21,6 +21,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; +import java.lang.reflect.Constructor; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; @@ -42,6 +43,7 @@ import org.springframework.boot.loader.archive.Archive.EntryFilter; import org.springframework.boot.loader.archive.ExplodedArchive; import org.springframework.boot.loader.archive.JarFileArchive; import org.springframework.boot.loader.util.SystemPropertyUtils; +import org.springframework.util.Assert; /** * {@link Launcher} for archives with user-configured classpath and main class via a @@ -73,6 +75,14 @@ import org.springframework.boot.loader.util.SystemPropertyUtils; */ public class PropertiesLauncher extends Launcher { + private static final Class[] PARENT_ONLY_PARAMS = new Class[] { ClassLoader.class }; + + private static final Class[] URLS_AND_PARENT_PARAMS = new Class[] { URL[].class, ClassLoader.class }; + + private static final Class[] NO_PARAMS = new Class[] {}; + + private static final URL[] NO_URLS = new URL[0]; + private static final String DEBUG = "loader.debug"; /** @@ -339,7 +349,7 @@ public class PropertiesLauncher extends Launcher { for (Archive archive : archives) { urls.add(archive.getUrl()); } - ClassLoader loader = new LaunchedURLClassLoader(urls.toArray(new URL[0]), getClass().getClassLoader()); + ClassLoader loader = new LaunchedURLClassLoader(urls.toArray(NO_URLS), getClass().getClassLoader()); debug("Classpath: " + urls); String customLoaderClassName = getProperty("loader.classLoader"); if (customLoaderClassName != null) { @@ -350,22 +360,29 @@ public class PropertiesLauncher extends Launcher { } @SuppressWarnings("unchecked") - private ClassLoader wrapWithCustomClassLoader(ClassLoader parent, String loaderClassName) throws Exception { - Class loaderClass = (Class) Class.forName(loaderClassName, true, parent); + private ClassLoader wrapWithCustomClassLoader(ClassLoader parent, String className) throws Exception { + Class type = (Class) Class.forName(className, true, parent); + ClassLoader classLoader = newClassLoader(type, PARENT_ONLY_PARAMS, parent); + if (classLoader == null) { + classLoader = newClassLoader(type, URLS_AND_PARENT_PARAMS, NO_URLS, parent); + } + if (classLoader == null) { + classLoader = newClassLoader(type, NO_PARAMS); + } + Assert.notNull(classLoader, "Unable to create class loader for " + className); + return classLoader; + } + private ClassLoader newClassLoader(Class loaderClass, Class[] parameterTypes, Object... initargs) + throws Exception { try { - return loaderClass.getConstructor(ClassLoader.class).newInstance(parent); + Constructor constructor = loaderClass.getDeclaredConstructor(parameterTypes); + constructor.setAccessible(true); + return constructor.newInstance(initargs); } catch (NoSuchMethodException ex) { - // Ignore and try with URLs + return null; } - try { - return loaderClass.getConstructor(URL[].class, ClassLoader.class).newInstance(new URL[0], parent); - } - catch (NoSuchMethodException ex) { - // Ignore and try without any arguments - } - return loaderClass.newInstance(); } private String getProperty(String propertyKey) throws Exception { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java index 5aceb9f971..bac4d2cfa9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java @@ -360,7 +360,7 @@ class PropertiesLauncherTests { public static class TestLoader extends URLClassLoader { - public TestLoader(ClassLoader parent) { + TestLoader(ClassLoader parent) { super(new URL[0], parent); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrarTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrarTests.java index 723e3c9294..da7529cbdd 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrarTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrarTests.java @@ -125,8 +125,7 @@ class ConfigurationPropertiesBeanRegistrarTests { @ConfigurationProperties(prefix = "bar") public static class BarProperties { - public BarProperties(String foo) { - + BarProperties(String foo) { } } @@ -134,12 +133,10 @@ class ConfigurationPropertiesBeanRegistrarTests { @ConfigurationProperties(prefix = "bing") public static class BingProperties { - public BingProperties() { - + BingProperties() { } - public BingProperties(String foo) { - + BingProperties(String foo) { } } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java index c2022252c5..ca9eaf8696 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java @@ -470,7 +470,7 @@ class CollectionBinderTests { public static class MyCustomNoDefaultConstructorList extends ArrayList { - public MyCustomNoDefaultConstructorList(List items) { + MyCustomNoDefaultConstructorList(List items) { addAll(items); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ConstructorParametersBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ConstructorParametersBinderTests.java index 3fb992a966..e8f8a56145 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ConstructorParametersBinderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ConstructorParametersBinderTests.java @@ -149,7 +149,7 @@ class ConstructorParametersBinderTests { private final ExampleEnum enumValue; - public ExampleValueBean(int intValue, long longValue, boolean booleanValue, String stringValue, + ExampleValueBean(int intValue, long longValue, boolean booleanValue, String stringValue, ExampleEnum enumValue) { this.intValue = intValue; this.longValue = longValue; @@ -191,11 +191,11 @@ class ConstructorParametersBinderTests { @SuppressWarnings("unused") public static class MultipleConstructorsBean { - public MultipleConstructorsBean(int intValue) { + MultipleConstructorsBean(int intValue) { this(intValue, 23L, "hello"); } - public MultipleConstructorsBean(int intValue, long longValue, String stringValue) { + MultipleConstructorsBean(int intValue, long longValue, String stringValue) { } } @@ -204,7 +204,7 @@ class ConstructorParametersBinderTests { private final String name; - public ExampleAbstractBean(String name) { + ExampleAbstractBean(String name) { this.name = name; } @@ -216,8 +216,7 @@ class ConstructorParametersBinderTests { public static class DefaultConstructorBean { - public DefaultConstructorBean() { - + DefaultConstructorBean() { } } @@ -226,7 +225,7 @@ class ConstructorParametersBinderTests { private final ExampleValueBean valueBean; - public ExampleNestedBean(ExampleValueBean valueBean) { + ExampleNestedBean(ExampleValueBean valueBean) { this.valueBean = valueBean; } @@ -244,7 +243,7 @@ class ConstructorParametersBinderTests { private final List customList; - public ExampleDefaultValueBean(@DefaultValue("5") int intValue, + ExampleDefaultValueBean(@DefaultValue("5") int intValue, @DefaultValue({ "a", "b", "c" }) List stringsList, @DefaultValue("x,y,z") List customList) { this.intValue = intValue; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java index d4449a6e5f..4f3cb84324 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java @@ -758,7 +758,7 @@ class JavaBeanBinderTests { private String value; - public ExampleWithNonDefaultConstructor(String value) { + ExampleWithNonDefaultConstructor(String value) { this.value = value; } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java index 36b30f2657..4b696dda15 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java @@ -605,10 +605,10 @@ class MapBinderTests { private String pattern; - public Foo() { + Foo() { } - public Foo(String pattern) { + Foo(String pattern) { this.pattern = pattern; } @@ -668,7 +668,7 @@ class MapBinderTests { public static class MyCustomNoDefaultConstructorMap extends HashMap { - public MyCustomNoDefaultConstructorMap(Map items) { + MyCustomNoDefaultConstructorMap(Map items) { putAll(items); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java index 91f3de42d6..4a1111ae8b 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java @@ -167,7 +167,7 @@ class ServletWebServerMvcIntegrationTests { private final Environment env; - public AdvancedConfig(Environment env) { + AdvancedConfig(Environment env) { this.env = env; } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java index 15a2d19726..4b58900b4e 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java @@ -193,7 +193,7 @@ class SpringBootServletInitializerTests { @Configuration(proxyBeanMethods = false) public static class WithErrorPageFilterNotRegistered extends SpringBootServletInitializer { - public WithErrorPageFilterNotRegistered() { + WithErrorPageFilterNotRegistered() { setRegisterErrorPageFilter(false); } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java index 02a71a8dde..cf09b7fb04 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java @@ -61,7 +61,7 @@ class EmbeddedServerContainerInvocationContextProvider private final Path tempDir; - public EmbeddedServerContainerInvocationContextProvider() throws IOException { + EmbeddedServerContainerInvocationContextProvider() throws IOException { this.tempDir = Files.createTempDirectory("embedded-servlet-container-tests"); } @@ -99,7 +99,7 @@ class EmbeddedServerContainerInvocationContextProvider private final AbstractApplicationLauncher launcher; - public EmbeddedServletContainerInvocationContext(String name, AbstractApplicationLauncher launcher) { + EmbeddedServletContainerInvocationContext(String name, AbstractApplicationLauncher launcher) { this.name = name; this.launcher = launcher; } diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index e003a0cdb3..44ec76fb64 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -3,7 +3,6 @@ "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd"> - @@ -38,4 +37,5 @@ +