diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java index 532c26eaa2..8f58aeda50 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java @@ -155,7 +155,7 @@ public class ReactiveCloudFoundryActuatorAutoConfiguration { static class IgnoredPathsSecurityConfiguration { @Bean - public WebFilterChainPostProcessor webFilterChainPostProcessor() { + WebFilterChainPostProcessor webFilterChainPostProcessor() { return new WebFilterChainPostProcessor(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java index 808cee0c08..bb82d7c203 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java @@ -83,8 +83,7 @@ class ReactiveCloudFoundrySecurityService { * @return a Mono of the access level that should be granted * @throws CloudFoundryAuthorizationException if the token is not authorized */ - public Mono getAccessLevel(String token, String applicationId) - throws CloudFoundryAuthorizationException { + Mono getAccessLevel(String token, String applicationId) throws CloudFoundryAuthorizationException { String uri = getPermissionsUri(applicationId); return this.webClient.get().uri(uri).header("Authorization", "bearer " + token).retrieve().bodyToMono(Map.class) .map(this::getAccessLevel).onErrorMap(this::mapError); @@ -118,7 +117,7 @@ class ReactiveCloudFoundrySecurityService { * Return a Mono of all token keys known by the UAA. * @return a Mono of token keys */ - public Mono> fetchTokenKeys() { + Mono> fetchTokenKeys() { return getUaaUrl().flatMap(this::fetchTokenKeys); } @@ -141,7 +140,7 @@ class ReactiveCloudFoundrySecurityService { * Return a Mono of URL of the UAA. * @return the UAA url Mono */ - public Mono getUaaUrl() { + Mono getUaaUrl() { this.uaaUrl = this.webClient.get().uri(this.cloudControllerUrl + "/info").retrieve().bodyToMono(Map.class) .map((response) -> (String) response.get("token_endpoint")).cache() .onErrorMap((ex) -> new CloudFoundryAuthorizationException(Reason.SERVICE_UNAVAILABLE, diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveTokenValidator.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveTokenValidator.java index 4f3c5b11c3..6c3df56d0d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveTokenValidator.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveTokenValidator.java @@ -50,7 +50,7 @@ class ReactiveTokenValidator { this.securityService = securityService; } - public Mono validate(Token token) { + Mono validate(Token token) { return validateAlgorithm(token).then(validateKeyIdAndSignature(token)).then(validateExpiry(token)) .then(validateIssuer(token)).then(validateAudience(token)); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityService.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityService.java index d06cadbd2b..4be8078821 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityService.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityService.java @@ -65,7 +65,7 @@ class CloudFoundrySecurityService { * @return the access level that should be granted * @throws CloudFoundryAuthorizationException if the token is not authorized */ - public AccessLevel getAccessLevel(String token, String applicationId) throws CloudFoundryAuthorizationException { + AccessLevel getAccessLevel(String token, String applicationId) throws CloudFoundryAuthorizationException { try { URI uri = getPermissionsUri(applicationId); RequestEntity request = RequestEntity.get(uri).header("Authorization", "bearer " + token).build(); @@ -99,7 +99,7 @@ class CloudFoundrySecurityService { * Return all token keys known by the UAA. * @return a list of token keys */ - public Map fetchTokenKeys() { + Map fetchTokenKeys() { try { return extractTokenKeys(this.restTemplate.getForObject(getUaaUrl() + "/token_keys", Map.class)); } @@ -121,7 +121,7 @@ class CloudFoundrySecurityService { * Return the URL of the UAA. * @return the UAA url */ - public String getUaaUrl() { + String getUaaUrl() { if (this.uaaUrl == null) { try { Map response = this.restTemplate.getForObject(this.cloudControllerUrl + "/info", Map.class); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/TokenValidator.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/TokenValidator.java index 0b26f5876a..0746536c83 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/TokenValidator.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/TokenValidator.java @@ -46,7 +46,7 @@ class TokenValidator { this.securityService = cloudFoundrySecurityService; } - public void validate(Token token) { + void validate(Token token) { validateAlgorithm(token); validateKeyIdAndSignature(token); validateExpiry(token); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java index 2e228666a1..e54837ad14 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java @@ -136,7 +136,7 @@ public class WebEndpointAutoConfiguration { @Bean @ConditionalOnMissingBean(ServletEndpointsSupplier.class) - public ServletEndpointDiscoverer servletEndpointDiscoverer(ApplicationContext applicationContext, + ServletEndpointDiscoverer servletEndpointDiscoverer(ApplicationContext applicationContext, ObjectProvider endpointPathMappers, ObjectProvider> filters) { return new ServletEndpointDiscoverer(applicationContext, diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java index f9a6fd2cda..729f2141f9 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java @@ -60,7 +60,7 @@ import org.springframework.context.annotation.Bean; class JerseyWebEndpointManagementContextConfiguration { @Bean - public ResourceConfigCustomizer webEndpointRegistrar(WebEndpointsSupplier webEndpointsSupplier, + ResourceConfigCustomizer webEndpointRegistrar(WebEndpointsSupplier webEndpointsSupplier, ServletEndpointsSupplier servletEndpointsSupplier, EndpointMediaTypes endpointMediaTypes, WebEndpointProperties webEndpointProperties) { List> allEndpoints = new ArrayList<>(); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointConfiguration.java index 582ed5b481..8e2cfde2a4 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointConfiguration.java @@ -38,7 +38,7 @@ class HealthEndpointConfiguration { @Bean @ConditionalOnMissingBean - public HealthEndpoint healthEndpoint(HealthAggregator healthAggregator, HealthIndicatorRegistry registry) { + HealthEndpoint healthEndpoint(HealthAggregator healthAggregator, HealthIndicatorRegistry registry) { return new HealthEndpoint(new CompositeHealthIndicator(healthAggregator, registry)); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java index 1228c4f084..af893e2ef8 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java @@ -48,7 +48,7 @@ class HealthEndpointWebExtensionConfiguration { @Bean @ConditionalOnMissingBean - public HealthStatusHttpMapper createHealthStatusHttpMapper(HealthIndicatorProperties healthIndicatorProperties) { + HealthStatusHttpMapper createHealthStatusHttpMapper(HealthIndicatorProperties healthIndicatorProperties) { HealthStatusHttpMapper statusHttpMapper = new HealthStatusHttpMapper(); if (healthIndicatorProperties.getHttpMapping() != null) { statusHttpMapper.addStatusMapping(healthIndicatorProperties.getHttpMapping()); @@ -58,7 +58,7 @@ class HealthEndpointWebExtensionConfiguration { @Bean @ConditionalOnMissingBean - public HealthWebEndpointResponseMapper healthWebEndpointResponseMapper(HealthStatusHttpMapper statusHttpMapper, + HealthWebEndpointResponseMapper healthWebEndpointResponseMapper(HealthStatusHttpMapper statusHttpMapper, HealthEndpointProperties properties) { return new HealthWebEndpointResponseMapper(statusHttpMapper, properties.getShowDetails(), properties.getRoles()); @@ -72,7 +72,7 @@ class HealthEndpointWebExtensionConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnBean(HealthEndpoint.class) - public ReactiveHealthEndpointWebExtension reactiveHealthEndpointWebExtension( + ReactiveHealthEndpointWebExtension reactiveHealthEndpointWebExtension( ObjectProvider healthAggregator, ReactiveHealthIndicatorRegistry registry, HealthWebEndpointResponseMapper responseMapper) { return new ReactiveHealthEndpointWebExtension(new CompositeReactiveHealthIndicator( @@ -88,7 +88,7 @@ class HealthEndpointWebExtensionConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnBean(HealthEndpoint.class) - public HealthEndpointWebExtension healthEndpointWebExtension(HealthEndpoint healthEndpoint, + HealthEndpointWebExtension healthEndpointWebExtension(HealthEndpoint healthEndpoint, HealthWebEndpointResponseMapper responseMapper) { return new HealthEndpointWebExtension(healthEndpoint, responseMapper); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java index d02b5e90ac..b680c9d220 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java @@ -77,7 +77,7 @@ public class HealthIndicatorAutoConfiguration { @Bean @ConditionalOnMissingBean - public ReactiveHealthIndicatorRegistry reactiveHealthIndicatorRegistry( + ReactiveHealthIndicatorRegistry reactiveHealthIndicatorRegistry( Map reactiveHealthIndicators, Map healthIndicators) { return new ReactiveHealthIndicatorRegistryFactory() diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorRegistryBeans.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorRegistryBeans.java index 57f5585e59..2a1f09c9b9 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorRegistryBeans.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorRegistryBeans.java @@ -37,7 +37,7 @@ final class HealthIndicatorRegistryBeans { private HealthIndicatorRegistryBeans() { } - public static HealthIndicatorRegistry get(ApplicationContext applicationContext) { + static HealthIndicatorRegistry get(ApplicationContext applicationContext) { Map indicators = new LinkedHashMap<>(); indicators.putAll(applicationContext.getBeansOfType(HealthIndicator.class)); if (ClassUtils.isPresent("reactor.core.publisher.Flux", null)) { @@ -49,7 +49,7 @@ final class HealthIndicatorRegistryBeans { private static class ReactiveHealthIndicators { - public Map get(ApplicationContext applicationContext) { + Map get(ApplicationContext applicationContext) { Map indicators = new LinkedHashMap<>(); applicationContext.getBeansOfType(ReactiveHealthIndicator.class) .forEach((name, indicator) -> indicators.put(name, adapt(indicator))); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryConfiguration.java index c3bf00a3c5..cd15fac2ca 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryConfiguration.java @@ -42,7 +42,7 @@ class CompositeMeterRegistryConfiguration { @Bean @Primary - public CompositeMeterRegistry compositeMeterRegistry(Clock clock, List registries) { + CompositeMeterRegistry compositeMeterRegistry(Clock clock, List registries) { return new CompositeMeterRegistry(clock, registries); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.java index 55419f3c2b..c6d5fbcd25 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,8 +29,9 @@ import org.springframework.boot.convert.DurationStyle; * {@link Duration} (applicable to only timers). * * @author Phillip Webb + * @since 2.2.0 */ -final class MeterValue { +public final class MeterValue { private final Object value; @@ -43,8 +44,7 @@ final class MeterValue { } /** - * Return the underlying value of the SLA in form suitable to apply to the given meter - * type. + * Return the underlying value in form suitable to apply to the given meter type. * @param meterType the meter type * @return the value or {@code null} if the value cannot be applied */ diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/NoOpMeterRegistryConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/NoOpMeterRegistryConfiguration.java index 3918efbd4b..4b7514dafe 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/NoOpMeterRegistryConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/NoOpMeterRegistryConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Configuration; class NoOpMeterRegistryConfiguration { @Bean - public CompositeMeterRegistry noOpMeterRegistry(Clock clock) { + CompositeMeterRegistry noOpMeterRegistry(Clock clock) { return new CompositeMeterRegistry(clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java index e33aad6395..76796747c7 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java @@ -47,7 +47,7 @@ class CacheMeterBinderProvidersConfiguration { static class CaffeineCacheMeterBinderProviderConfiguration { @Bean - public CaffeineCacheMeterBinderProvider caffeineCacheMeterBinderProvider() { + CaffeineCacheMeterBinderProvider caffeineCacheMeterBinderProvider() { return new CaffeineCacheMeterBinderProvider(); } @@ -58,7 +58,7 @@ class CacheMeterBinderProvidersConfiguration { static class EhCache2CacheMeterBinderProviderConfiguration { @Bean - public EhCache2CacheMeterBinderProvider ehCache2CacheMeterBinderProvider() { + EhCache2CacheMeterBinderProvider ehCache2CacheMeterBinderProvider() { return new EhCache2CacheMeterBinderProvider(); } @@ -69,7 +69,7 @@ class CacheMeterBinderProvidersConfiguration { static class HazelcastCacheMeterBinderProviderConfiguration { @Bean - public HazelcastCacheMeterBinderProvider hazelcastCacheMeterBinderProvider() { + HazelcastCacheMeterBinderProvider hazelcastCacheMeterBinderProvider() { return new HazelcastCacheMeterBinderProvider(); } @@ -80,7 +80,7 @@ class CacheMeterBinderProvidersConfiguration { static class JCacheCacheMeterBinderProviderConfiguration { @Bean - public JCacheCacheMeterBinderProvider jCacheCacheMeterBinderProvider() { + JCacheCacheMeterBinderProvider jCacheCacheMeterBinderProvider() { return new JCacheCacheMeterBinderProvider(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsRegistrarConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsRegistrarConfiguration.java index ab0b1f2734..8c34f201cc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsRegistrarConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsRegistrarConfiguration.java @@ -59,12 +59,12 @@ class CacheMetricsRegistrarConfiguration { } @Bean - public CacheMetricsRegistrar cacheMetricsRegistrar() { + CacheMetricsRegistrar cacheMetricsRegistrar() { return this.cacheMetricsRegistrar; } @PostConstruct - public void bindCachesToRegistry() { + void bindCachesToRegistry() { this.cacheManagers.forEach(this::bindCacheManagerToRegistry); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java index d240a3455e..2ee47d82ea 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java @@ -66,7 +66,7 @@ public class DataSourcePoolMetricsAutoConfiguration { private static final String DATASOURCE_SUFFIX = "dataSource"; @Autowired - public void bindDataSourcesToRegistry(Map dataSources, MeterRegistry registry, + void bindDataSourcesToRegistry(Map dataSources, MeterRegistry registry, ObjectProvider metadataProviders) { List metadataProvidersList = metadataProviders.stream() .collect(Collectors.toList()); @@ -109,7 +109,7 @@ public class DataSourcePoolMetricsAutoConfiguration { } @Autowired - public void bindMetricsRegistryToHikariDataSources(Collection dataSources) { + void bindMetricsRegistryToHikariDataSources(Collection dataSources) { for (DataSource dataSource : dataSources) { HikariDataSource hikariDataSource = DataSourceUnwrapper.unwrap(dataSource, HikariDataSource.class); if (hikariDataSource != null) { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfiguration.java index 8387286566..66623152e5 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfiguration.java @@ -45,12 +45,12 @@ class RestTemplateMetricsConfiguration { @Bean @ConditionalOnMissingBean(RestTemplateExchangeTagsProvider.class) - public DefaultRestTemplateExchangeTagsProvider restTemplateExchangeTagsProvider() { + DefaultRestTemplateExchangeTagsProvider restTemplateExchangeTagsProvider() { return new DefaultRestTemplateExchangeTagsProvider(); } @Bean - public MetricsRestTemplateCustomizer metricsRestTemplateCustomizer(MeterRegistry meterRegistry, + MetricsRestTemplateCustomizer metricsRestTemplateCustomizer(MeterRegistry meterRegistry, RestTemplateExchangeTagsProvider restTemplateExchangeTagsProvider, MetricsProperties properties) { ClientRequest request = properties.getWeb().getClient().getRequest(); return new MetricsRestTemplateCustomizer(meterRegistry, restTemplateExchangeTagsProvider, diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfiguration.java index bbb527d7c0..cb9609c232 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfiguration.java @@ -41,12 +41,12 @@ class WebClientMetricsConfiguration { @Bean @ConditionalOnMissingBean - public WebClientExchangeTagsProvider defaultWebClientExchangeTagsProvider() { + WebClientExchangeTagsProvider defaultWebClientExchangeTagsProvider() { return new DefaultWebClientExchangeTagsProvider(); } @Bean - public MetricsWebClientCustomizer metricsWebClientCustomizer(MeterRegistry meterRegistry, + MetricsWebClientCustomizer metricsWebClientCustomizer(MeterRegistry meterRegistry, WebClientExchangeTagsProvider tagsProvider, MetricsProperties properties) { ClientRequest request = properties.getWeb().getClient().getRequest(); return new MetricsWebClientCustomizer(meterRegistry, tagsProvider, request.getMetricName(), diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java index bfc66d536f..53f843468c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java @@ -299,7 +299,7 @@ public final class EndpointRequest { */ private static class RequestMatcherFactory { - public RequestMatcher antPath(RequestMatcherProvider matcherProvider, String... parts) { + RequestMatcher antPath(RequestMatcherProvider matcherProvider, String... parts) { StringBuilder pattern = new StringBuilder(); for (String part : parts) { pattern.append(part); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceAutoConfiguration.java index b94e10bc64..6997a5b9db 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceAutoConfiguration.java @@ -55,7 +55,7 @@ public class HttpTraceAutoConfiguration { @Bean @ConditionalOnMissingBean - public HttpTraceFilter httpTraceFilter(HttpTraceRepository repository, HttpExchangeTracer tracer) { + HttpTraceFilter httpTraceFilter(HttpTraceRepository repository, HttpExchangeTracer tracer) { return new HttpTraceFilter(repository, tracer); } @@ -67,7 +67,7 @@ public class HttpTraceAutoConfiguration { @Bean @ConditionalOnMissingBean - public HttpTraceWebFilter httpTraceWebFilter(HttpTraceRepository repository, HttpExchangeTracer tracer, + HttpTraceWebFilter httpTraceWebFilter(HttpTraceRepository repository, HttpExchangeTracer tracer, HttpTraceProperties traceProperties) { return new HttpTraceWebFilter(repository, tracer, traceProperties.getInclude()); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyManagementContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyManagementContextConfiguration.java index 186c417d75..dc409df608 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyManagementContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyManagementContextConfiguration.java @@ -34,14 +34,14 @@ import org.springframework.context.annotation.Configuration; class JerseyManagementContextConfiguration { @Bean - public ServletRegistrationBean jerseyServletRegistration( - JerseyApplicationPath jerseyApplicationPath, ResourceConfig resourceConfig) { + ServletRegistrationBean jerseyServletRegistration(JerseyApplicationPath jerseyApplicationPath, + ResourceConfig resourceConfig) { return new ServletRegistrationBean<>(new ServletContainer(resourceConfig), jerseyApplicationPath.getUrlMapping()); } @Bean - public ResourceConfig resourceConfig(ObjectProvider resourceConfigCustomizers) { + ResourceConfig resourceConfig(ObjectProvider resourceConfigCustomizers) { ResourceConfig resourceConfig = new ResourceConfig(); resourceConfigCustomizers.orderedStream().forEach((customizer) -> customizer.customize(resourceConfig)); return resourceConfig; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java index cce375620d..4f1c30561f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java @@ -89,7 +89,7 @@ public class MappingsEndpointAutoConfiguration { static class ReactiveWebConfiguration { @Bean - public DispatcherHandlersMappingDescriptionProvider dispatcherHandlerMappingDescriptionProvider() { + DispatcherHandlersMappingDescriptionProvider dispatcherHandlerMappingDescriptionProvider() { return new DispatcherHandlersMappingDescriptionProvider(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java index 7e83ab11ed..e563fc9367 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java @@ -196,8 +196,7 @@ public class ManagementContextAutoConfiguration { } } - public static void addIfPossible(ApplicationContext parentContext, - ConfigurableApplicationContext childContext) { + static void addIfPossible(ApplicationContext parentContext, ConfigurableApplicationContext childContext) { if (parentContext instanceof ConfigurableApplicationContext) { add((ConfigurableApplicationContext) parentContext, childContext); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelector.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelector.java index 7d888e124d..e840499003 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelector.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelector.java @@ -127,7 +127,7 @@ class ManagementContextConfigurationImportSelector implements DeferredImportSele return (order != null) ? order : Ordered.LOWEST_PRECEDENCE; } - public String getClassName() { + String getClassName() { return this.className; } @@ -136,7 +136,7 @@ class ManagementContextConfigurationImportSelector implements DeferredImportSele return this.order; } - public ManagementContextType getContextType() { + ManagementContextType getContextType() { return this.contextType; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java index 0e08b76746..fbd89ae27c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java @@ -73,26 +73,26 @@ import org.springframework.util.StringUtils; class ServletManagementChildContextConfiguration { @Bean - public ServletManagementWebServerFactoryCustomizer servletManagementWebServerFactoryCustomizer( + ServletManagementWebServerFactoryCustomizer servletManagementWebServerFactoryCustomizer( ListableBeanFactory beanFactory) { return new ServletManagementWebServerFactoryCustomizer(beanFactory); } @Bean @ConditionalOnClass(name = "io.undertow.Undertow") - public UndertowAccessLogCustomizer undertowManagementAccessLogCustomizer() { + UndertowAccessLogCustomizer undertowManagementAccessLogCustomizer() { return new UndertowAccessLogCustomizer(); } @Bean @ConditionalOnClass(name = "org.apache.catalina.valves.AccessLogValve") - public TomcatAccessLogCustomizer tomcatManagementAccessLogCustomizer() { + TomcatAccessLogCustomizer tomcatManagementAccessLogCustomizer() { return new TomcatAccessLogCustomizer(); } @Bean @ConditionalOnClass(name = "org.eclipse.jetty.server.Server") - public JettyAccessLogCustomizer jettyManagementAccessLogCustomizer() { + JettyAccessLogCustomizer jettyManagementAccessLogCustomizer() { return new JettyAccessLogCustomizer(); } @@ -102,7 +102,7 @@ class ServletManagementChildContextConfiguration { static class ServletManagementContextSecurityConfiguration { @Bean - public Filter springSecurityFilterChain(HierarchicalBeanFactory beanFactory) { + Filter springSecurityFilterChain(HierarchicalBeanFactory beanFactory) { BeanFactory parent = beanFactory.getParentBeanFactory(); return parent.getBean(BeanIds.SPRING_SECURITY_FILTER_CHAIN, Filter.class); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java index 9d8b4cf396..0c733d516f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java @@ -56,12 +56,12 @@ class WebMvcEndpointChildContextConfiguration { */ @Bean @ConditionalOnBean(ErrorAttributes.class) - public ManagementErrorEndpoint errorEndpoint(ErrorAttributes errorAttributes) { + ManagementErrorEndpoint errorEndpoint(ErrorAttributes errorAttributes) { return new ManagementErrorEndpoint(errorAttributes); } @Bean(name = DispatcherServletAutoConfiguration.DEFAULT_DISPATCHER_SERVLET_BEAN_NAME) - public DispatcherServlet dispatcherServlet() { + DispatcherServlet dispatcherServlet() { DispatcherServlet dispatcherServlet = new DispatcherServlet(); // Ensure the parent configuration does not leak down to us dispatcherServlet.setDetectAllHandlerAdapters(false); @@ -72,28 +72,28 @@ class WebMvcEndpointChildContextConfiguration { } @Bean(name = DispatcherServletAutoConfiguration.DEFAULT_DISPATCHER_SERVLET_REGISTRATION_BEAN_NAME) - public DispatcherServletRegistrationBean dispatcherServletRegistrationBean(DispatcherServlet dispatcherServlet) { + DispatcherServletRegistrationBean dispatcherServletRegistrationBean(DispatcherServlet dispatcherServlet) { return new DispatcherServletRegistrationBean(dispatcherServlet, "/"); } @Bean(name = DispatcherServlet.HANDLER_MAPPING_BEAN_NAME) - public CompositeHandlerMapping compositeHandlerMapping() { + CompositeHandlerMapping compositeHandlerMapping() { return new CompositeHandlerMapping(); } @Bean(name = DispatcherServlet.HANDLER_ADAPTER_BEAN_NAME) - public CompositeHandlerAdapter compositeHandlerAdapter(ListableBeanFactory beanFactory) { + CompositeHandlerAdapter compositeHandlerAdapter(ListableBeanFactory beanFactory) { return new CompositeHandlerAdapter(beanFactory); } @Bean(name = DispatcherServlet.HANDLER_EXCEPTION_RESOLVER_BEAN_NAME) - public CompositeHandlerExceptionResolver compositeHandlerExceptionResolver() { + CompositeHandlerExceptionResolver compositeHandlerExceptionResolver() { return new CompositeHandlerExceptionResolver(); } @Bean @ConditionalOnMissingBean({ RequestContextListener.class, RequestContextFilter.class }) - public RequestContextFilter requestContextFilter() { + RequestContextFilter requestContextFilter() { return new OrderedRequestContextFilter(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java index b3c6fe512f..cd2fc368e3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java @@ -35,6 +35,7 @@ import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.test.util.ApplicationContextTestUtils; import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Configuration; /** * Test for application hierarchies created using {@link SpringApplicationBuilder}. @@ -64,6 +65,7 @@ class SpringApplicationHierarchyTests { this.context = builder.run("--server.port=0", "--management.metrics.use-global-registry=false"); } + @Configuration @EnableAutoConfiguration( exclude = { ElasticsearchDataAutoConfiguration.class, ElasticsearchRepositoriesAutoConfiguration.class, CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class, @@ -73,10 +75,11 @@ class SpringApplicationHierarchyTests { FlywayAutoConfiguration.class, MetricsAutoConfiguration.class }, excludeName = { "org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration" }) - public static class Child { + static class Parent { } + @Configuration @EnableAutoConfiguration( exclude = { ElasticsearchDataAutoConfiguration.class, ElasticsearchRepositoriesAutoConfiguration.class, CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class, @@ -86,7 +89,7 @@ class SpringApplicationHierarchyTests { FlywayAutoConfiguration.class, MetricsAutoConfiguration.class }, excludeName = { "org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration" }) - public static class Parent { + static class Child { } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfigurationTests.java index 246a1041ef..b8fea56529 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfigurationTests.java @@ -97,30 +97,30 @@ class AuditAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - public static class CustomAuditEventRepositoryConfiguration { + static class CustomAuditEventRepositoryConfiguration { @Bean - public TestAuditEventRepository testAuditEventRepository() { + TestAuditEventRepository testAuditEventRepository() { return new TestAuditEventRepository(); } } - public static class TestAuditEventRepository extends InMemoryAuditEventRepository { + static class TestAuditEventRepository extends InMemoryAuditEventRepository { } @Configuration(proxyBeanMethods = false) - protected static class CustomAuthenticationAuditListenerConfiguration { + static class CustomAuthenticationAuditListenerConfiguration { @Bean - public TestAuthenticationAuditListener authenticationAuditListener() { + TestAuthenticationAuditListener authenticationAuditListener() { return new TestAuthenticationAuditListener(); } } - protected static class TestAuthenticationAuditListener extends AbstractAuthenticationAuditListener { + static class TestAuthenticationAuditListener extends AbstractAuthenticationAuditListener { @Override public void setApplicationEventPublisher(ApplicationEventPublisher publisher) { @@ -133,16 +133,16 @@ class AuditAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class CustomAuthorizationAuditListenerConfiguration { + static class CustomAuthorizationAuditListenerConfiguration { @Bean - public TestAuthorizationAuditListener authorizationAuditListener() { + TestAuthorizationAuditListener authorizationAuditListener() { return new TestAuthorizationAuditListener(); } } - protected static class TestAuthorizationAuditListener extends AbstractAuthorizationAuditListener { + static class TestAuthorizationAuditListener extends AbstractAuthorizationAuditListener { @Override public void setApplicationEventPublisher(ApplicationEventPublisher publisher) { @@ -155,16 +155,16 @@ class AuditAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class CustomAuditListenerConfiguration { + static class CustomAuditListenerConfiguration { @Bean - public TestAuditListener testAuditListener() { + TestAuditListener testAuditListener() { return new TestAuditListener(); } } - protected static class TestAuditListener extends AbstractAuditListener { + static class TestAuditListener extends AbstractAuditListener { @Override protected void onAuditEvent(AuditEvent event) { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfigurationTests.java index 37cef322bd..cefd0f6e10 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfigurationTests.java @@ -66,10 +66,10 @@ class AuditEventsEndpointAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - public static class CustomAuditEventRepositoryConfiguration { + static class CustomAuditEventRepositoryConfiguration { @Bean - public InMemoryAuditEventRepository testAuditEventRepository() { + InMemoryAuditEventRepository testAuditEventRepository() { return new InMemoryAuditEventRepository(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfigurationTests.java index d3b9422f82..ffe24123c5 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfigurationTests.java @@ -57,10 +57,10 @@ class CassandraHealthIndicatorAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @AutoConfigureBefore(CassandraHealthIndicatorAutoConfiguration.class) - protected static class CassandraConfiguration { + static class CassandraConfiguration { @Bean - public CassandraOperations cassandraOperations() { + CassandraOperations cassandraOperations() { return mock(CassandraOperations.class); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java index 97680a87aa..4a3117554b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java @@ -99,27 +99,27 @@ class CloudFoundryWebEndpointDiscovererTests { static class TestConfiguration { @Bean - public TestEndpoint testEndpoint() { + TestEndpoint testEndpoint() { return new TestEndpoint(); } @Bean - public TestEndpointWebExtension testEndpointWebExtension() { + TestEndpointWebExtension testEndpointWebExtension() { return new TestEndpointWebExtension(); } @Bean - public HealthEndpoint healthEndpoint() { + HealthEndpoint healthEndpoint() { return new HealthEndpoint(mock(HealthIndicator.class)); } @Bean - public HealthEndpointWebExtension healthEndpointWebExtension() { + HealthEndpointWebExtension healthEndpointWebExtension() { return new HealthEndpointWebExtension(); } @Bean - public TestHealthEndpointCloudFoundryExtension testHealthEndpointCloudFoundryExtension() { + TestHealthEndpointCloudFoundryExtension testHealthEndpointCloudFoundryExtension() { return new TestHealthEndpointCloudFoundryExtension(); } @@ -129,7 +129,7 @@ class CloudFoundryWebEndpointDiscovererTests { static class TestEndpoint { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @@ -139,7 +139,7 @@ class CloudFoundryWebEndpointDiscovererTests { static class TestEndpointWebExtension { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @@ -149,7 +149,7 @@ class CloudFoundryWebEndpointDiscovererTests { static class HealthEndpointWebExtension { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @@ -159,7 +159,7 @@ class CloudFoundryWebEndpointDiscovererTests { static class TestHealthEndpointCloudFoundryExtension { @ReadOperation - public Object getAll() { + Object getAll() { return "cf"; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java index ec59a4bca7..ceb011459d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java @@ -165,18 +165,18 @@ class CloudFoundryWebFluxEndpointIntegrationTests { static class CloudFoundryReactiveConfiguration { @Bean - public CloudFoundrySecurityInterceptor interceptor() { + CloudFoundrySecurityInterceptor interceptor() { return new CloudFoundrySecurityInterceptor(tokenValidator, securityService, "app-id"); } @Bean - public EndpointMediaTypes EndpointMediaTypes() { + EndpointMediaTypes EndpointMediaTypes() { return new EndpointMediaTypes(Collections.singletonList("application/json"), Collections.singletonList("application/json")); } @Bean - public CloudFoundryWebFluxEndpointHandlerMapping cloudFoundryWebEndpointServletHandlerMapping( + CloudFoundryWebFluxEndpointHandlerMapping cloudFoundryWebEndpointServletHandlerMapping( WebEndpointDiscoverer webEndpointDiscoverer, EndpointMediaTypes endpointMediaTypes, CloudFoundrySecurityInterceptor interceptor) { CorsConfiguration corsConfiguration = new CorsConfiguration(); @@ -188,7 +188,7 @@ class CloudFoundryWebFluxEndpointIntegrationTests { } @Bean - public WebEndpointDiscoverer webEndpointDiscoverer(ApplicationContext applicationContext, + WebEndpointDiscoverer webEndpointDiscoverer(ApplicationContext applicationContext, EndpointMediaTypes endpointMediaTypes) { ParameterValueMapper parameterMapper = new ConversionServiceParameterValueMapper( DefaultConversionService.getSharedInstance()); @@ -197,7 +197,7 @@ class CloudFoundryWebFluxEndpointIntegrationTests { } @Bean - public EndpointDelegate endpointDelegate() { + EndpointDelegate endpointDelegate() { return mock(EndpointDelegate.class); } @@ -213,17 +213,17 @@ class CloudFoundryWebFluxEndpointIntegrationTests { } @ReadOperation - public Map readAll() { + Map readAll() { return Collections.singletonMap("All", true); } @ReadOperation - public Map readPart(@Selector String part) { + Map readPart(@Selector String part) { return Collections.singletonMap("part", part); } @WriteOperation - public void write(String foo, String bar) { + void write(String foo, String bar) { this.endpointDelegate.write(foo, bar); } @@ -233,7 +233,7 @@ class CloudFoundryWebFluxEndpointIntegrationTests { static class TestEnvEndpoint { @ReadOperation - public Map readAll() { + Map readAll() { return Collections.singletonMap("All", true); } @@ -243,7 +243,7 @@ class CloudFoundryWebFluxEndpointIntegrationTests { static class TestInfoEndpoint { @ReadOperation - public Map readAll() { + Map readAll() { return Collections.singletonMap("All", true); } @@ -251,26 +251,26 @@ class CloudFoundryWebFluxEndpointIntegrationTests { @Configuration(proxyBeanMethods = false) @Import(CloudFoundryReactiveConfiguration.class) - protected static class TestEndpointConfiguration { + static class TestEndpointConfiguration { @Bean - public TestEndpoint testEndpoint(EndpointDelegate endpointDelegate) { + TestEndpoint testEndpoint(EndpointDelegate endpointDelegate) { return new TestEndpoint(endpointDelegate); } @Bean - public TestInfoEndpoint testInfoEnvEndpoint() { + TestInfoEndpoint testInfoEnvEndpoint() { return new TestInfoEndpoint(); } @Bean - public TestEnvEndpoint testEnvEndpoint() { + TestEnvEndpoint testEnvEndpoint() { return new TestEnvEndpoint(); } } - public interface EndpointDelegate { + interface EndpointDelegate { void write(); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java index a2d9ecf8b1..e0d6068492 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java @@ -311,7 +311,7 @@ class ReactiveCloudFoundryActuatorAutoConfigurationTests { static class TestEndpoint { @ReadOperation - public String hello() { + String hello() { return "hello world"; } @@ -321,7 +321,7 @@ class ReactiveCloudFoundryActuatorAutoConfigurationTests { static class WebClientCustomizerConfig { @Bean - public WebClientCustomizer webClientCustomizer() { + WebClientCustomizer webClientCustomizer() { return mock(WebClientCustomizer.class); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java index f940720913..eae2dc9490 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java @@ -255,7 +255,7 @@ class CloudFoundryActuatorAutoConfigurationTests { static class TestEndpoint { @ReadOperation - public String hello() { + String hello() { return "hello world"; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java index e10f46a35c..8af1637510 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java @@ -162,18 +162,18 @@ class CloudFoundryMvcWebEndpointIntegrationTests { static class CloudFoundryMvcConfiguration { @Bean - public CloudFoundrySecurityInterceptor interceptor() { + CloudFoundrySecurityInterceptor interceptor() { return new CloudFoundrySecurityInterceptor(tokenValidator, securityService, "app-id"); } @Bean - public EndpointMediaTypes EndpointMediaTypes() { + EndpointMediaTypes EndpointMediaTypes() { return new EndpointMediaTypes(Collections.singletonList("application/json"), Collections.singletonList("application/json")); } @Bean - public CloudFoundryWebEndpointServletHandlerMapping cloudFoundryWebEndpointServletHandlerMapping( + CloudFoundryWebEndpointServletHandlerMapping cloudFoundryWebEndpointServletHandlerMapping( WebEndpointDiscoverer webEndpointDiscoverer, EndpointMediaTypes endpointMediaTypes, CloudFoundrySecurityInterceptor interceptor) { CorsConfiguration corsConfiguration = new CorsConfiguration(); @@ -185,7 +185,7 @@ class CloudFoundryMvcWebEndpointIntegrationTests { } @Bean - public WebEndpointDiscoverer webEndpointDiscoverer(ApplicationContext applicationContext, + WebEndpointDiscoverer webEndpointDiscoverer(ApplicationContext applicationContext, EndpointMediaTypes endpointMediaTypes) { ParameterValueMapper parameterMapper = new ConversionServiceParameterValueMapper( DefaultConversionService.getSharedInstance()); @@ -194,17 +194,17 @@ class CloudFoundryMvcWebEndpointIntegrationTests { } @Bean - public EndpointDelegate endpointDelegate() { + EndpointDelegate endpointDelegate() { return mock(EndpointDelegate.class); } @Bean - public TomcatServletWebServerFactory tomcat() { + TomcatServletWebServerFactory tomcat() { return new TomcatServletWebServerFactory(0); } @Bean - public DispatcherServlet dispatcherServlet() { + DispatcherServlet dispatcherServlet() { return new DispatcherServlet(); } @@ -220,17 +220,17 @@ class CloudFoundryMvcWebEndpointIntegrationTests { } @ReadOperation - public Map readAll() { + Map readAll() { return Collections.singletonMap("All", true); } @ReadOperation - public Map readPart(@Selector String part) { + Map readPart(@Selector String part) { return Collections.singletonMap("part", part); } @WriteOperation - public void write(String foo, String bar) { + void write(String foo, String bar) { this.endpointDelegate.write(foo, bar); } @@ -240,7 +240,7 @@ class CloudFoundryMvcWebEndpointIntegrationTests { static class TestEnvEndpoint { @ReadOperation - public Map readAll() { + Map readAll() { return Collections.singletonMap("All", true); } @@ -250,7 +250,7 @@ class CloudFoundryMvcWebEndpointIntegrationTests { static class TestInfoEndpoint { @ReadOperation - public Map readAll() { + Map readAll() { return Collections.singletonMap("All", true); } @@ -258,26 +258,26 @@ class CloudFoundryMvcWebEndpointIntegrationTests { @Configuration(proxyBeanMethods = false) @Import(CloudFoundryMvcConfiguration.class) - protected static class TestEndpointConfiguration { + static class TestEndpointConfiguration { @Bean - public TestEndpoint testEndpoint(EndpointDelegate endpointDelegate) { + TestEndpoint testEndpoint(EndpointDelegate endpointDelegate) { return new TestEndpoint(endpointDelegate); } @Bean - public TestInfoEndpoint testInfoEnvEndpoint() { + TestInfoEndpoint testInfoEnvEndpoint() { return new TestInfoEndpoint(); } @Bean - public TestEnvEndpoint testEnvEndpoint() { + TestEnvEndpoint testEnvEndpoint() { return new TestEnvEndpoint(); } } - public interface EndpointDelegate { + interface EndpointDelegate { void write(); 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 11fedd9ed0..1002d79fec 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 @@ -59,7 +59,7 @@ class ConditionsReportEndpointTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - public static class Config { + static class Config { private final ConfigurableApplicationContext context; @@ -68,7 +68,7 @@ class ConditionsReportEndpointTests { } @PostConstruct - public void setupAutoConfigurationReport() { + void setupAutoConfigurationReport() { ConditionEvaluationReport report = ConditionEvaluationReport.get(this.context.getBeanFactory()); report.recordEvaluationCandidates(Arrays.asList("a", "b")); report.recordConditionEvaluation("a", mock(Condition.class), mock(ConditionOutcome.class)); @@ -76,7 +76,7 @@ class ConditionsReportEndpointTests { } @Bean - public ConditionsReportEndpoint endpoint() { + ConditionsReportEndpoint endpoint() { return new ConditionsReportEndpoint(this.context); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfigurationTests.java index aa74bcff0f..f9bc7bf608 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfigurationTests.java @@ -87,17 +87,17 @@ class ConfigurationPropertiesReportEndpointAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - public static class Config { + static class Config { @Bean - public TestProperties testProperties() { + TestProperties testProperties() { return new TestProperties(); } } @ConfigurationProperties("test") - static class TestProperties { + public static class TestProperties { private String dbPassword = "123456"; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilterTests.java index 99c24cce9e..8fd9d70b09 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilterTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilterTests.java @@ -162,11 +162,11 @@ class ExposeExcludePropertyEndpointFilterTests { return ((EndpointFilter) this.filter).match(endpoint); } - private abstract static class TestExposableWebEndpoint implements ExposableWebEndpoint { + abstract static class TestExposableWebEndpoint implements ExposableWebEndpoint { } - private abstract static class DifferentTestExposableWebEndpoint implements ExposableWebEndpoint { + abstract static class DifferentTestExposableWebEndpoint implements ExposableWebEndpoint { } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnAvailableEndpointTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnAvailableEndpointTests.java index cd40883e76..41acd56904 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnAvailableEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnAvailableEndpointTests.java @@ -226,31 +226,31 @@ class ConditionalOnAvailableEndpointTests { @Bean @ConditionalOnAvailableEndpoint - public HealthEndpoint health() { + HealthEndpoint health() { return new HealthEndpoint(); } @Bean @ConditionalOnAvailableEndpoint - public InfoEndpoint info() { + InfoEndpoint info() { return new InfoEndpoint(); } @Bean @ConditionalOnAvailableEndpoint - public SpringEndpoint spring() { + SpringEndpoint spring() { return new SpringEndpoint(); } @Bean @ConditionalOnAvailableEndpoint - public TestEndpoint test() { + TestEndpoint test() { return new TestEndpoint(); } @Bean @ConditionalOnAvailableEndpoint - public ShutdownEndpoint shutdown() { + ShutdownEndpoint shutdown() { return new ShutdownEndpoint(); } @@ -261,13 +261,13 @@ class ConditionalOnAvailableEndpointTests { @Bean @ConditionalOnAvailableEndpoint(endpoint = SpringEndpoint.class) - public String springComponent() { + String springComponent() { return "springComponent"; } @Bean @ConditionalOnAvailableEndpoint - public SpringEndpointExtension springExtension() { + SpringEndpointExtension springExtension() { return new SpringEndpointExtension(); } @@ -278,7 +278,7 @@ class ConditionalOnAvailableEndpointTests { @Bean @ConditionalOnAvailableEndpoint - public String springcomp() { + String springcomp() { return "springcomp"; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpointTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpointTests.java index 3f1f605118..98a66fcc5a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpointTests.java @@ -179,7 +179,7 @@ class ConditionalOnEnabledEndpointTests { @Bean @ConditionalOnEnabledEndpoint - public FooEndpointEnabledByDefaultTrue foo() { + FooEndpointEnabledByDefaultTrue foo() { return new FooEndpointEnabledByDefaultTrue(); } @@ -190,7 +190,7 @@ class ConditionalOnEnabledEndpointTests { static class FooEndpointEnabledByDefaultTrueOnConfigurationConfiguration { @Bean - public FooEndpointEnabledByDefaultTrue foo() { + FooEndpointEnabledByDefaultTrue foo() { return new FooEndpointEnabledByDefaultTrue(); } @@ -201,7 +201,7 @@ class ConditionalOnEnabledEndpointTests { @Bean @ConditionalOnEnabledEndpoint - public FooEndpointEnabledByDefaultFalse foo() { + FooEndpointEnabledByDefaultFalse foo() { return new FooEndpointEnabledByDefaultFalse(); } @@ -212,7 +212,7 @@ class ConditionalOnEnabledEndpointTests { @Bean @ConditionalOnEnabledEndpoint - public FooBarEndpointEnabledByDefaultFalse fooBar() { + FooBarEndpointEnabledByDefaultFalse fooBar() { return new FooBarEndpointEnabledByDefaultFalse(); } @@ -223,13 +223,13 @@ class ConditionalOnEnabledEndpointTests { @Bean @ConditionalOnEnabledEndpoint - public FooEndpointEnabledByDefaultTrue foo() { + FooEndpointEnabledByDefaultTrue foo() { return new FooEndpointEnabledByDefaultTrue(); } @Bean @ConditionalOnEnabledEndpoint - public FooEndpointExtensionEnabledByDefaultTrue fooExt() { + FooEndpointExtensionEnabledByDefaultTrue fooExt() { return new FooEndpointExtensionEnabledByDefaultTrue(); } @@ -240,13 +240,13 @@ class ConditionalOnEnabledEndpointTests { @Bean @ConditionalOnEnabledEndpoint - public FooEndpointEnabledByDefaultFalse foo() { + FooEndpointEnabledByDefaultFalse foo() { return new FooEndpointEnabledByDefaultFalse(); } @Bean @ConditionalOnEnabledEndpoint - public FooEndpointExtensionEnabledByDefaultFalse fooExt() { + FooEndpointExtensionEnabledByDefaultFalse fooExt() { return new FooEndpointExtensionEnabledByDefaultFalse(); } @@ -257,7 +257,7 @@ class ConditionalOnEnabledEndpointTests { @Bean @ConditionalOnEnabledEndpoint(endpoint = FooEndpointEnabledByDefaultTrue.class) - public String fooComponent() { + String fooComponent() { return "foo"; } @@ -268,7 +268,7 @@ class ConditionalOnEnabledEndpointTests { @Bean @ConditionalOnEnabledEndpoint - public String fooComponent() { + String fooComponent() { return "foo"; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java index 5abb1f5bcf..fd0183dde9 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java @@ -79,17 +79,17 @@ class ServletEndpointManagementContextConfigurationTests { static class TestConfig { @Bean - public ServletEndpointsSupplier servletEndpointsSupplier() { + ServletEndpointsSupplier servletEndpointsSupplier() { return Collections::emptyList; } @Bean - public DispatcherServletPath dispatcherServletPath() { + DispatcherServletPath dispatcherServletPath() { return () -> "/test"; } @Bean - public JerseyApplicationPath jerseyApplicationPath() { + JerseyApplicationPath jerseyApplicationPath() { return () -> "/jersey"; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfigurationTests.java index 8765d6aecd..f5b564d50d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfigurationTests.java @@ -119,7 +119,7 @@ class WebEndpointAutoConfigurationTests { } @Component - private static class TestPathMatcher implements PathMapper { + static class TestPathMatcher implements PathMapper { @Override public String getRootPath(EndpointId endpointId) { @@ -133,19 +133,19 @@ class WebEndpointAutoConfigurationTests { @Component @Endpoint(id = "testone") - private static class TestOneEndpoint { + static class TestOneEndpoint { } @Component @Endpoint(id = "testanotherone") - private static class TestAnotherOneEndpoint { + static class TestAnotherOneEndpoint { } @Component @Endpoint(id = "testtwo") - private static class TestTwoEndpoint { + static class TestTwoEndpoint { } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java index 350d2ad7e0..1530fc3312 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java @@ -90,7 +90,7 @@ class AuditEventsEndpointDocumentationTests extends MockMvcEndpointDocumentation static class TestConfiguration { @Bean - public AuditEventsEndpoint auditEventsEndpoint(AuditEventRepository repository) { + AuditEventsEndpoint auditEventsEndpoint(AuditEventRepository repository) { return new AuditEventsEndpoint(repository); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java index a696e008e4..e96b6ac54f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java @@ -75,7 +75,7 @@ class BeansEndpointDocumentationTests extends MockMvcEndpointDocumentationTests static class TestConfiguration { @Bean - public BeansEndpoint beansEndpoint(ConfigurableApplicationContext context) { + BeansEndpoint beansEndpoint(ConfigurableApplicationContext context) { return new BeansEndpoint(context); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java index de5b1d7e91..a75ce56bc5 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java @@ -95,7 +95,7 @@ class CachesEndpointDocumentationTests extends MockMvcEndpointDocumentationTests static class TestConfiguration { @Bean - public CachesEndpoint endpoint() { + CachesEndpoint endpoint() { Map cacheManagers = new HashMap<>(); cacheManagers.put("cacheManager", new ConcurrentMapCacheManager("countries", "cities")); cacheManagers.put("anotherCacheManager", new ConcurrentMapCacheManager("countries")); @@ -103,7 +103,7 @@ class CachesEndpointDocumentationTests extends MockMvcEndpointDocumentationTests } @Bean - public CachesEndpointWebExtension endpointWebExtension(CachesEndpoint endpoint) { + CachesEndpointWebExtension endpointWebExtension(CachesEndpoint endpoint) { return new CachesEndpointWebExtension(endpoint); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java index 8856eb0286..eeb303f30a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java @@ -97,7 +97,7 @@ class ConditionsReportEndpointDocumentationTests extends MockMvcEndpointDocument static class TestConfiguration { @Bean - public ConditionsReportEndpoint autoConfigurationReportEndpoint(ConfigurableApplicationContext context) { + ConditionsReportEndpoint autoConfigurationReportEndpoint(ConfigurableApplicationContext context) { ConditionEvaluationReport conditionEvaluationReport = ConditionEvaluationReport .get(context.getBeanFactory()); conditionEvaluationReport diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java index 83de3e6ef7..7ba8209566 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java @@ -59,7 +59,7 @@ class ConfigurationPropertiesReportEndpointDocumentationTests extends MockMvcEnd static class TestConfiguration { @Bean - public ConfigurationPropertiesReportEndpoint endpoint() { + ConfigurationPropertiesReportEndpoint endpoint() { return new ConfigurationPropertiesReportEndpoint(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java index 94febad1c7..e3e6cffffe 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java @@ -134,7 +134,7 @@ class EnvironmentEndpointDocumentationTests extends MockMvcEndpointDocumentation static class TestConfiguration { @Bean - public EnvironmentEndpoint endpoint(ConfigurableEnvironment environment) { + EnvironmentEndpoint endpoint(ConfigurableEnvironment environment) { return new EnvironmentEndpoint(new AbstractEnvironment() { @Override diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java index 2de5109ca4..c1cc42046d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java @@ -89,13 +89,13 @@ class FlywayEndpointDocumentationTests extends MockMvcEndpointDocumentationTests static class TestConfiguration { @Bean - public DataSource dataSource() { + DataSource dataSource() { return new EmbeddedDatabaseBuilder().generateUniqueName(true) .setType(EmbeddedDatabaseConnection.get(getClass().getClassLoader()).getType()).build(); } @Bean - public FlywayEndpoint endpoint(ApplicationContext context) { + FlywayEndpoint endpoint(ApplicationContext context) { return new FlywayEndpoint(context); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java index fa39e71916..d8a108731e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java @@ -92,23 +92,23 @@ class HealthEndpointDocumentationTests extends MockMvcEndpointDocumentationTests static class TestConfiguration { @Bean - public HealthEndpoint endpoint(Map healthIndicators) { + HealthEndpoint endpoint(Map healthIndicators) { return new HealthEndpoint(new CompositeHealthIndicator(new OrderedHealthAggregator(), new HealthIndicatorRegistryFactory().createHealthIndicatorRegistry(healthIndicators))); } @Bean - public DiskSpaceHealthIndicator diskSpaceHealthIndicator() { + DiskSpaceHealthIndicator diskSpaceHealthIndicator() { return new DiskSpaceHealthIndicator(new File("."), DataSize.ofMegabytes(10)); } @Bean - public DataSourceHealthIndicator dbHealthIndicator(DataSource dataSource) { + DataSourceHealthIndicator dbHealthIndicator(DataSource dataSource) { return new DataSourceHealthIndicator(dataSource); } @Bean - public CompositeHealthIndicator brokerHealthIndicator() { + CompositeHealthIndicator brokerHealthIndicator() { Map indicators = new LinkedHashMap<>(); indicators.put("us1", () -> Health.up().withDetail("version", "1.0.2").build()); indicators.put("us2", () -> Health.up().withDetail("version", "1.0.4").build()); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HeapDumpWebEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HeapDumpWebEndpointDocumentationTests.java index 710f36efc5..a811e9533d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HeapDumpWebEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HeapDumpWebEndpointDocumentationTests.java @@ -61,7 +61,7 @@ class HeapDumpWebEndpointDocumentationTests extends MockMvcEndpointDocumentation static class TestConfiguration { @Bean - public HeapDumpWebEndpoint endpoint() { + HeapDumpWebEndpoint endpoint() { return new HeapDumpWebEndpoint() { @Override diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HttpTraceEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HttpTraceEndpointDocumentationTests.java index 1e4fad2ccd..0117a9a272 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HttpTraceEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HttpTraceEndpointDocumentationTests.java @@ -106,7 +106,7 @@ class HttpTraceEndpointDocumentationTests extends MockMvcEndpointDocumentationTe static class TestConfiguration { @Bean - public HttpTraceEndpoint httpTraceEndpoint(HttpTraceRepository repository) { + HttpTraceEndpoint httpTraceEndpoint(HttpTraceRepository repository) { return new HttpTraceEndpoint(repository); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/InfoEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/InfoEndpointDocumentationTests.java index 0b96b5047c..6d934bc91e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/InfoEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/InfoEndpointDocumentationTests.java @@ -73,12 +73,12 @@ class InfoEndpointDocumentationTests extends MockMvcEndpointDocumentationTests { static class TestConfiguration { @Bean - public InfoEndpoint endpoint(List infoContributors) { + InfoEndpoint endpoint(List infoContributors) { return new InfoEndpoint(infoContributors); } @Bean - public GitInfoContributor gitInfoContributor() { + GitInfoContributor gitInfoContributor() { Properties properties = new Properties(); properties.put("branch", "master"); properties.put("commit.id", "df027cf1ec5aeba2d4fedd7b8c42b88dc5ce38e5"); @@ -89,7 +89,7 @@ class InfoEndpointDocumentationTests extends MockMvcEndpointDocumentationTests { } @Bean - public BuildInfoContributor buildInfoContributor() { + BuildInfoContributor buildInfoContributor() { Properties properties = new Properties(); properties.put("group", "com.example"); properties.put("artifact", "application"); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/IntegrationGraphEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/IntegrationGraphEndpointDocumentationTests.java index f97c659a21..ed3509172b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/IntegrationGraphEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/IntegrationGraphEndpointDocumentationTests.java @@ -55,12 +55,12 @@ class IntegrationGraphEndpointDocumentationTests extends MockMvcEndpointDocument static class TestConfiguration { @Bean - public IntegrationGraphServer integrationGraphServer() { + IntegrationGraphServer integrationGraphServer() { return new IntegrationGraphServer(); } @Bean - public IntegrationGraphEndpoint endpoint(IntegrationGraphServer integrationGraphServer) { + IntegrationGraphEndpoint endpoint(IntegrationGraphServer integrationGraphServer) { return new IntegrationGraphEndpoint(integrationGraphServer); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LiquibaseEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LiquibaseEndpointDocumentationTests.java index 17d770d4f4..8f4d2de25d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LiquibaseEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LiquibaseEndpointDocumentationTests.java @@ -82,7 +82,7 @@ class LiquibaseEndpointDocumentationTests extends MockMvcEndpointDocumentationTe static class TestConfiguration { @Bean - public LiquibaseEndpoint endpoint(ApplicationContext context) { + LiquibaseEndpoint endpoint(ApplicationContext context) { return new LiquibaseEndpoint(context); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java index ac50beee6c..0778a1c83c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java @@ -55,7 +55,7 @@ class LogFileWebEndpointDocumentationTests extends MockMvcEndpointDocumentationT static class TestConfiguration { @Bean - public LogFileWebEndpoint endpoint(Environment environment) { + LogFileWebEndpoint endpoint(Environment environment) { return new LogFileWebEndpoint(environment); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LoggersEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LoggersEndpointDocumentationTests.java index 11de037ec9..f4eab0e6ef 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LoggersEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LoggersEndpointDocumentationTests.java @@ -102,7 +102,7 @@ class LoggersEndpointDocumentationTests extends MockMvcEndpointDocumentationTest static class TestConfiguration { @Bean - public LoggersEndpoint endpoint(LoggingSystem loggingSystem) { + LoggersEndpoint endpoint(LoggingSystem loggingSystem) { return new LoggersEndpoint(loggingSystem); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java index 5d1c7e78c1..a851647ddc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java @@ -137,39 +137,39 @@ class MappingsEndpointReactiveDocumentationTests extends AbstractEndpointDocumen static class TestConfiguration { @Bean - public NettyReactiveWebServerFactory netty() { + NettyReactiveWebServerFactory netty() { return new NettyReactiveWebServerFactory(0); } @Bean - public DispatcherHandlersMappingDescriptionProvider dispatcherHandlersMappingDescriptionProvider() { + DispatcherHandlersMappingDescriptionProvider dispatcherHandlersMappingDescriptionProvider() { return new DispatcherHandlersMappingDescriptionProvider(); } @Bean - public MappingsEndpoint mappingsEndpoint(Collection descriptionProviders, + MappingsEndpoint mappingsEndpoint(Collection descriptionProviders, ConfigurableApplicationContext context) { return new MappingsEndpoint(descriptionProviders, context); } @Bean - public RouterFunction exampleRouter() { + RouterFunction exampleRouter() { return route(GET("/foo"), (request) -> ServerResponse.ok().build()); } @Bean - public ExampleController exampleController() { + ExampleController exampleController() { return new ExampleController(); } } @RestController - private static class ExampleController { + static class ExampleController { @PostMapping(path = "/", consumes = { MediaType.APPLICATION_JSON_VALUE, "!application/xml" }, produces = MediaType.TEXT_PLAIN_VALUE, headers = "X-Custom=Foo", params = "a!=alpha") - public String example() { + String example() { return "Hello World"; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java index a495edac38..db0cd420fc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java @@ -152,44 +152,44 @@ class MappingsEndpointServletDocumentationTests extends AbstractEndpointDocument static class TestConfiguration { @Bean - public TomcatServletWebServerFactory tomcat() { + TomcatServletWebServerFactory tomcat() { return new TomcatServletWebServerFactory(0); } @Bean - public DispatcherServletsMappingDescriptionProvider dispatcherServletsMappingDescriptionProvider() { + DispatcherServletsMappingDescriptionProvider dispatcherServletsMappingDescriptionProvider() { return new DispatcherServletsMappingDescriptionProvider(); } @Bean - public ServletsMappingDescriptionProvider servletsMappingDescriptionProvider() { + ServletsMappingDescriptionProvider servletsMappingDescriptionProvider() { return new ServletsMappingDescriptionProvider(); } @Bean - public FiltersMappingDescriptionProvider filtersMappingDescriptionProvider() { + FiltersMappingDescriptionProvider filtersMappingDescriptionProvider() { return new FiltersMappingDescriptionProvider(); } @Bean - public MappingsEndpoint mappingsEndpoint(Collection descriptionProviders, + MappingsEndpoint mappingsEndpoint(Collection descriptionProviders, ConfigurableApplicationContext context) { return new MappingsEndpoint(descriptionProviders, context); } @Bean - public ExampleController exampleController() { + ExampleController exampleController() { return new ExampleController(); } } @RestController - private static class ExampleController { + static class ExampleController { @PostMapping(path = "/", consumes = { MediaType.APPLICATION_JSON_VALUE, "!application/xml" }, produces = MediaType.TEXT_PLAIN_VALUE, headers = "X-Custom=Foo", params = "a!=alpha") - public String example() { + String example() { return "Hello World"; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java index 895d874252..aa01ae3d63 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java @@ -78,7 +78,7 @@ class MetricsEndpointDocumentationTests extends MockMvcEndpointDocumentationTest static class TestConfiguration { @Bean - public MetricsEndpoint endpoint() { + MetricsEndpoint endpoint() { SimpleMeterRegistry registry = new SimpleMeterRegistry(); new JvmMemoryMetrics().bindTo(registry); return new MetricsEndpoint(registry); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java index ec8747b4e3..c72db1e99e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java @@ -48,7 +48,7 @@ class PrometheusScrapeEndpointDocumentationTests extends MockMvcEndpointDocument static class TestConfiguration { @Bean - public PrometheusScrapeEndpoint endpoint() { + PrometheusScrapeEndpoint endpoint() { CollectorRegistry collectorRegistry = new CollectorRegistry(true); PrometheusMeterRegistry meterRegistry = new PrometheusMeterRegistry((key) -> null, collectorRegistry, Clock.SYSTEM); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java index bccc1c159b..f047968124 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java @@ -90,27 +90,27 @@ class ScheduledTasksEndpointDocumentationTests extends MockMvcEndpointDocumentat static class TestConfiguration { @Bean - public ScheduledTasksEndpoint endpoint(Collection holders) { + ScheduledTasksEndpoint endpoint(Collection holders) { return new ScheduledTasksEndpoint(holders); } @Scheduled(cron = "0 0 0/3 1/1 * ?") - public void processOrders() { + void processOrders() { } @Scheduled(fixedDelay = 5000, initialDelay = 5000) - public void purge() { + void purge() { } @Scheduled(fixedRate = 3000, initialDelay = 10000) - public void retrieveIssues() { + void retrieveIssues() { } @Bean - public SchedulingConfigurer schedulingConfigurer() { + SchedulingConfigurer schedulingConfigurer() { return (registrar) -> registrar.addTriggerTask(new CustomTriggeredRunnable(), new CustomTrigger()); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java index ca79caf394..ccdddd912b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java @@ -125,7 +125,7 @@ class SessionsEndpointDocumentationTests extends MockMvcEndpointDocumentationTes static class TestConfiguration { @Bean - public SessionsEndpoint endpoint(FindByIndexNameSessionRepository sessionRepository) { + SessionsEndpoint endpoint(FindByIndexNameSessionRepository sessionRepository) { return new SessionsEndpoint(sessionRepository); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java index 794ab29a51..957462f239 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java @@ -50,7 +50,7 @@ class ShutdownEndpointDocumentationTests extends MockMvcEndpointDocumentationTes static class TestConfiguration { @Bean - public ShutdownEndpoint endpoint(Environment environment) { + ShutdownEndpoint endpoint(Environment environment) { ShutdownEndpoint endpoint = new ShutdownEndpoint(); endpoint.setApplicationContext(new AnnotationConfigApplicationContext()); return endpoint; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ThreadDumpEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ThreadDumpEndpointDocumentationTests.java index 3cffdbb07e..d986a546e2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ThreadDumpEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ThreadDumpEndpointDocumentationTests.java @@ -165,7 +165,7 @@ class ThreadDumpEndpointDocumentationTests extends MockMvcEndpointDocumentationT static class TestConfiguration { @Bean - public ThreadDumpEndpoint endpoint() { + ThreadDumpEndpoint endpoint() { return new ThreadDumpEndpoint(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionTests.java index 0acac3ac61..3307a3b783 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionTests.java @@ -332,12 +332,12 @@ class HealthEndpointWebExtensionTests { static class HealthIndicatorsConfiguration { @Bean - public HealthIndicator simpleHealthIndicator() { + HealthIndicator simpleHealthIndicator() { return () -> Health.up().withDetail("counter", 42).build(); } @Bean - public HealthIndicator compositeHealthIndicator(HealthIndicator healthIndicator) { + HealthIndicator compositeHealthIndicator(HealthIndicator healthIndicator) { Map nestedIndicators = new HashMap<>(); nestedIndicators.put("one", healthIndicator); nestedIndicators.put("two", () -> Health.up().build()); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfigurationTests.java index 329019094a..c020e1665a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfigurationTests.java @@ -105,7 +105,7 @@ class HealthIndicatorAutoConfigurationTests { @Bean @ConditionalOnEnabledHealthIndicator("custom") - public HealthIndicator customHealthIndicator() { + HealthIndicator customHealthIndicator() { return new CustomHealthIndicator(); } @@ -124,7 +124,7 @@ class HealthIndicatorAutoConfigurationTests { static class CustomHealthAggregatorConfiguration { @Bean - public HealthAggregator healthAggregator() { + HealthAggregator healthAggregator() { return (healths) -> Health.down().build(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/ReactiveHealthEndpointWebExtensionTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/ReactiveHealthEndpointWebExtensionTests.java index fec94cbc00..af80e3a9f0 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/ReactiveHealthEndpointWebExtensionTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/ReactiveHealthEndpointWebExtensionTests.java @@ -207,12 +207,12 @@ class ReactiveHealthEndpointWebExtensionTests { static class HealthIndicatorsConfiguration { @Bean - public HealthIndicator firstHealthIndicator() { + HealthIndicator firstHealthIndicator() { return () -> Health.up().build(); } @Bean - public ReactiveHealthIndicator secondHealthIndicator() { + ReactiveHealthIndicator secondHealthIndicator() { return () -> Mono.just(Health.up().build()); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java index 98bd42bbb1..efa37a54b0 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java @@ -154,7 +154,7 @@ class InfoContributorAutoConfigurationTests { static class GitPropertiesConfiguration { @Bean - public GitProperties gitProperties() { + GitProperties gitProperties() { Properties properties = new Properties(); properties.put("branch", "master"); properties.put("commit.id", "abcdefg"); @@ -168,7 +168,7 @@ class InfoContributorAutoConfigurationTests { static class BuildPropertiesConfiguration { @Bean - public BuildProperties buildProperties() { + BuildProperties buildProperties() { Properties properties = new Properties(); properties.put("group", "com.example"); properties.put("artifact", "demo"); @@ -182,7 +182,7 @@ class InfoContributorAutoConfigurationTests { static class CustomInfoContributorConfiguration { @Bean - public InfoContributor customInfoContributor() { + InfoContributor customInfoContributor() { return (builder) -> { }; } @@ -193,7 +193,7 @@ class InfoContributorAutoConfigurationTests { static class CustomGitInfoContributorConfiguration { @Bean - public GitInfoContributor customGitInfoContributor() { + GitInfoContributor customGitInfoContributor() { return new GitInfoContributor(new GitProperties(new Properties())); } @@ -203,7 +203,7 @@ class InfoContributorAutoConfigurationTests { static class CustomBuildInfoContributorConfiguration { @Bean - public BuildInfoContributor customBuildInfoContributor() { + BuildInfoContributor customBuildInfoContributor() { return new BuildInfoContributor(new BuildProperties(new Properties())); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/ControllerEndpointWebFluxIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/ControllerEndpointWebFluxIntegrationTests.java index 2457b2af57..518f0a9e59 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/ControllerEndpointWebFluxIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/ControllerEndpointWebFluxIntegrationTests.java @@ -80,7 +80,7 @@ class ControllerEndpointWebFluxIntegrationTests { static class ExampleController { @GetMapping("/") - public String example() { + String example() { return "Example"; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/ControllerEndpointWebMvcIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/ControllerEndpointWebMvcIntegrationTests.java index d660371dcf..98187bed94 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/ControllerEndpointWebMvcIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/ControllerEndpointWebMvcIntegrationTests.java @@ -124,7 +124,7 @@ class ControllerEndpointWebMvcIntegrationTests { static class ExampleController { @GetMapping("/") - public String example() { + String example() { return "Example"; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java index 6bc4a40d32..60fa3b3c3d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java @@ -131,20 +131,20 @@ class JmxEndpointIntegrationTests { } @Configuration(proxyBeanMethods = false) - public static class HttpTraceRepositoryConfiguration { + static class HttpTraceRepositoryConfiguration { @Bean - public InMemoryHttpTraceRepository httpTraceRepository() { + InMemoryHttpTraceRepository httpTraceRepository() { return new InMemoryHttpTraceRepository(); } } @Configuration(proxyBeanMethods = false) - public static class AuditEventRepositoryConfiguration { + static class AuditEventRepositoryConfiguration { @Bean - public InMemoryAuditEventRepository auditEventRepository() { + InMemoryAuditEventRepository auditEventRepository() { return new InMemoryAuditEventRepository(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JolokiaEndpointAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JolokiaEndpointAutoConfigurationIntegrationTests.java index b613e902de..74ba6b3d44 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JolokiaEndpointAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JolokiaEndpointAutoConfigurationIntegrationTests.java @@ -101,7 +101,7 @@ class JolokiaEndpointAutoConfigurationIntegrationTests { JolokiaEndpointAutoConfiguration.class, EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class, ServletManagementContextAutoConfiguration.class, ManagementContextAutoConfiguration.class, ServletEndpointManagementContextConfiguration.class }) - protected static class Application { + static class Application { } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java index 4d42270ffa..418c9fc952 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java @@ -87,7 +87,7 @@ class WebEndpointsAutoConfigurationIntegrationTests { RedisRepositoriesAutoConfiguration.class, MetricsAutoConfiguration.class }) @SpringBootConfiguration @SuppressWarnings("deprecation") - public static class WebEndpointTestApplication { + static class WebEndpointTestApplication { } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointCorsIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointCorsIntegrationTests.java index 0e3598a1aa..518567586f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointCorsIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointCorsIntegrationTests.java @@ -173,7 +173,7 @@ class WebMvcEndpointCorsIntegrationTests { } @FunctionalInterface - private interface MockMvcConsumer { + interface MockMvcConsumer { void accept(MockMvc mockMvc) throws Exception; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointExposureIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointExposureIntegrationTests.java index aa896726f7..12b38554b1 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointExposureIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointExposureIntegrationTests.java @@ -184,7 +184,7 @@ class WebMvcEndpointExposureIntegrationTests { static class CustomMvcEndpoint { @GetMapping("/") - public String main() { + String main() { return "test"; } @@ -208,20 +208,20 @@ class WebMvcEndpointExposureIntegrationTests { } @Configuration(proxyBeanMethods = false) - public static class HttpTraceRepositoryConfiguration { + static class HttpTraceRepositoryConfiguration { @Bean - public InMemoryHttpTraceRepository httpTraceRepository() { + InMemoryHttpTraceRepository httpTraceRepository() { return new InMemoryHttpTraceRepository(); } } @Configuration(proxyBeanMethods = false) - public static class AuditEventRepositoryConfiguration { + static class AuditEventRepositoryConfiguration { @Bean - public InMemoryAuditEventRepository auditEventRepository() { + InMemoryAuditEventRepository auditEventRepository() { return new InMemoryAuditEventRepository(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfigurationTests.java index 4b03831747..10378b2ee8 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfigurationTests.java @@ -100,11 +100,11 @@ class DataSourceHealthIndicatorAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - protected static class DataSourceConfig { + static class DataSourceConfig { @Bean @ConfigurationProperties(prefix = "spring.datasource.test") - public DataSource testDataSource() { + DataSource testDataSource() { return DataSourceBuilder.create().type(org.apache.tomcat.jdbc.pool.DataSource.class) .driverClassName("org.hsqldb.jdbc.JDBCDriver").url("jdbc:hsqldb:mem:test").username("sa").build(); } @@ -112,7 +112,7 @@ class DataSourceHealthIndicatorAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class RoutingDatasourceConfig { + static class RoutingDatasourceConfig { @Bean AbstractRoutingDataSource routingDataSource() { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaEndpointAutoConfigurationTests.java index da7ec96b31..4914eaa43b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaEndpointAutoConfigurationTests.java @@ -102,7 +102,7 @@ class JolokiaEndpointAutoConfigurationTests { static class TestConfiguration { @Bean - public ServletEndpointDiscoverer servletEndpointDiscoverer(ApplicationContext applicationContext) { + ServletEndpointDiscoverer servletEndpointDiscoverer(ApplicationContext applicationContext) { return new ServletEndpointDiscoverer(applicationContext, null, Collections.emptyList()); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfigurationTests.java index 368d02885b..1d035426aa 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfigurationTests.java @@ -82,7 +82,7 @@ class LiquibaseEndpointAutoConfigurationTests { static class DataSourceClosingLiquibaseConfiguration { @Bean - public SpringLiquibase liquibase() { + SpringLiquibase liquibase() { return new DataSourceClosingSpringLiquibase() { private boolean propertiesSet = false; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java index de30f06f06..9c0ee779c9 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java @@ -66,7 +66,7 @@ class LoggersEndpointAutoConfigurationTests { static class LoggingConfiguration { @Bean - public LoggingSystem loggingSystem() { + LoggingSystem loggingSystem() { return mock(LoggingSystem.class); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfigurationTests.java index c35dbfa1d4..3baba57538 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfigurationTests.java @@ -90,7 +90,7 @@ class CompositeMeterRegistryAutoConfigurationTests { @Bean @ConditionalOnMissingBean - public Clock micrometerClock() { + Clock micrometerClock() { return Clock.SYSTEM; } @@ -105,7 +105,7 @@ class CompositeMeterRegistryAutoConfigurationTests { static class SingleMeterRegistryConfig { @Bean - public MeterRegistry meterRegistry() { + MeterRegistry meterRegistry() { return new TestMeterRegistry(); } @@ -115,12 +115,12 @@ class CompositeMeterRegistryAutoConfigurationTests { static class MultipleMeterRegistriesConfig { @Bean - public MeterRegistry meterRegistryOne() { + MeterRegistry meterRegistryOne() { return new TestMeterRegistry(); } @Bean - public MeterRegistry meterRegistryTwo() { + MeterRegistry meterRegistryTwo() { return new SimpleMeterRegistry(); } @@ -131,12 +131,12 @@ class CompositeMeterRegistryAutoConfigurationTests { @Bean @Primary - public MeterRegistry meterRegistryOne() { + MeterRegistry meterRegistryOne() { return new TestMeterRegistry(); } @Bean - public MeterRegistry meterRegistryTwo() { + MeterRegistry meterRegistryTwo() { return new SimpleMeterRegistry(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java index 81b089d3ac..72c39c9d34 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java @@ -84,7 +84,7 @@ class JvmMetricsAutoConfigurationTests { static class CustomJvmGcMetricsConfiguration { @Bean - public JvmGcMetrics customJvmGcMetrics() { + JvmGcMetrics customJvmGcMetrics() { return new JvmGcMetrics(); } @@ -94,7 +94,7 @@ class JvmMetricsAutoConfigurationTests { static class CustomJvmMemoryMetricsConfiguration { @Bean - public JvmMemoryMetrics customJvmMemoryMetrics() { + JvmMemoryMetrics customJvmMemoryMetrics() { return new JvmMemoryMetrics(); } @@ -104,7 +104,7 @@ class JvmMetricsAutoConfigurationTests { static class CustomJvmThreadMetricsConfiguration { @Bean - public JvmThreadMetrics customJvmThreadMetrics() { + JvmThreadMetrics customJvmThreadMetrics() { return new JvmThreadMetrics(); } @@ -114,7 +114,7 @@ class JvmMetricsAutoConfigurationTests { static class CustomClassLoaderMetricsConfiguration { @Bean - public ClassLoaderMetrics customClassLoaderMetrics() { + ClassLoaderMetrics customClassLoaderMetrics() { return new ClassLoaderMetrics(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java index d557aee0a5..1b4450ec47 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java @@ -62,7 +62,7 @@ class KafkaMetricsAutoConfigurationTests { static class CustomKafkaConsumerMetricsConfiguration { @Bean - public KafkaConsumerMetrics customKafkaConsumerMetrics() { + KafkaConsumerMetrics customKafkaConsumerMetrics() { return new KafkaConsumerMetrics(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java index daa394ab72..62817da397 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java @@ -62,7 +62,7 @@ public class Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests { static class CustomLog4J2MetricsConfiguration { @Bean - public Log4j2Metrics customLog4J2Metrics() { + Log4j2Metrics customLog4J2Metrics() { return new Log4j2Metrics(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java index 8c1d2dca40..caf3572f18 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java @@ -53,7 +53,7 @@ class LogbackMetricsAutoConfigurationTests { static class CustomLogbackMetricsConfiguration { @Bean - public LogbackMetrics customLogbackMetrics() { + LogbackMetrics customLogbackMetrics() { return new LogbackMetrics(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryCustomizerTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryCustomizerTests.java index 94ea37f417..deaebff86b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryCustomizerTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryCustomizerTests.java @@ -74,17 +74,17 @@ class MeterRegistryCustomizerTests { static class MeterRegistryCustomizerConfiguration { @Bean - public MeterRegistryCustomizer commonTags() { + MeterRegistryCustomizer commonTags() { return (registry) -> registry.config().commonTags("region", "us-east-1"); } @Bean - public MeterRegistryCustomizer prometheusOnlyCommonTags() { + MeterRegistryCustomizer prometheusOnlyCommonTags() { return (registry) -> registry.config().commonTags("job", "myjob"); } @Bean - public MyThing myThing(MeterRegistry registry) { + MyThing myThing(MeterRegistry registry) { registry.gauge("my.thing", 0); return new MyThing(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationIntegrationTests.java index 181378b07f..a5bc05a903 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationIntegrationTests.java @@ -114,7 +114,7 @@ class MetricsAutoConfigurationIntegrationTests { @Primary @Bean - public MeterRegistry simpleMeterRegistry() { + MeterRegistry simpleMeterRegistry() { return new SimpleMeterRegistry(SimpleConfig.DEFAULT, new MockClock()); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MissingRequiredConfigurationFailureAnalyzerTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MissingRequiredConfigurationFailureAnalyzerTests.java index 81541b0d47..e8ed900191 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MissingRequiredConfigurationFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MissingRequiredConfigurationFailureAnalyzerTests.java @@ -59,7 +59,7 @@ class MissingRequiredConfigurationFailureAnalyzerTests { static class MissingAccountIdConfiguration { @Bean - public NewRelicMeterRegistry meterRegistry() { + NewRelicMeterRegistry meterRegistry() { return new NewRelicMeterRegistry((key) -> null, Clock.SYSTEM); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilterTests.java index 992d4040eb..d865e2e07d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilterTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilterTests.java @@ -295,7 +295,7 @@ class PropertiesMeterFilterTests { return binder.bind("", Bindable.of(MetricsProperties.class)).orElseGet(MetricsProperties::new); } - private static class TestMeterRegistry extends SimpleMeterRegistry { + static class TestMeterRegistry extends SimpleMeterRegistry { } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java index 7a5d3fd2d9..880a58aa5e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java @@ -79,7 +79,7 @@ class SystemMetricsAutoConfigurationTests { static class CustomUptimeMetricsConfiguration { @Bean - public UptimeMetrics customUptimeMetrics() { + UptimeMetrics customUptimeMetrics() { return new UptimeMetrics(); } @@ -89,7 +89,7 @@ class SystemMetricsAutoConfigurationTests { static class CustomProcessorMetricsConfiguration { @Bean - public ProcessorMetrics customProcessorMetrics() { + ProcessorMetrics customProcessorMetrics() { return new ProcessorMetrics(); } @@ -99,7 +99,7 @@ class SystemMetricsAutoConfigurationTests { static class CustomFileDescriptorMetricsConfiguration { @Bean - public FileDescriptorMetrics customFileDescriptorMetrics() { + FileDescriptorMetrics customFileDescriptorMetrics() { return new FileDescriptorMetrics(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java index 75f92fe48c..cfc8b3697c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java @@ -89,7 +89,7 @@ class AppOpticsMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -100,7 +100,7 @@ class AppOpticsMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public AppOpticsConfig customConfig() { + AppOpticsConfig customConfig() { return (key) -> "appoptics.apiToken".equals(key) ? "abcde" : null; } @@ -111,7 +111,7 @@ class AppOpticsMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public AppOpticsMeterRegistry customRegistry(AppOpticsConfig config, Clock clock) { + AppOpticsMeterRegistry customRegistry(AppOpticsConfig config, Clock clock) { return new AppOpticsMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java index 6eea5438e1..4ffcc953bc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java @@ -84,7 +84,7 @@ class AtlasMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -95,7 +95,7 @@ class AtlasMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public AtlasConfig customConfig() { + AtlasConfig customConfig() { return (key) -> null; } @@ -106,7 +106,7 @@ class AtlasMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public AtlasMeterRegistry customRegistry(AtlasConfig config, Clock clock) { + AtlasMeterRegistry customRegistry(AtlasConfig config, Clock clock) { return new AtlasMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java index 24dd90c5ff..24a4d989a8 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java @@ -95,7 +95,7 @@ class DatadogMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -106,7 +106,7 @@ class DatadogMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public DatadogConfig customConfig() { + DatadogConfig customConfig() { return (key) -> { if ("datadog.apiKey".equals(key)) { return "12345"; @@ -122,7 +122,7 @@ class DatadogMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public DatadogMeterRegistry customRegistry(DatadogConfig config, Clock clock) { + DatadogMeterRegistry customRegistry(DatadogConfig config, Clock clock) { return new DatadogMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java index 67304eb989..42b92de206 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java @@ -103,7 +103,7 @@ class DynatraceMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -114,7 +114,7 @@ class DynatraceMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public DynatraceConfig customConfig() { + DynatraceConfig customConfig() { return (key) -> { if ("dynatrace.uri".equals(key)) { return "https://dynatrace.example.com"; @@ -136,7 +136,7 @@ class DynatraceMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public DynatraceMeterRegistry customRegistry(DynatraceConfig config, Clock clock) { + DynatraceMeterRegistry customRegistry(DynatraceConfig config, Clock clock) { return new DynatraceMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java index 79d3f875a6..7220e0bbef 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java @@ -86,7 +86,7 @@ class ElasticMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -97,7 +97,7 @@ class ElasticMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public ElasticConfig customConfig() { + ElasticConfig customConfig() { return (key) -> null; } @@ -108,7 +108,7 @@ class ElasticMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public ElasticMeterRegistry customRegistry(ElasticConfig config, Clock clock) { + ElasticMeterRegistry customRegistry(ElasticConfig config, Clock clock) { return new ElasticMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java index f9d440d3b2..517790e399 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java @@ -85,7 +85,7 @@ class GangliaMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -96,7 +96,7 @@ class GangliaMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public GangliaConfig customConfig() { + GangliaConfig customConfig() { return (key) -> null; } @@ -107,7 +107,7 @@ class GangliaMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public GangliaMeterRegistry customRegistry(GangliaConfig config, Clock clock) { + GangliaMeterRegistry customRegistry(GangliaConfig config, Clock clock) { return new GangliaMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java index 65b501a836..7be60e9b6c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java @@ -99,7 +99,7 @@ class GraphiteMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -110,7 +110,7 @@ class GraphiteMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public GraphiteConfig customConfig() { + GraphiteConfig customConfig() { return (key) -> { if ("Graphite.apiKey".equals(key)) { return "12345"; @@ -126,7 +126,7 @@ class GraphiteMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public GraphiteMeterRegistry customRegistry(GraphiteConfig config, Clock clock) { + GraphiteMeterRegistry customRegistry(GraphiteConfig config, Clock clock) { return new GraphiteMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java index 5a8e75ea7e..0e53b02703 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java @@ -86,7 +86,7 @@ class HumioMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -97,7 +97,7 @@ class HumioMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public HumioConfig customConfig() { + HumioConfig customConfig() { return (key) -> null; } @@ -108,7 +108,7 @@ class HumioMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public HumioMeterRegistry customRegistry(HumioConfig config, Clock clock) { + HumioMeterRegistry customRegistry(HumioConfig config, Clock clock) { return new HumioMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java index 783c1f3c1e..5397b2c175 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java @@ -84,7 +84,7 @@ class InfluxMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -95,7 +95,7 @@ class InfluxMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public InfluxConfig customConfig() { + InfluxConfig customConfig() { return (key) -> null; } @@ -106,7 +106,7 @@ class InfluxMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public InfluxMeterRegistry customRegistry(InfluxConfig config, Clock clock) { + InfluxMeterRegistry customRegistry(InfluxConfig config, Clock clock) { return new InfluxMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java index 7838c2a80d..eea0f5ac71 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java @@ -83,7 +83,7 @@ class JmxMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -94,7 +94,7 @@ class JmxMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public JmxConfig customConfig() { + JmxConfig customConfig() { return (key) -> null; } @@ -105,7 +105,7 @@ class JmxMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public JmxMeterRegistry customRegistry(JmxConfig config, Clock clock) { + JmxMeterRegistry customRegistry(JmxConfig config, Clock clock) { return new JmxMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfigurationTests.java index b87a4a1462..3e260c87d1 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfigurationTests.java @@ -84,7 +84,7 @@ class KairosMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -95,7 +95,7 @@ class KairosMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public KairosConfig customConfig() { + KairosConfig customConfig() { return (key) -> null; } @@ -106,7 +106,7 @@ class KairosMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public KairosMeterRegistry customRegistry(KairosConfig config, Clock clock) { + KairosMeterRegistry customRegistry(KairosConfig config, Clock clock) { return new KairosMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java index 5f309c5c56..98da1b03ce 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java @@ -110,7 +110,7 @@ class NewRelicMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock customClock() { + Clock customClock() { return Clock.SYSTEM; } @@ -121,7 +121,7 @@ class NewRelicMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public NewRelicConfig customConfig() { + NewRelicConfig customConfig() { return (key) -> { if ("newrelic.accountId".equals(key)) { return "abcde"; @@ -140,7 +140,7 @@ class NewRelicMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public NewRelicMeterRegistry customRegistry(NewRelicConfig config, Clock clock) { + NewRelicMeterRegistry customRegistry(NewRelicConfig config, Clock clock) { return new NewRelicMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java index e306bbab50..e8073cfd14 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java @@ -165,7 +165,7 @@ class PrometheusMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -176,7 +176,7 @@ class PrometheusMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public PrometheusConfig customConfig() { + PrometheusConfig customConfig() { return (key) -> null; } @@ -187,7 +187,7 @@ class PrometheusMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public PrometheusMeterRegistry customRegistry(PrometheusConfig config, CollectorRegistry collectorRegistry, + PrometheusMeterRegistry customRegistry(PrometheusConfig config, CollectorRegistry collectorRegistry, Clock clock) { return new PrometheusMeterRegistry(config, collectorRegistry, clock); } @@ -199,7 +199,7 @@ class PrometheusMetricsExportAutoConfigurationTests { static class CustomCollectorRegistryConfiguration { @Bean - public CollectorRegistry customCollectorRegistry() { + CollectorRegistry customCollectorRegistry() { return new CollectorRegistry(); } @@ -210,7 +210,7 @@ class PrometheusMetricsExportAutoConfigurationTests { static class CustomEndpointConfiguration { @Bean - public PrometheusScrapeEndpoint customEndpoint(CollectorRegistry collectorRegistry) { + PrometheusScrapeEndpoint customEndpoint(CollectorRegistry collectorRegistry) { return new PrometheusScrapeEndpoint(collectorRegistry); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java index fafd2b1191..71820e1731 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java @@ -98,7 +98,7 @@ class SignalFxMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock customClock() { + Clock customClock() { return Clock.SYSTEM; } @@ -109,7 +109,7 @@ class SignalFxMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public SignalFxConfig customConfig() { + SignalFxConfig customConfig() { return (key) -> { if ("signalfx.accessToken".equals(key)) { return "abcde"; @@ -125,7 +125,7 @@ class SignalFxMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public SignalFxMeterRegistry customRegistry(SignalFxConfig config, Clock clock) { + SignalFxMeterRegistry customRegistry(SignalFxConfig config, Clock clock) { return new SignalFxMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfigurationTests.java index 75d4288150..b6415d401a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfigurationTests.java @@ -72,7 +72,7 @@ class SimpleMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -83,7 +83,7 @@ class SimpleMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public SimpleConfig customConfig() { + SimpleConfig customConfig() { return (key) -> null; } @@ -94,7 +94,7 @@ class SimpleMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public MeterRegistry customRegistry() { + MeterRegistry customRegistry() { return mock(MeterRegistry.class); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java index a9cca4372a..30dcdc04ec 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java @@ -85,7 +85,7 @@ class StatsdMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -96,7 +96,7 @@ class StatsdMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public StatsdConfig customConfig() { + StatsdConfig customConfig() { return (key) -> null; } @@ -107,7 +107,7 @@ class StatsdMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public StatsdMeterRegistry customRegistry(StatsdConfig config, Clock clock) { + StatsdMeterRegistry customRegistry(StatsdConfig config, Clock clock) { return new StatsdMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java index b930e4e0c8..50c04b9c4a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java @@ -89,7 +89,7 @@ class WavefrontMetricsExportAutoConfigurationTests { static class BaseConfiguration { @Bean - public Clock clock() { + Clock clock() { return Clock.SYSTEM; } @@ -100,7 +100,7 @@ class WavefrontMetricsExportAutoConfigurationTests { static class CustomConfigConfiguration { @Bean - public WavefrontConfig customConfig() { + WavefrontConfig customConfig() { return new WavefrontConfig() { @Override public String get(String key) { @@ -121,7 +121,7 @@ class WavefrontMetricsExportAutoConfigurationTests { static class CustomRegistryConfiguration { @Bean - public WavefrontMeterRegistry customRegistry(WavefrontConfig config, Clock clock) { + WavefrontMeterRegistry customRegistry(WavefrontConfig config, Clock clock) { return new WavefrontMeterRegistry(config, clock); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java index 50f1361fa1..74c929fe3e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java @@ -189,7 +189,7 @@ class DataSourcePoolMetricsAutoConfigurationTests { static class BaseConfiguration { @Bean - public SimpleMeterRegistry simpleMeterRegistry() { + SimpleMeterRegistry simpleMeterRegistry() { return new SimpleMeterRegistry(); } @@ -199,12 +199,12 @@ class DataSourcePoolMetricsAutoConfigurationTests { static class TwoDataSourcesConfiguration { @Bean - public DataSource firstDataSource() { + DataSource firstDataSource() { return createDataSource(); } @Bean - public DataSource secondOne() { + DataSource secondOne() { return createDataSource(); } @@ -219,12 +219,12 @@ class DataSourcePoolMetricsAutoConfigurationTests { static class TwoHikariDataSourcesConfiguration { @Bean - public DataSource firstDataSource() { + DataSource firstDataSource() { return createHikariDataSource("firstDataSource"); } @Bean - public DataSource secondOne() { + DataSource secondOne() { return createHikariDataSource("secondOne"); } @@ -234,12 +234,12 @@ class DataSourcePoolMetricsAutoConfigurationTests { static class ProxiedHikariDataSourcesConfiguration { @Bean - public DataSource proxiedDataSource() { + DataSource proxiedDataSource() { return (DataSource) new ProxyFactory(createHikariDataSource("firstDataSource")).getProxy(); } @Bean - public DataSource delegateDataSource() { + DataSource delegateDataSource() { return new DelegatingDataSource(createHikariDataSource("secondOne")); } @@ -249,7 +249,7 @@ class DataSourcePoolMetricsAutoConfigurationTests { static class OneHikariDataSourceConfiguration { @Bean - public DataSource hikariDataSource() { + DataSource hikariDataSource() { return createHikariDataSource("hikariDataSource"); } @@ -259,12 +259,12 @@ class DataSourcePoolMetricsAutoConfigurationTests { static class MixedDataSourcesConfiguration { @Bean - public DataSource firstDataSource() { + DataSource firstDataSource() { return createHikariDataSource("firstDataSource"); } @Bean - public DataSource secondOne() { + DataSource secondOne() { return createTomcatDataSource(); } @@ -287,7 +287,7 @@ class DataSourcePoolMetricsAutoConfigurationTests { static class HikariSealingConfiguration { @Bean - public static HikariSealer hikariSealer() { + static HikariSealer hikariSealer() { return new HikariSealer(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java index f04a805d8c..12bbb0e57d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java @@ -131,7 +131,7 @@ class HibernateMetricsAutoConfigurationTests { static class BaseConfiguration { @Bean - public SimpleMeterRegistry simpleMeterRegistry() { + SimpleMeterRegistry simpleMeterRegistry() { return new SimpleMeterRegistry(); } @@ -153,12 +153,12 @@ class HibernateMetricsAutoConfigurationTests { @Primary @Bean - public LocalContainerEntityManagerFactoryBean firstEntityManagerFactory(DataSource ds) { + LocalContainerEntityManagerFactoryBean firstEntityManagerFactory(DataSource ds) { return createSessionFactory(ds); } @Bean - public LocalContainerEntityManagerFactoryBean secondOne(DataSource ds) { + LocalContainerEntityManagerFactoryBean secondOne(DataSource ds) { return createSessionFactory(ds); } @@ -175,7 +175,7 @@ class HibernateMetricsAutoConfigurationTests { static class NonHibernateEntityManagerFactoryConfiguration { @Bean - public EntityManagerFactory entityManagerFactory() { + EntityManagerFactory entityManagerFactory() { EntityManagerFactory mockedFactory = mock(EntityManagerFactory.class); // enforces JPA contract given(mockedFactory.unwrap(ArgumentMatchers.>any())) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java index c8a6ecaf17..921ee3215c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java @@ -146,17 +146,17 @@ class MetricsIntegrationTests { @Primary @Bean - public MeterRegistry registry() { + MeterRegistry registry() { return new SimpleMeterRegistry(SimpleConfig.DEFAULT, new MockClock()); } @Bean - public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) { + RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) { return restTemplateBuilder.build(); } @Bean - public CyclicBarrier cyclicBarrier() { + CyclicBarrier cyclicBarrier() { return new CyclicBarrier(2); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfigurationTests.java index d024660b9d..07f7d123bd 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfigurationTests.java @@ -135,7 +135,7 @@ class WebClientMetricsConfigurationTests { static class CustomTagsProviderConfig { @Bean - public WebClientExchangeTagsProvider customTagsProvider() { + WebClientExchangeTagsProvider customTagsProvider() { return mock(WebClientExchangeTagsProvider.class); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java index 9ee1fe3411..e216e23e2e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java @@ -87,7 +87,7 @@ class JettyMetricsAutoConfigurationTests { static class MeterRegistryConfiguration { @Bean - public SimpleMeterRegistry meterRegistry() { + SimpleMeterRegistry meterRegistry() { return new SimpleMeterRegistry(); } @@ -97,7 +97,7 @@ class JettyMetricsAutoConfigurationTests { static class ServletWebServerConfiguration { @Bean - public JettyServletWebServerFactory jettyFactory() { + JettyServletWebServerFactory jettyFactory() { return new JettyServletWebServerFactory(0); } @@ -107,12 +107,12 @@ class JettyMetricsAutoConfigurationTests { static class ReactiveWebServerConfiguration { @Bean - public JettyReactiveWebServerFactory jettyFactory() { + JettyReactiveWebServerFactory jettyFactory() { return new JettyReactiveWebServerFactory(0); } @Bean - public HttpHandler httpHandler() { + HttpHandler httpHandler() { return mock(HttpHandler.class); } @@ -122,8 +122,7 @@ class JettyMetricsAutoConfigurationTests { static class CustomJettyServerThreadPoolMetricsBinder { @Bean - public JettyServerThreadPoolMetricsBinder customJettyServerThreadPoolMetricsBinder( - MeterRegistry meterRegistry) { + JettyServerThreadPoolMetricsBinder customJettyServerThreadPoolMetricsBinder(MeterRegistry meterRegistry) { return new JettyServerThreadPoolMetricsBinder(meterRegistry); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfigurationTests.java index 1c38188347..5e19f96537 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfigurationTests.java @@ -119,10 +119,10 @@ class WebFluxMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class CustomWebFluxTagsProviderConfig { + static class CustomWebFluxTagsProviderConfig { @Bean - public WebFluxTagsProvider customWebFluxTagsProvider() { + WebFluxTagsProvider customWebFluxTagsProvider() { return mock(WebFluxTagsProvider.class); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java index f4dbc4834c..0025162aae 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java @@ -169,7 +169,7 @@ class WebMvcMetricsAutoConfigurationTests { static class TagsProviderConfiguration { @Bean - public TestWebMvcTagsProvider tagsProvider() { + TestWebMvcTagsProvider tagsProvider() { return new TestWebMvcTagsProvider(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java index 90909ea787..640c940562 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java @@ -120,7 +120,7 @@ class TomcatMetricsAutoConfigurationTests { static class MeterRegistryConfiguration { @Bean - public SimpleMeterRegistry meterRegistry() { + SimpleMeterRegistry meterRegistry() { return new SimpleMeterRegistry(); } @@ -130,7 +130,7 @@ class TomcatMetricsAutoConfigurationTests { static class ServletWebServerConfiguration { @Bean - public TomcatServletWebServerFactory tomcatFactory() { + TomcatServletWebServerFactory tomcatFactory() { return new TomcatServletWebServerFactory(0); } @@ -140,12 +140,12 @@ class TomcatMetricsAutoConfigurationTests { static class ReactiveWebServerConfiguration { @Bean - public TomcatReactiveWebServerFactory tomcatFactory() { + TomcatReactiveWebServerFactory tomcatFactory() { return new TomcatReactiveWebServerFactory(0); } @Bean - public HttpHandler httpHandler() { + HttpHandler httpHandler() { return mock(HttpHandler.class); } @@ -155,7 +155,7 @@ class TomcatMetricsAutoConfigurationTests { static class CustomTomcatMetrics { @Bean - public TomcatMetrics customTomcatMetrics() { + TomcatMetrics customTomcatMetrics() { return new TomcatMetrics(null, Collections.emptyList()); } @@ -165,7 +165,7 @@ class TomcatMetricsAutoConfigurationTests { static class CustomTomcatMetricsBinder { @Bean - public TomcatMetricsBinder customTomcatMetricsBinder(MeterRegistry meterRegistry) { + TomcatMetricsBinder customTomcatMetricsBinder(MeterRegistry meterRegistry) { return new TomcatMetricsBinder(meterRegistry); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfigurationTests.java index 13fa40e080..5dc999133c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfigurationTests.java @@ -69,20 +69,20 @@ class Neo4jHealthIndicatorAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class Neo4jConfiguration { + static class Neo4jConfiguration { @Bean - public SessionFactory sessionFactory() { + SessionFactory sessionFactory() { return mock(SessionFactory.class); } } @Configuration(proxyBeanMethods = false) - protected static class CustomIndicatorConfiguration { + static class CustomIndicatorConfiguration { @Bean - public Neo4jHealthIndicator neo4jHealthIndicator(SessionFactory sessionFactory) { + Neo4jHealthIndicator neo4jHealthIndicator(SessionFactory sessionFactory) { return new Neo4jHealthIndicator(sessionFactory) { @Override diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfigurationTests.java index ab89b69599..e24e69d421 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfigurationTests.java @@ -65,7 +65,7 @@ class ScheduledTasksEndpointAutoConfigurationTests { static class CustomEndpointConfiguration { @Bean - public CustomEndpoint customEndpoint() { + CustomEndpoint customEndpoint() { return new CustomEndpoint(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequestTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequestTests.java index 2b0b18088c..bcc85a8d7c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequestTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequestTests.java @@ -224,7 +224,7 @@ class EndpointRequestTests { return assertThat(new RequestMatcherAssert(context, matcher)); } - private static class RequestMatcherAssert implements AssertDelegateTarget { + static class RequestMatcherAssert implements AssertDelegateTarget { private final StaticApplicationContext context; @@ -269,7 +269,7 @@ class EndpointRequestTests { } - private static class TestHttpWebHandlerAdapter extends HttpWebHandlerAdapter { + static class TestHttpWebHandlerAdapter extends HttpWebHandlerAdapter { TestHttpWebHandlerAdapter(WebHandler delegate) { super(delegate); @@ -283,12 +283,12 @@ class EndpointRequestTests { } @Endpoint(id = "foo") - private static class FooEndpoint { + static class FooEndpoint { } @ServletEndpoint(id = "baz") - private static class BazServletEndpoint { + static class BazServletEndpoint { } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java index 54f4e879f8..21cdb24244 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java @@ -146,7 +146,7 @@ class ReactiveManagementWebSecurityAutoConfigurationTests { return adapter; } - private static class TestHttpWebHandlerAdapter extends HttpWebHandlerAdapter { + static class TestHttpWebHandlerAdapter extends HttpWebHandlerAdapter { TestHttpWebHandlerAdapter(WebHandler delegate) { super(delegate); @@ -163,7 +163,7 @@ class ReactiveManagementWebSecurityAutoConfigurationTests { static class CustomSecurityConfiguration { @Bean - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { + SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { return http.authorizeExchange().pathMatchers("/foo").permitAll().anyExchange().authenticated().and() .formLogin().and().build(); } @@ -174,17 +174,17 @@ class ReactiveManagementWebSecurityAutoConfigurationTests { static class WebFilterChainProxyConfiguration { @Bean - public ReactiveAuthenticationManager authenticationManager() { + ReactiveAuthenticationManager authenticationManager() { return mock(ReactiveAuthenticationManager.class); } @Bean - public WebFilterChainProxy webFilterChainProxy(ServerHttpSecurity http) { + WebFilterChainProxy webFilterChainProxy(ServerHttpSecurity http) { return new WebFilterChainProxy(getFilterChains(http)); } @Bean - public TestServerHttpSecurity http(ReactiveAuthenticationManager authenticationManager) { + TestServerHttpSecurity http(ReactiveAuthenticationManager authenticationManager) { TestServerHttpSecurity httpSecurity = new TestServerHttpSecurity(); httpSecurity.authenticationManager(authenticationManager); return httpSecurity; @@ -195,7 +195,7 @@ class ReactiveManagementWebSecurityAutoConfigurationTests { http.authorizeExchange().anyExchange().authenticated().and().formLogin().and().build()); } - private static class TestServerHttpSecurity extends ServerHttpSecurity implements ApplicationContextAware { + static class TestServerHttpSecurity extends ServerHttpSecurity implements ApplicationContextAware { @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java index d3fe2413a7..02ed86edee 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java @@ -93,22 +93,22 @@ abstract class AbstractEndpointRequestIntegrationTests { static class BaseConfiguration { @Bean - public TestEndpoint1 endpoint1() { + TestEndpoint1 endpoint1() { return new TestEndpoint1(); } @Bean - public TestEndpoint2 endpoint2() { + TestEndpoint2 endpoint2() { return new TestEndpoint2(); } @Bean - public TestEndpoint3 endpoint3() { + TestEndpoint3 endpoint3() { return new TestEndpoint3(); } @Bean - public PathMappedEndpoints pathMappedEndpoints() { + PathMappedEndpoints pathMappedEndpoints() { List> endpoints = new ArrayList<>(); endpoints.add(mockEndpoint("e1")); endpoints.add(mockEndpoint("e2")); @@ -129,7 +129,7 @@ abstract class AbstractEndpointRequestIntegrationTests { static class TestEndpoint1 { @ReadOperation - public Object getAll() { + Object getAll() { return "endpoint 1"; } @@ -139,7 +139,7 @@ abstract class AbstractEndpointRequestIntegrationTests { static class TestEndpoint2 { @ReadOperation - public Object getAll() { + Object getAll() { return "endpoint 2"; } @@ -149,7 +149,7 @@ abstract class AbstractEndpointRequestIntegrationTests { static class TestEndpoint3 { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @@ -163,7 +163,7 @@ abstract class AbstractEndpointRequestIntegrationTests { static class SecurityConfiguration { @Bean - public WebSecurityConfigurerAdapter webSecurityConfigurerAdapter() { + WebSecurityConfigurerAdapter webSecurityConfigurerAdapter() { return new WebSecurityConfigurerAdapter() { @Override protected void configure(HttpSecurity http) throws Exception { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java index bb31be525d..68ab2af9b9 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java @@ -259,7 +259,7 @@ class EndpointRequestTests { return assertThat(new RequestMatcherAssert(context, matcher)); } - private static class RequestMatcherAssert implements AssertDelegateTarget { + static class RequestMatcherAssert implements AssertDelegateTarget { private final WebApplicationContext context; @@ -270,7 +270,7 @@ class EndpointRequestTests { this.matcher = matcher; } - public void matches(String servletPath) { + void matches(String servletPath) { matches(mockRequest(servletPath)); } @@ -278,7 +278,7 @@ class EndpointRequestTests { assertThat(this.matcher.matches(request)).as("Matches " + getRequestPath(request)).isTrue(); } - public void doesNotMatch(String servletPath) { + void doesNotMatch(String servletPath) { doesNotMatch(mockRequest(servletPath)); } @@ -307,12 +307,12 @@ class EndpointRequestTests { } @Endpoint(id = "foo") - private static class FooEndpoint { + static class FooEndpoint { } @ServletEndpoint(id = "baz") - private static class BazServletEndpoint { + static class BazServletEndpoint { } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java index c423e7bca8..d4d6b872eb 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java @@ -110,17 +110,17 @@ class JerseyEndpointRequestIntegrationTests extends AbstractEndpointRequestInteg } @Bean - public TomcatServletWebServerFactory tomcat() { + TomcatServletWebServerFactory tomcat() { return new TomcatServletWebServerFactory(0); } @Bean - public ResourceConfig resourceConfig() { + ResourceConfig resourceConfig() { return new ResourceConfig(); } @Bean - public ResourceConfigCustomizer webEndpointRegistrar() { + ResourceConfigCustomizer webEndpointRegistrar() { return this::customize; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java index 8d1f6a3a7d..5e04dcd57d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java @@ -107,12 +107,12 @@ class MvcEndpointRequestIntegrationTests extends AbstractEndpointRequestIntegrat } @Bean - public TomcatServletWebServerFactory tomcat() { + TomcatServletWebServerFactory tomcat() { return new TomcatServletWebServerFactory(0); } @Bean - public WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping() { + WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping() { List mediaTypes = Arrays.asList(MediaType.APPLICATION_JSON_VALUE, ActuatorMediaType.V2_JSON); EndpointMediaTypes endpointMediaTypes = new EndpointMediaTypes(mediaTypes, mediaTypes); WebEndpointDiscoverer discoverer = new WebEndpointDiscoverer(this.applicationContext, diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java index fcd5d98dc2..6f30148711 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java @@ -60,7 +60,7 @@ class SessionsEndpointAutoConfigurationTests { static class SessionConfiguration { @Bean - public FindByIndexNameSessionRepository sessionRepository() { + FindByIndexNameSessionRepository sessionRepository() { return mock(FindByIndexNameSessionRepository.class); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextConfigurationTests.java index bae035ca25..53a99bd89f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextConfigurationTests.java @@ -46,12 +46,12 @@ class ManagementContextConfigurationTests { } @ManagementContextConfiguration - private static class DefaultManagementContextConfiguration { + static class DefaultManagementContextConfiguration { } @ManagementContextConfiguration(proxyBeanMethods = false) - private static class NoBeanMethodProxyingManagementContextConfiguration { + static class NoBeanMethodProxyingManagementContextConfiguration { } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfigurationTests.java index 344f2301c8..22a33b5fcd 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfigurationTests.java @@ -109,7 +109,7 @@ public class JerseySameManagementContextConfigurationTests { static class ConfigWithJerseyApplicationPath { @Bean - public JerseyApplicationPath testJerseyApplicationPath() { + JerseyApplicationPath testJerseyApplicationPath() { return mock(JerseyApplicationPath.class); } @@ -119,7 +119,7 @@ public class JerseySameManagementContextConfigurationTests { static class ConfigWithResourceConfig { @Bean - public ResourceConfig customResourceConfig() { + ResourceConfig customResourceConfig() { return new ResourceConfig(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactoryTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactoryTests.java index dec98aa470..a046568ba8 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactoryTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactoryTests.java @@ -59,12 +59,12 @@ class ReactiveManagementContextFactoryTests { static class ParentConfiguration { @Bean - public ReactiveWebServerFactory reactiveWebServerFactory() { + ReactiveWebServerFactory reactiveWebServerFactory() { return mock(ReactiveWebServerFactory.class); } @Bean - public HttpHandler httpHandler(ApplicationContext applicationContext) { + HttpHandler httpHandler(ApplicationContext applicationContext) { return mock(HttpHandler.class); } @@ -74,7 +74,7 @@ class ReactiveManagementContextFactoryTests { static class TestConfiguration1 { @Bean - public HttpHandler httpHandler(ApplicationContext applicationContext) { + HttpHandler httpHandler(ApplicationContext applicationContext) { return mock(HttpHandler.class); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelectorTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelectorTests.java index 6c53d4a06d..30823546c1 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelectorTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelectorTests.java @@ -75,17 +75,17 @@ class ManagementContextConfigurationImportSelectorTests { } @Order(1) - private static class A { + static class A { } @Order(2) - private static class B { + static class B { } @Order(3) - private static class C { + static class C { } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolverTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolverTests.java index c737040422..4fdc3f0e8a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolverTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolverTests.java @@ -78,7 +78,7 @@ class CompositeHandlerExceptionResolverTests { static class BaseConfiguration { @Bean(name = DispatcherServlet.HANDLER_EXCEPTION_RESOLVER_BEAN_NAME) - public CompositeHandlerExceptionResolver compositeHandlerExceptionResolver() { + CompositeHandlerExceptionResolver compositeHandlerExceptionResolver() { return new CompositeHandlerExceptionResolver(); } @@ -89,7 +89,7 @@ class CompositeHandlerExceptionResolverTests { static class TestConfiguration { @Bean - public HandlerExceptionResolver testResolver() { + HandlerExceptionResolver testResolver() { return new TestHandlerExceptionResolver(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/MockServletWebServerFactory.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/MockServletWebServerFactory.java index 8fe8cf82c5..9ef18a0830 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/MockServletWebServerFactory.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/MockServletWebServerFactory.java @@ -62,10 +62,10 @@ public class MockServletWebServerFactory extends AbstractServletWebServerFactory return (getWebServer() != null) ? getWebServer().getRegisteredFilters(index) : null; } - public static class MockServletWebServer - extends org.springframework.boot.testsupport.web.servlet.MockServletWebServer implements WebServer { + static class MockServletWebServer extends org.springframework.boot.testsupport.web.servlet.MockServletWebServer + implements WebServer { - public MockServletWebServer(ServletContextInitializer[] initializers, int port) { + MockServletWebServer(ServletContextInitializer[] initializers, int port) { super(Arrays.stream(initializers).map((initializer) -> (Initializer) initializer::onStartup) .toArray(Initializer[]::new), port); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java index bbb509d24f..e4aa6e719f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java @@ -71,7 +71,7 @@ class WebMvcEndpointChildContextConfigurationTests { static class ExistingConfig { @Bean - public RequestContextFilter testRequestContextFilter() { + RequestContextFilter testRequestContextFilter() { return new RequestContextFilter(); } @@ -81,7 +81,7 @@ class WebMvcEndpointChildContextConfigurationTests { static class RequestContextListenerConfig { @Bean - public RequestContextListener testRequestContextListener() { + RequestContextListener testRequestContextListener() { return new RequestContextListener(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceAutoConfigurationTests.java index eae78fd422..ad28940ccf 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceAutoConfigurationTests.java @@ -107,7 +107,7 @@ class HttpTraceAutoConfigurationTests { .doesNotHaveBean(HttpExchangeTracer.class).doesNotHaveBean(HttpTraceFilter.class)); } - private static class CustomHttpTraceRepository implements HttpTraceRepository { + static class CustomHttpTraceRepository implements HttpTraceRepository { @Override public List findAll() { @@ -125,7 +125,7 @@ class HttpTraceAutoConfigurationTests { static class HttpTraceRepositoryConfiguration { @Bean - public CustomHttpTraceRepository customRepository() { + CustomHttpTraceRepository customRepository() { return new CustomHttpTraceRepository(); } @@ -143,7 +143,7 @@ class HttpTraceAutoConfigurationTests { static class CustomTracerConfiguration { @Bean - public CustomHttpExchangeTracer customTracer(HttpTraceProperties properties) { + CustomHttpExchangeTracer customTracer(HttpTraceProperties properties) { return new CustomHttpExchangeTracer(properties.getInclude()); } @@ -162,7 +162,7 @@ class HttpTraceAutoConfigurationTests { static class CustomWebFilterConfiguration { @Bean - public CustomHttpTraceWebFilter customWebFilter(HttpTraceRepository repository, HttpExchangeTracer tracer, + CustomHttpTraceWebFilter customWebFilter(HttpTraceRepository repository, HttpExchangeTracer tracer, HttpTraceProperties properties) { return new CustomHttpTraceWebFilter(repository, tracer, properties.getInclude()); } @@ -181,7 +181,7 @@ class HttpTraceAutoConfigurationTests { static class CustomFilterConfiguration { @Bean - public CustomHttpTraceFilter customWebFilter(HttpTraceRepository repository, HttpExchangeTracer tracer) { + CustomHttpTraceFilter customWebFilter(HttpTraceRepository repository, HttpExchangeTracer tracer) { return new CustomHttpTraceFilter(repository, tracer); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceEndpointAutoConfigurationTests.java index f2120ea6d0..7fc77d2f4d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceEndpointAutoConfigurationTests.java @@ -71,7 +71,7 @@ class HttpTraceEndpointAutoConfigurationTests { static class HttpTraceRepositoryConfiguration { @Bean - public InMemoryHttpTraceRepository customRepository() { + InMemoryHttpTraceRepository customRepository() { return new InMemoryHttpTraceRepository(); } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationsFactory.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationsFactory.java index 4414c80b22..aa6b1aff66 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationsFactory.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationsFactory.java @@ -68,7 +68,7 @@ abstract class DiscoveredOperationsFactory { this.invokerAdvisors = invokerAdvisors; } - public Collection createOperations(EndpointId id, Object target) { + Collection createOperations(EndpointId id, Object target) { return MethodIntrospector .selectMethods(target.getClass(), (MetadataLookup) (method) -> createOperation(id, target, method)) .values(); diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java index 59f87af807..6ff1fc967f 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java @@ -415,11 +415,11 @@ public abstract class EndpointDiscoverer, O exten this.filter = getFilter(this.bean.getClass()); } - public void addExtension(ExtensionBean extensionBean) { + void addExtension(ExtensionBean extensionBean) { this.extensions.add(extensionBean); } - public Set getExtensions() { + Set getExtensions() { return this.extensions; } @@ -428,23 +428,23 @@ public abstract class EndpointDiscoverer, O exten .getValue(MergedAnnotation.VALUE, Class.class).orElse(null); } - public String getBeanName() { + String getBeanName() { return this.beanName; } - public Object getBean() { + Object getBean() { return this.bean; } - public EndpointId getId() { + EndpointId getId() { return this.id; } - public boolean isEnabledByDefault() { + boolean isEnabledByDefault() { return this.enabledByDefault; } - public Class getFilter() { + Class getFilter() { return this.filter; } @@ -477,19 +477,19 @@ public abstract class EndpointDiscoverer, O exten this.filter = extensionAnnotation.getClass("filter"); } - public String getBeanName() { + String getBeanName() { return this.beanName; } - public Object getBean() { + Object getBean() { return this.bean; } - public EndpointId getEndpointId() { + EndpointId getEndpointId() { return this.endpointId; } - public Class getFilter() { + Class getFilter() { return this.filter; } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java index e30b344234..23701ce62a 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -114,11 +114,11 @@ public class CachingOperationInvoker implements OperationInvoker { this.creationTime = creationTime; } - public boolean isStale(long accessTime, long timeToLive) { + boolean isStale(long accessTime, long timeToLive) { return (accessTime - this.creationTime) >= timeToLive; } - public Object getResponse() { + Object getResponse() { return this.response; } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java index 5ac08e150e..bce34a41f9 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java @@ -171,7 +171,7 @@ public class EndpointMBean implements DynamicMBean { private static class ReactiveHandler { - public static Object handle(Object result) { + static Object handle(Object result) { if (result instanceof Mono) { return ((Mono) result).block(); } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/MBeanInfoFactory.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/MBeanInfoFactory.java index 3ad39b1850..097fe109b5 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/MBeanInfoFactory.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/MBeanInfoFactory.java @@ -49,7 +49,7 @@ class MBeanInfoFactory { this.responseMapper = responseMapper; } - public MBeanInfo getMBeanInfo(ExposableJmxEndpoint endpoint) { + MBeanInfo getMBeanInfo(ExposableJmxEndpoint endpoint) { String className = EndpointMBean.class.getName(); String description = getDescription(endpoint); ModelMBeanOperationInfo[] operations = getMBeanOperations(endpoint); diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/annotation/DiscoveredJmxOperation.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/annotation/DiscoveredJmxOperation.java index 8c6ec7448a..60750d1cd4 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/annotation/DiscoveredJmxOperation.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/annotation/DiscoveredJmxOperation.java @@ -184,7 +184,7 @@ class DiscoveredJmxOperation extends AbstractDiscoveredOperation implements JmxO */ private static class JmxType { - public static Class get(Class source) { + static Class get(Class source) { if (source.isEnum()) { return String.class; } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactory.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactory.java index 253551bc8d..6451674ea9 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactory.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactory.java @@ -51,7 +51,7 @@ class RequestPredicateFactory { this.endpointMediaTypes = endpointMediaTypes; } - public WebOperationRequestPredicate getRequestPredicate(EndpointId endpointId, String rootPath, + WebOperationRequestPredicate getRequestPredicate(EndpointId endpointId, String rootPath, DiscoveredOperationMethod operationMethod) { Method method = operationMethod.getMethod(); String path = getPath(rootPath, method); diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java index 9d9cbf4e94..8f1fb5128f 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java @@ -299,13 +299,13 @@ public abstract class AbstractWebFluxEndpointHandlerMapping extends RequestMappi return this::emptySecurityContext; } - public Mono springSecurityContext() { + Mono springSecurityContext() { return ReactiveSecurityContextHolder.getContext() .map((securityContext) -> new ReactiveSecurityContext(securityContext.getAuthentication())) .switchIfEmpty(Mono.just(new ReactiveSecurityContext(null))); } - public Mono emptySecurityContext() { + Mono emptySecurityContext() { return Mono.just(SecurityContext.NONE); } @@ -369,7 +369,7 @@ public abstract class AbstractWebFluxEndpointHandlerMapping extends RequestMappi } @ResponseBody - public Publisher> handle(ServerWebExchange exchange, + Publisher> handle(ServerWebExchange exchange, @RequestBody(required = false) Map body) { return this.operation.handle(exchange, body); } @@ -388,7 +388,7 @@ public abstract class AbstractWebFluxEndpointHandlerMapping extends RequestMappi } @ResponseBody - public Publisher> handle(ServerWebExchange exchange) { + Publisher> handle(ServerWebExchange exchange) { return this.operation.handle(exchange, null); } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/AbstractWebMvcEndpointHandlerMapping.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/AbstractWebMvcEndpointHandlerMapping.java index 0742200cb1..e579f19e3a 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/AbstractWebMvcEndpointHandlerMapping.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/AbstractWebMvcEndpointHandlerMapping.java @@ -335,7 +335,7 @@ public abstract class AbstractWebMvcEndpointHandlerMapping extends RequestMappin } @ResponseBody - public Object handle(HttpServletRequest request, @RequestBody(required = false) Map body) { + Object handle(HttpServletRequest request, @RequestBody(required = false) Map body) { return this.operation.handle(request, body); } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jms/JmsHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jms/JmsHealthIndicator.java index dfbf150b19..52edf5404e 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jms/JmsHealthIndicator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/jms/JmsHealthIndicator.java @@ -65,7 +65,7 @@ public class JmsHealthIndicator extends AbstractHealthIndicator { this.connection = connection; } - public void start() throws JMSException { + void start() throws JMSException { new Thread(() -> { try { if (!this.latch.await(5, TimeUnit.SECONDS)) { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourcePoolMetrics.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourcePoolMetrics.java index d1387062fb..1e3676c412 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourcePoolMetrics.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourcePoolMetrics.java @@ -94,8 +94,7 @@ public class DataSourcePoolMetrics implements MeterBinder { this.metadataProvider = metadataProvider; } - public Function getValueFunction( - Function function) { + Function getValueFunction(Function function) { return (dataSource) -> function.apply(getDataSourcePoolMetadata(dataSource)); } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilter.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilter.java index 9bbd94ac9a..7cc029ffaf 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilter.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilter.java @@ -195,15 +195,15 @@ public class WebMvcMetricsFilter extends OncePerRequestFilter { this.timerSample = timerSample; } - public Timer.Sample getTimerSample() { + Timer.Sample getTimerSample() { return this.timerSample; } - public void attachTo(HttpServletRequest request) { + void attachTo(HttpServletRequest request) { request.setAttribute(ATTRIBUTE, this); } - public static TimingContext get(HttpServletRequest request) { + static TimingContext get(HttpServletRequest request) { return (TimingContext) request.getAttribute(ATTRIBUTE); } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java index a75a935d04..bb4a3e96ab 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java @@ -94,7 +94,7 @@ public class AuthenticationAuditListener extends AbstractAuthenticationAuditList private static class WebAuditListener { - public void process(AuthenticationAuditListener listener, AbstractAuthenticationEvent input) { + void process(AuthenticationAuditListener listener, AbstractAuthenticationEvent input) { if (listener != null) { AuthenticationSwitchUserEvent event = (AuthenticationSwitchUserEvent) input; Map data = new HashMap<>(); @@ -109,7 +109,7 @@ public class AuthenticationAuditListener extends AbstractAuthenticationAuditList } - public boolean accepts(AbstractAuthenticationEvent event) { + boolean accepts(AbstractAuthenticationEvent event) { return event instanceof AuthenticationSwitchUserEvent; } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletHandlerMappings.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletHandlerMappings.java index 46184afbd3..ec858aded0 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletHandlerMappings.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletHandlerMappings.java @@ -57,7 +57,7 @@ final class DispatcherServletHandlerMappings { this.applicationContext = applicationContext; } - public List getHandlerMappings() { + List getHandlerMappings() { List handlerMappings = this.dispatcherServlet.getHandlerMappings(); if (handlerMappings == null) { initializeDispatcherServletIfPossible(); @@ -79,7 +79,7 @@ final class DispatcherServletHandlerMappings { } } - public String getName() { + String getName() { return this.name; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/ActuatorConfigurationClassTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/ActuatorConfigurationClassTests.java deleted file mode 100644 index 308a955443..0000000000 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/ActuatorConfigurationClassTests.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2012-2017 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.boot.actuate; - -import org.springframework.boot.testsupport.context.AbstractConfigurationClassTests; - -/** - * Tests for the actuator module's {@code @Configuration} classes. - * - * @author Andy Wilkinson - */ -public class ActuatorConfigurationClassTests extends AbstractConfigurationClassTests { - -} diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java index 204a5f4707..66e60ca94a 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java @@ -66,10 +66,10 @@ class AuditEventsEndpointWebIntegrationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration { + static class TestConfiguration { @Bean - public AuditEventRepository auditEventsRepository() { + AuditEventRepository auditEventsRepository() { AuditEventRepository repository = new InMemoryAuditEventRepository(3); repository.add(createEvent("2016-11-01T11:00:00Z", "admin", "login")); repository.add(createEvent("2016-11-01T12:00:00Z", "admin", "logout")); @@ -78,7 +78,7 @@ class AuditEventsEndpointWebIntegrationTests { } @Bean - public AuditEventsEndpoint auditEventsEndpoint(AuditEventRepository auditEventRepository) { + AuditEventsEndpoint auditEventsEndpoint(AuditEventRepository auditEventRepository) { return new AuditEventsEndpoint(auditEventRepository); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/beans/BeansEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/beans/BeansEndpointTests.java index 9707b28a35..0bb7d07d1b 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/beans/BeansEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/beans/BeansEndpointTests.java @@ -104,10 +104,10 @@ class BeansEndpointTests { } @Configuration(proxyBeanMethods = false) - public static class EndpointConfiguration { + static class EndpointConfiguration { @Bean - public BeansEndpoint endpoint(ConfigurableApplicationContext context) { + BeansEndpoint endpoint(ConfigurableApplicationContext context) { return new BeansEndpoint(context); } @@ -117,7 +117,7 @@ class BeansEndpointTests { static class BeanConfiguration { @Bean - public String bean() { + String bean() { return "bean"; } @@ -128,7 +128,7 @@ class BeansEndpointTests { @Lazy @Bean - public String lazyBean() { + String lazyBean() { return "lazyBean"; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cache/CachesEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cache/CachesEndpointWebIntegrationTests.java index 0ba73962f6..1feb23577a 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cache/CachesEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cache/CachesEndpointWebIntegrationTests.java @@ -86,22 +86,22 @@ class CachesEndpointWebIntegrationTests { static class TestConfiguration { @Bean - public CacheManager one() { + CacheManager one() { return new ConcurrentMapCacheManager("a", "b"); } @Bean - public CacheManager two() { + CacheManager two() { return new ConcurrentMapCacheManager("a", "c"); } @Bean - public CachesEndpoint endpoint(Map cacheManagers) { + CachesEndpoint endpoint(Map cacheManagers) { return new CachesEndpoint(cacheManagers); } @Bean - public CachesEndpointWebExtension cachesEndpointWebExtension(CachesEndpoint endpoint) { + CachesEndpointWebExtension cachesEndpointWebExtension(CachesEndpoint endpoint) { return new CachesEndpointWebExtension(endpoint); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/ShutdownEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/ShutdownEndpointTests.java index d8b8ba1bc0..4802be2624 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/ShutdownEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/ShutdownEndpointTests.java @@ -89,20 +89,20 @@ class ShutdownEndpointTests { } @Configuration(proxyBeanMethods = false) - public static class EndpointConfig { + static class EndpointConfig { private final CountDownLatch latch = new CountDownLatch(1); private volatile ClassLoader threadContextClassLoader; @Bean - public ShutdownEndpoint endpoint() { + ShutdownEndpoint endpoint() { ShutdownEndpoint endpoint = new ShutdownEndpoint(); return endpoint; } @Bean - public ApplicationListener listener() { + ApplicationListener listener() { return (event) -> { EndpointConfig.this.threadContextClassLoader = Thread.currentThread().getContextClassLoader(); EndpointConfig.this.latch.countDown(); @@ -112,12 +112,12 @@ class ShutdownEndpointTests { } @Configuration(proxyBeanMethods = false) - public static class EmptyConfig { + static class EmptyConfig { private final CountDownLatch latch = new CountDownLatch(1); @Bean - public ApplicationListener listener() { + ApplicationListener listener() { return (event) -> EmptyConfig.this.latch.countDown(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java index 571457de8e..dddd6007f1 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java @@ -75,22 +75,22 @@ class ConfigurationPropertiesReportEndpointMethodAnnotationsTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - public static class Config { + static class Config { @Bean - public ConfigurationPropertiesReportEndpoint endpoint() { + ConfigurationPropertiesReportEndpoint endpoint() { return new ConfigurationPropertiesReportEndpoint(); } @Bean @ConfigurationProperties(prefix = "first") - public Foo foo() { + Foo foo() { return new Foo(); } @Bean @ConfigurationProperties(prefix = "other") - public Foo other() { + Foo other() { return new Foo(); } @@ -98,16 +98,16 @@ class ConfigurationPropertiesReportEndpointMethodAnnotationsTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - public static class OverriddenPrefix { + static class OverriddenPrefix { @Bean - public ConfigurationPropertiesReportEndpoint endpoint() { + ConfigurationPropertiesReportEndpoint endpoint() { return new ConfigurationPropertiesReportEndpoint(); } @Bean @ConfigurationProperties(prefix = "other") - public Bar bar() { + Bar bar() { return new Bar(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java index 3c3b35b7c3..52e9cae993 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java @@ -71,10 +71,10 @@ class ConfigurationPropertiesReportEndpointParentTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - public static class Parent { + static class Parent { @Bean - public TestProperties testProperties() { + TestProperties testProperties() { return new TestProperties(); } @@ -82,15 +82,15 @@ class ConfigurationPropertiesReportEndpointParentTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - public static class ClassConfigurationProperties { + static class ClassConfigurationProperties { @Bean - public ConfigurationPropertiesReportEndpoint endpoint() { + ConfigurationPropertiesReportEndpoint endpoint() { return new ConfigurationPropertiesReportEndpoint(); } @Bean - public TestProperties someProperties() { + TestProperties someProperties() { return new TestProperties(); } @@ -98,35 +98,35 @@ class ConfigurationPropertiesReportEndpointParentTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - public static class BeanMethodConfigurationProperties { + static class BeanMethodConfigurationProperties { @Bean - public ConfigurationPropertiesReportEndpoint endpoint() { + ConfigurationPropertiesReportEndpoint endpoint() { return new ConfigurationPropertiesReportEndpoint(); } @Bean @ConfigurationProperties(prefix = "other") - public OtherProperties otherProperties() { + OtherProperties otherProperties() { return new OtherProperties(); } } - public static class OtherProperties { + static class OtherProperties { } @ConfigurationProperties(prefix = "test") - public static class TestProperties { + static class TestProperties { private String myTestProperty = "654321"; - public String getMyTestProperty() { + String getMyTestProperty() { return this.myTestProperty; } - public void setMyTestProperty(String myTestProperty) { + void setMyTestProperty(String myTestProperty) { this.myTestProperty = myTestProperty; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointProxyTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointProxyTests.java index 9bf54902c9..9a1a3c46f1 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointProxyTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointProxyTests.java @@ -63,38 +63,38 @@ class ConfigurationPropertiesReportEndpointProxyTests { @Configuration(proxyBeanMethods = false) @EnableTransactionManagement(proxyTargetClass = false) @EnableConfigurationProperties - public static class Config { + static class Config { @Bean - public ConfigurationPropertiesReportEndpoint endpoint() { + ConfigurationPropertiesReportEndpoint endpoint() { return new ConfigurationPropertiesReportEndpoint(); } @Bean - public PlatformTransactionManager transactionManager(DataSource dataSource) { + PlatformTransactionManager transactionManager(DataSource dataSource) { return new DataSourceTransactionManager(dataSource); } @Bean - public DataSource dataSource() { + DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL).build(); } } - public interface Executor { + interface Executor { void execute(); } - public abstract static class AbstractExecutor implements Executor { + abstract static class AbstractExecutor implements Executor { } @Component @ConfigurationProperties("executor.sql") - public static class SqlExecutor extends AbstractExecutor { + static class SqlExecutor extends AbstractExecutor { @Override @Transactional(propagation = Propagation.REQUIRES_NEW) 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 fcedb9c411..531bfa2eb3 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 @@ -240,10 +240,10 @@ class ConfigurationPropertiesReportEndpointSerializationTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - public static class Base { + static class Base { @Bean - public ConfigurationPropertiesReportEndpoint endpoint() { + ConfigurationPropertiesReportEndpoint endpoint() { return new ConfigurationPropertiesReportEndpoint(); } @@ -251,11 +251,11 @@ class ConfigurationPropertiesReportEndpointSerializationTests { @Configuration(proxyBeanMethods = false) @Import(Base.class) - public static class FooConfig { + static class FooConfig { @Bean @ConfigurationProperties(prefix = "foo") - public Foo foo() { + Foo foo() { return new Foo(); } @@ -263,11 +263,11 @@ class ConfigurationPropertiesReportEndpointSerializationTests { @Configuration(proxyBeanMethods = false) @Import(Base.class) - public static class SelfReferentialConfig { + static class SelfReferentialConfig { @Bean @ConfigurationProperties(prefix = "foo") - public SelfReferential foo() { + SelfReferential foo() { return new SelfReferential(); } @@ -275,11 +275,11 @@ class ConfigurationPropertiesReportEndpointSerializationTests { @Configuration(proxyBeanMethods = false) @Import(Base.class) - public static class MetadataCycleConfig { + static class MetadataCycleConfig { @Bean @ConfigurationProperties(prefix = "bar") - public SelfReferential foo() { + SelfReferential foo() { return new SelfReferential(); } @@ -287,11 +287,11 @@ class ConfigurationPropertiesReportEndpointSerializationTests { @Configuration(proxyBeanMethods = false) @Import(Base.class) - public static class MapConfig { + static class MapConfig { @Bean @ConfigurationProperties(prefix = "foo") - public MapHolder foo() { + MapHolder foo() { return new MapHolder(); } @@ -299,11 +299,11 @@ class ConfigurationPropertiesReportEndpointSerializationTests { @Configuration(proxyBeanMethods = false) @Import(Base.class) - public static class ListConfig { + static class ListConfig { @Bean @ConfigurationProperties(prefix = "foo") - public ListHolder foo() { + ListHolder foo() { return new ListHolder(); } @@ -311,11 +311,11 @@ class ConfigurationPropertiesReportEndpointSerializationTests { @Configuration(proxyBeanMethods = false) @Import(Base.class) - public static class MetadataMapConfig { + static class MetadataMapConfig { @Bean @ConfigurationProperties(prefix = "spam") - public MapHolder foo() { + MapHolder foo() { return new MapHolder(); } @@ -323,11 +323,11 @@ class ConfigurationPropertiesReportEndpointSerializationTests { @Configuration(proxyBeanMethods = false) @Import(Base.class) - public static class AddressedConfig { + static class AddressedConfig { @Bean @ConfigurationProperties(prefix = "foo") - public Addressed foo() { + Addressed foo() { return new Addressed(); } @@ -335,11 +335,11 @@ class ConfigurationPropertiesReportEndpointSerializationTests { @Configuration(proxyBeanMethods = false) @Import(Base.class) - public static class InitializedMapAndListPropertiesConfig { + static class InitializedMapAndListPropertiesConfig { @Bean @ConfigurationProperties(prefix = "foo") - public InitializedMapAndListProperties foo() { + InitializedMapAndListProperties foo() { return new InitializedMapAndListProperties(); } @@ -464,7 +464,7 @@ class ConfigurationPropertiesReportEndpointSerializationTests { } - static class Cycle { + public static class Cycle { private final Alpha alpha = new Alpha(this); @@ -472,7 +472,7 @@ class ConfigurationPropertiesReportEndpointSerializationTests { return this.alpha; } - static class Alpha { + public static class Alpha { private final Cycle cycle; @@ -495,7 +495,7 @@ class ConfigurationPropertiesReportEndpointSerializationTests { @Bean // gh-11037 @ConfigurationProperties(prefix = "cycle") - public Cycle cycle() { + Cycle cycle() { return new Cycle(); } @@ -506,13 +506,13 @@ class ConfigurationPropertiesReportEndpointSerializationTests { static class HikariDataSourceConfig { @Bean - public ConfigurationPropertiesReportEndpoint endpoint() { + ConfigurationPropertiesReportEndpoint endpoint() { return new ConfigurationPropertiesReportEndpoint(); } @Bean @ConfigurationProperties(prefix = "test.datasource") - public HikariDataSource hikariDataSource() { + HikariDataSource hikariDataSource() { return new HikariDataSource(); } 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 ed3bbfd6cf..292de006e0 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 @@ -212,10 +212,10 @@ class ConfigurationPropertiesReportEndpointTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - public static class Parent { + static class Parent { @Bean - public TestProperties testProperties() { + TestProperties testProperties() { return new TestProperties(); } @@ -223,15 +223,15 @@ class ConfigurationPropertiesReportEndpointTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties - public static class Config { + static class Config { @Bean - public ConfigurationPropertiesReportEndpoint endpoint() { + ConfigurationPropertiesReportEndpoint endpoint() { return new ConfigurationPropertiesReportEndpoint(); } @Bean - public TestProperties testProperties() { + TestProperties testProperties() { return new TestProperties(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchHealthIndicatorTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchHealthIndicatorTests.java index c86cf309d0..7f49fa29bf 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchHealthIndicatorTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchHealthIndicatorTests.java @@ -210,7 +210,7 @@ class ElasticsearchHealthIndicatorTests { } - private static class TestActionFuture extends PlainActionFuture { + static class TestActionFuture extends PlainActionFuture { private long getTimeout = -1L; diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationMethodTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationMethodTests.java index 44baee6eee..0cbcd19b71 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationMethodTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationMethodTests.java @@ -53,7 +53,7 @@ class DiscoveredOperationMethodTests { assertThat(discovered.getProducesMediaTypes()).containsExactly("application/json"); } - public void example() { + void example() { } } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationsFactoryTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationsFactoryTests.java index 4e0c440de7..033c40d346 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationsFactoryTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationsFactoryTests.java @@ -128,7 +128,7 @@ class DiscoveredOperationsFactoryTests { static class ExampleRead { @ReadOperation - public String read() { + String read() { return "read"; } @@ -137,7 +137,7 @@ class DiscoveredOperationsFactoryTests { static class ExampleWrite { @WriteOperation - public String write() { + String write() { return "write"; } @@ -146,7 +146,7 @@ class DiscoveredOperationsFactoryTests { static class ExampleDelete { @DeleteOperation - public String delete() { + String delete() { return "delete"; } @@ -155,12 +155,12 @@ class DiscoveredOperationsFactoryTests { static class ExampleMultiple { @ReadOperation - public String read() { + String read() { return "read"; } @WriteOperation - public String write() { + String write() { return "write"; } @@ -169,7 +169,7 @@ class DiscoveredOperationsFactoryTests { static class ExampleWithParams { @ReadOperation - public String read(String name) { + String read(String name) { return name; } @@ -215,15 +215,15 @@ class DiscoveredOperationsFactoryTests { return invoker; } - public EndpointId getEndpointId() { + EndpointId getEndpointId() { return this.endpointId; } - public OperationType getOperationType() { + OperationType getOperationType() { return this.operationType; } - public OperationParameters getParameters() { + OperationParameters getParameters() { return this.parameters; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java index 6e5734d8be..7b26846eeb 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java @@ -331,7 +331,7 @@ class EndpointDiscovererTests { static class TestEndpointConfiguration { @Bean - public TestEndpoint testEndpoint() { + TestEndpoint testEndpoint() { return new TestEndpoint(); } @@ -341,7 +341,7 @@ class EndpointDiscovererTests { static class TestEndpointSubclassConfiguration { @Bean - public TestEndpointSubclass testEndpointSubclass() { + TestEndpointSubclass testEndpointSubclass() { return new TestEndpointSubclass(); } @@ -351,12 +351,12 @@ class EndpointDiscovererTests { static class ClashingEndpointConfiguration { @Bean - public TestEndpoint testEndpointTwo() { + TestEndpoint testEndpointTwo() { return new TestEndpoint(); } @Bean - public TestEndpoint testEndpointOne() { + TestEndpoint testEndpointOne() { return new TestEndpoint(); } @@ -366,12 +366,12 @@ class EndpointDiscovererTests { static class ScopedTargetEndpointConfiguration { @Bean - public TestEndpoint testEndpoint() { + TestEndpoint testEndpoint() { return new TestEndpoint(); } @Bean(name = "scopedTarget.testEndpoint") - public TestEndpoint scopedTargetTestEndpoint() { + TestEndpoint scopedTargetTestEndpoint() { return new TestEndpoint(); } @@ -391,26 +391,26 @@ class EndpointDiscovererTests { static class TestEndpoint { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @ReadOperation - public Object getOne(@Selector String id) { + Object getOne(@Selector String id) { return null; } @WriteOperation - public void update(String foo, String bar) { + void update(String foo, String bar) { } @DeleteOperation - public void deleteOne(@Selector String id) { + void deleteOne(@Selector String id) { } - public void someOtherMethod() { + void someOtherMethod() { } @@ -419,7 +419,7 @@ class EndpointDiscovererTests { static class TestEndpointSubclass extends TestEndpoint { @WriteOperation - public void updateWithMoreArguments(String foo, String bar, String baz) { + void updateWithMoreArguments(String foo, String bar, String baz) { } @@ -430,7 +430,7 @@ class EndpointDiscovererTests { @Documented @Endpoint @FilteredEndpoint(SpecializedEndpointFilter.class) - public @interface SpecializedEndpoint { + @interface SpecializedEndpoint { @AliasFor(annotation = Endpoint.class) String id(); @@ -438,10 +438,10 @@ class EndpointDiscovererTests { } @EndpointExtension(endpoint = SpecializedTestEndpoint.class, filter = SpecializedEndpointFilter.class) - public static class SpecializedExtension { + static class SpecializedExtension { @ReadOperation - public Object getSpecial() { + Object getSpecial() { return null; } @@ -459,7 +459,7 @@ class EndpointDiscovererTests { static class SpecializedTestEndpoint { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @@ -468,7 +468,7 @@ class EndpointDiscovererTests { static class SubSpecializedTestEndpoint extends SpecializedTestEndpoint { @ReadOperation - public Object getSpecialOne(@Selector String id) { + Object getSpecialOne(@Selector String id) { return null; } @@ -575,7 +575,7 @@ class EndpointDiscovererTests { this.invoker = invoker; } - public OperationInvoker getInvoker() { + OperationInvoker getInvoker() { return this.invoker; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoke/convert/ConversionServiceParameterValueMapperTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoke/convert/ConversionServiceParameterValueMapperTests.java index 726d297804..3b82e15475 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoke/convert/ConversionServiceParameterValueMapperTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoke/convert/ConversionServiceParameterValueMapperTests.java @@ -81,7 +81,7 @@ class ConversionServiceParameterValueMapperTests { .mapParameterValue(new TestOperationParameter(OffsetDateTime.class), "2011-12-03T10:15:30+01:00")); } - private static class TestOperationParameter implements OperationParameter { + static class TestOperationParameter implements OperationParameter { private final Class type; diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvokerAdvisorTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvokerAdvisorTests.java index c4519da2d2..9ac20f5da6 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvokerAdvisorTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvokerAdvisorTests.java @@ -134,21 +134,21 @@ class CachingOperationInvokerAdvisorTests { return new OperationMethod(method, OperationType.READ); } - public static class TestOperations { + static class TestOperations { - public String get() { + String get() { return ""; } - public String getWithParameters(@Nullable String foo, String bar) { + String getWithParameters(@Nullable String foo, String bar) { return ""; } - public String getWithAllOptionalParameters(@Nullable String foo, @Nullable String bar) { + String getWithAllOptionalParameters(@Nullable String foo, @Nullable String bar) { return ""; } - public String getWithSecurityContext(SecurityContext securityContext, @Nullable String bar) { + String getWithSecurityContext(SecurityContext securityContext, @Nullable String bar) { return ""; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/JmxEndpointExporterTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/JmxEndpointExporterTests.java index 4468c4a575..c9a102ddb4 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/JmxEndpointExporterTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/JmxEndpointExporterTests.java @@ -170,7 +170,7 @@ class JmxEndpointExporterTests { /** * Test {@link EndpointObjectNameFactory}. */ - private static class TestEndpointObjectNameFactory implements EndpointObjectNameFactory { + static class TestEndpointObjectNameFactory implements EndpointObjectNameFactory { @Override public ObjectName getObjectName(ExposableJmxEndpoint endpoint) throws MalformedObjectNameException { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java index c6dc8be888..13a21ba845 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java @@ -281,17 +281,17 @@ class JmxEndpointDiscovererTests { static class MultipleEndpointsConfiguration { @Bean - public TestEndpoint testEndpoint() { + TestEndpoint testEndpoint() { return new TestEndpoint(); } @Bean - public TestJmxEndpoint testJmxEndpoint() { + TestJmxEndpoint testJmxEndpoint() { return new TestJmxEndpoint(); } @Bean - public NonJmxEndpoint nonJmxEndpoint() { + NonJmxEndpoint nonJmxEndpoint() { return new NonJmxEndpoint(); } @@ -301,12 +301,12 @@ class JmxEndpointDiscovererTests { static class OverriddenOperationJmxEndpointConfiguration { @Bean - public TestEndpoint testEndpoint() { + TestEndpoint testEndpoint() { return new TestEndpoint(); } @Bean - public TestJmxEndpointExtension testJmxEndpointExtension() { + TestJmxEndpointExtension testJmxEndpointExtension() { return new TestJmxEndpointExtension(); } @@ -316,12 +316,12 @@ class JmxEndpointDiscovererTests { static class AdditionalOperationJmxEndpointConfiguration { @Bean - public TestEndpoint testEndpoint() { + TestEndpoint testEndpoint() { return new TestEndpoint(); } @Bean - public AdditionalOperationJmxEndpointExtension additionalOperationJmxEndpointExtension() { + AdditionalOperationJmxEndpointExtension additionalOperationJmxEndpointExtension() { return new AdditionalOperationJmxEndpointExtension(); } @@ -331,12 +331,12 @@ class JmxEndpointDiscovererTests { static class AdditionalClashingOperationsConfiguration { @Bean - public TestEndpoint testEndpoint() { + TestEndpoint testEndpoint() { return new TestEndpoint(); } @Bean - public ClashingOperationsJmxEndpointExtension clashingOperationsJmxEndpointExtension() { + ClashingOperationsJmxEndpointExtension clashingOperationsJmxEndpointExtension() { return new ClashingOperationsJmxEndpointExtension(); } @@ -346,17 +346,17 @@ class JmxEndpointDiscovererTests { static class ClashingJmxEndpointConfiguration { @Bean - public TestEndpoint testEndpoint() { + TestEndpoint testEndpoint() { return new TestEndpoint(); } @Bean - public TestJmxEndpointExtension testExtensionOne() { + TestJmxEndpointExtension testExtensionOne() { return new TestJmxEndpointExtension(); } @Bean - public TestJmxEndpointExtension testExtensionTwo() { + TestJmxEndpointExtension testExtensionTwo() { return new TestJmxEndpointExtension(); } @@ -366,12 +366,12 @@ class JmxEndpointDiscovererTests { static class ClashingStandardEndpointConfiguration { @Bean - public TestEndpoint testEndpointTwo() { + TestEndpoint testEndpointTwo() { return new TestEndpoint(); } @Bean - public TestEndpoint testEndpointOne() { + TestEndpoint testEndpointOne() { return new TestEndpoint(); } @@ -381,58 +381,58 @@ class JmxEndpointDiscovererTests { static class InvalidJmxExtensionConfiguration { @Bean - public NonJmxEndpoint nonJmxEndpoint() { + NonJmxEndpoint nonJmxEndpoint() { return new NonJmxEndpoint(); } @Bean - public NonJmxJmxEndpointExtension nonJmxJmxEndpointExtension() { + NonJmxJmxEndpointExtension nonJmxJmxEndpointExtension() { return new NonJmxJmxEndpointExtension(); } } @Endpoint(id = "test") - private static class TestEndpoint { + static class TestEndpoint { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @ReadOperation - public String getSomething(TimeUnit timeUnit) { + String getSomething(TimeUnit timeUnit) { return null; } @WriteOperation - public void update(String foo, String bar) { + void update(String foo, String bar) { } @DeleteOperation - public void deleteSomething(TimeUnit timeUnit) { + void deleteSomething(TimeUnit timeUnit) { } } @JmxEndpoint(id = "jmx") - private static class TestJmxEndpoint { + static class TestJmxEndpoint { @ReadOperation - public Object getAll() { + Object getAll() { return null; } } @EndpointJmxExtension(endpoint = TestEndpoint.class) - private static class TestJmxEndpointExtension { + static class TestJmxEndpointExtension { @ManagedOperation(description = "Get all the things") @ReadOperation - public Object getAll() { + Object getAll() { return null; } @@ -440,7 +440,7 @@ class JmxEndpointDiscovererTests { @ManagedOperation(description = "Get something based on a timeUnit") @ManagedOperationParameters({ @ManagedOperationParameter(name = "unitMs", description = "Number of milliseconds") }) - public String getSomething(Long timeUnit) { + String getSomething(Long timeUnit) { return null; } @@ -448,7 +448,7 @@ class JmxEndpointDiscovererTests { @ManagedOperation(description = "Update something based on bar") @ManagedOperationParameters({ @ManagedOperationParameter(name = "foo", description = "Foo identifier"), @ManagedOperationParameter(name = "bar", description = "Bar value") }) - public void update(String foo, String bar) { + void update(String foo, String bar) { } @@ -456,18 +456,18 @@ class JmxEndpointDiscovererTests { @ManagedOperation(description = "Delete something based on a timeUnit") @ManagedOperationParameters({ @ManagedOperationParameter(name = "unitMs", description = "Number of milliseconds") }) - public void deleteSomething(Long timeUnit) { + void deleteSomething(Long timeUnit) { } } @EndpointJmxExtension(endpoint = TestEndpoint.class) - private static class AdditionalOperationJmxEndpointExtension { + static class AdditionalOperationJmxEndpointExtension { @ManagedOperation(description = "Get another thing") @ReadOperation - public Object getAnother() { + Object getAnother() { return null; } @@ -477,12 +477,12 @@ class JmxEndpointDiscovererTests { static class ClashingOperationsEndpoint { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @ReadOperation - public Object getAll(String param) { + Object getAll(String param) { return null; } @@ -492,32 +492,32 @@ class JmxEndpointDiscovererTests { static class ClashingOperationsJmxEndpointExtension { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @ReadOperation - public Object getAll(String param) { + Object getAll(String param) { return null; } } @WebEndpoint(id = "nonjmx") - private static class NonJmxEndpoint { + static class NonJmxEndpoint { @ReadOperation - public Object getData() { + Object getData() { return null; } } @EndpointJmxExtension(endpoint = NonJmxEndpoint.class) - private static class NonJmxJmxEndpointExtension { + static class NonJmxJmxEndpointExtension { @ReadOperation - public Object getSomething() { + Object getSomething() { return null; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/EndpointServletTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/EndpointServletTests.java index df1568b11b..ae9a1c276f 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/EndpointServletTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/EndpointServletTests.java @@ -134,7 +134,7 @@ class EndpointServletTests { assertThat(endpointServlet.getLoadOnStartup()).isEqualTo(3); } - private static class TestServlet extends GenericServlet { + static class TestServlet extends GenericServlet { @Override public void service(ServletRequest req, ServletResponse res) { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/PathMappedEndpointsTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/PathMappedEndpointsTests.java index 8ff649d4e9..fa13f1e7a3 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/PathMappedEndpointsTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/PathMappedEndpointsTests.java @@ -137,11 +137,11 @@ class PathMappedEndpointsTests { return endpoint; } - interface TestEndpoint extends ExposableEndpoint { + public interface TestEndpoint extends ExposableEndpoint { } - interface TestPathMappedEndpoint extends ExposableEndpoint, PathMappedEndpoint { + public interface TestPathMappedEndpoint extends ExposableEndpoint, PathMappedEndpoint { } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrarTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrarTests.java index aa3594ccd3..861293c57d 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrarTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrarTests.java @@ -134,7 +134,7 @@ class ServletEndpointRegistrarTests { return endpoint; } - public static class TestServlet extends GenericServlet { + static class TestServlet extends GenericServlet { @Override public void service(ServletRequest req, ServletResponse res) { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/AbstractWebEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/AbstractWebEndpointIntegrationTests.java index 3d034bfd52..fe22a6ea2a 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/AbstractWebEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/AbstractWebEndpointIntegrationTests.java @@ -423,7 +423,7 @@ public abstract class AbstractWebEndpointIntegrationTests readAll() { + Map readAll() { return Collections.singletonMap("All", true); } @ReadOperation - public Map readPart(@Selector String part) { + Map readPart(@Selector String part) { return Collections.singletonMap("part", part); } @WriteOperation - public void write(@Nullable String foo, @Nullable String bar) { + void write(@Nullable String foo, @Nullable String bar) { this.endpointDelegate.write(foo, bar); } @DeleteOperation - public Map deletePart(@Selector String part) { + Map deletePart(@Selector String part) { return Collections.singletonMap("part", part); } @@ -629,12 +629,12 @@ public abstract class AbstractWebEndpointIntegrationTests query(String one, Integer two) { + Map query(String one, Integer two) { return Collections.singletonMap("query", one + " " + two); } @ReadOperation - public Map queryWithParameterList(@Selector String list, String one, List two) { + Map queryWithParameterList(@Selector String list, String one, List two) { return Collections.singletonMap("query", list + " " + one + " " + two); } @@ -644,7 +644,7 @@ public abstract class AbstractWebEndpointIntegrationTests queryWithParameterList(String one, List two) { + Map queryWithParameterList(String one, List two) { return Collections.singletonMap("query", one + " " + two); } @@ -660,7 +660,7 @@ public abstract class AbstractWebEndpointIntegrationTests read() { + WebEndpointResponse read() { return new WebEndpointResponse<>(new ByteArrayResource(new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }), 200); } @@ -753,7 +753,7 @@ public abstract class AbstractWebEndpointIntegrationTests mediaTypes = Arrays.asList("application/vnd.test+json", "application/json"); return new EndpointMediaTypes(mediaTypes, mediaTypes); } @Bean - public WebEndpointDiscoverer webEndpointDiscoverer(EndpointMediaTypes endpointMediaTypes, + WebEndpointDiscoverer webEndpointDiscoverer(EndpointMediaTypes endpointMediaTypes, ApplicationContext applicationContext) { ParameterValueMapper parameterMapper = new ConversionServiceParameterValueMapper( DefaultConversionService.getSharedInstance()); @@ -70,7 +70,7 @@ class BaseConfiguration { } @Bean - public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { + PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { return new PropertySourcesPlaceholderConfigurer(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointDiscovererTests.java index eff9298e38..cf62b73c65 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointDiscovererTests.java @@ -178,7 +178,7 @@ class ControllerEndpointDiscovererTests { static class TestControllerWithOperation { @ReadOperation - public String read() { + String read() { return "error"; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpointDiscovererTests.java index 9c169d2290..7bb6ff9aec 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpointDiscovererTests.java @@ -186,13 +186,13 @@ class ServletEndpointDiscovererTests { } @ReadOperation - public String read() { + String read() { return "error"; } } - private static class TestServlet extends GenericServlet { + static class TestServlet extends GenericServlet { @Override public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscovererTests.java index da985443be..4969e8f87f 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscovererTests.java @@ -271,12 +271,12 @@ class WebEndpointDiscovererTests { static class MultipleEndpointsConfiguration { @Bean - public TestEndpoint testEndpoint() { + TestEndpoint testEndpoint() { return new TestEndpoint(); } @Bean - public NonWebEndpoint nonWebEndpoint() { + NonWebEndpoint nonWebEndpoint() { return new NonWebEndpoint(); } @@ -286,7 +286,7 @@ class WebEndpointDiscovererTests { static class TestWebEndpointExtensionConfiguration { @Bean - public TestWebEndpointExtension endpointExtension() { + TestWebEndpointExtension endpointExtension() { return new TestWebEndpointExtension(); } @@ -296,7 +296,7 @@ class WebEndpointDiscovererTests { static class ClashingOperationsEndpointConfiguration { @Bean - public ClashingOperationsEndpoint clashingOperationsEndpoint() { + ClashingOperationsEndpoint clashingOperationsEndpoint() { return new ClashingOperationsEndpoint(); } @@ -306,7 +306,7 @@ class WebEndpointDiscovererTests { static class ClashingOperationsWebEndpointExtensionConfiguration { @Bean - public ClashingOperationsWebEndpointExtension clashingOperationsExtension() { + ClashingOperationsWebEndpointExtension clashingOperationsExtension() { return new ClashingOperationsWebEndpointExtension(); } @@ -317,7 +317,7 @@ class WebEndpointDiscovererTests { static class OverriddenOperationWebEndpointExtensionConfiguration { @Bean - public OverriddenOperationWebEndpointExtension overriddenOperationExtension() { + OverriddenOperationWebEndpointExtension overriddenOperationExtension() { return new OverriddenOperationWebEndpointExtension(); } @@ -328,7 +328,7 @@ class WebEndpointDiscovererTests { static class AdditionalOperationWebEndpointConfiguration { @Bean - public AdditionalOperationWebEndpointExtension additionalOperationExtension() { + AdditionalOperationWebEndpointExtension additionalOperationExtension() { return new AdditionalOperationWebEndpointExtension(); } @@ -338,7 +338,7 @@ class WebEndpointDiscovererTests { static class TestEndpointConfiguration { @Bean - public TestEndpoint testEndpoint() { + TestEndpoint testEndpoint() { return new TestEndpoint(); } @@ -348,17 +348,17 @@ class WebEndpointDiscovererTests { static class ClashingWebEndpointConfiguration { @Bean - public TestEndpoint testEndpoint() { + TestEndpoint testEndpoint() { return new TestEndpoint(); } @Bean - public TestWebEndpointExtension testExtensionOne() { + TestWebEndpointExtension testExtensionOne() { return new TestWebEndpointExtension(); } @Bean - public TestWebEndpointExtension testExtensionTwo() { + TestWebEndpointExtension testExtensionTwo() { return new TestWebEndpointExtension(); } @@ -368,12 +368,12 @@ class WebEndpointDiscovererTests { static class ClashingStandardEndpointConfiguration { @Bean - public TestEndpoint testEndpointTwo() { + TestEndpoint testEndpointTwo() { return new TestEndpoint(); } @Bean - public TestEndpoint testEndpointOne() { + TestEndpoint testEndpointOne() { return new TestEndpoint(); } @@ -383,12 +383,12 @@ class WebEndpointDiscovererTests { static class ClashingSelectorsWebEndpointExtensionConfiguration { @Bean - public TestEndpoint testEndpoint() { + TestEndpoint testEndpoint() { return new TestEndpoint(); } @Bean - public ClashingSelectorsWebEndpointExtension clashingSelectorsExtension() { + ClashingSelectorsWebEndpointExtension clashingSelectorsExtension() { return new ClashingSelectorsWebEndpointExtension(); } @@ -398,12 +398,12 @@ class WebEndpointDiscovererTests { static class InvalidWebExtensionConfiguration { @Bean - public NonWebEndpoint nonWebEndpoint() { + NonWebEndpoint nonWebEndpoint() { return new NonWebEndpoint(); } @Bean - public NonWebWebEndpointExtension nonWebWebEndpointExtension() { + NonWebWebEndpointExtension nonWebWebEndpointExtension() { return new NonWebWebEndpointExtension(); } @@ -413,7 +413,7 @@ class WebEndpointDiscovererTests { static class VoidWriteOperationEndpointConfiguration { @Bean - public VoidWriteOperationEndpoint voidWriteOperationEndpoint() { + VoidWriteOperationEndpoint voidWriteOperationEndpoint() { return new VoidWriteOperationEndpoint(); } @@ -424,7 +424,7 @@ class WebEndpointDiscovererTests { static class ResourceEndpointConfiguration { @Bean - public ResourceEndpoint resourceEndpoint() { + ResourceEndpoint resourceEndpoint() { return new ResourceEndpoint(); } @@ -435,7 +435,7 @@ class WebEndpointDiscovererTests { static class CustomMediaTypesEndpointConfiguration { @Bean - public CustomMediaTypesEndpoint customMediaTypesEndpoint() { + CustomMediaTypesEndpoint customMediaTypesEndpoint() { return new CustomMediaTypesEndpoint(); } @@ -445,21 +445,21 @@ class WebEndpointDiscovererTests { static class TestWebEndpointExtension { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @ReadOperation - public Object getOne(@Selector String id) { + Object getOne(@Selector String id) { return null; } @WriteOperation - public void update(String foo, String bar) { + void update(String foo, String bar) { } - public void someOtherMethod() { + void someOtherMethod() { } @@ -469,7 +469,7 @@ class WebEndpointDiscovererTests { static class TestEndpoint { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @@ -479,7 +479,7 @@ class WebEndpointDiscovererTests { static class OverriddenOperationWebEndpointExtension { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @@ -489,7 +489,7 @@ class WebEndpointDiscovererTests { static class AdditionalOperationWebEndpointExtension { @ReadOperation - public Object getOne(@Selector String id) { + Object getOne(@Selector String id) { return null; } @@ -499,12 +499,12 @@ class WebEndpointDiscovererTests { static class ClashingOperationsEndpoint { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @ReadOperation - public Object getAgain() { + Object getAgain() { return null; } @@ -514,12 +514,12 @@ class WebEndpointDiscovererTests { static class ClashingOperationsWebEndpointExtension { @ReadOperation - public Object getAll() { + Object getAll() { return null; } @ReadOperation - public Object getAgain() { + Object getAgain() { return null; } @@ -529,12 +529,12 @@ class WebEndpointDiscovererTests { static class ClashingSelectorsWebEndpointExtension { @ReadOperation - public Object readOne(@Selector String oneA, @Selector String oneB) { + Object readOne(@Selector String oneA, @Selector String oneB) { return null; } @ReadOperation - public Object readTwo(@Selector String twoA, @Selector String twoB) { + Object readTwo(@Selector String twoA, @Selector String twoB) { return null; } @@ -544,7 +544,7 @@ class WebEndpointDiscovererTests { static class NonWebEndpoint { @ReadOperation - public Object getData() { + Object getData() { return null; } @@ -554,7 +554,7 @@ class WebEndpointDiscovererTests { static class NonWebWebEndpointExtension { @ReadOperation - public Object getSomething(@Selector String name) { + Object getSomething(@Selector String name) { return null; } @@ -564,7 +564,7 @@ class WebEndpointDiscovererTests { static class VoidWriteOperationEndpoint { @WriteOperation - public void write(String foo, String bar) { + void write(String foo, String bar) { } } @@ -573,7 +573,7 @@ class WebEndpointDiscovererTests { static class ResourceEndpoint { @ReadOperation - public Resource read() { + Resource read() { return new ByteArrayResource(new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }); } @@ -583,18 +583,18 @@ class WebEndpointDiscovererTests { static class CustomMediaTypesEndpoint { @ReadOperation(produces = "text/plain") - public String read() { + String read() { return "read"; } @WriteOperation(produces = { "a/b", "c/d" }) - public String write() { + String write() { return "write"; } @DeleteOperation(produces = "text/plain") - public String delete() { + String delete() { return "delete"; } @@ -614,12 +614,12 @@ class WebEndpointDiscovererTests { this.path = path; } - public RequestPredicateMatcher produces(String... mediaTypes) { + RequestPredicateMatcher produces(String... mediaTypes) { this.produces = Arrays.asList(mediaTypes); return this; } - public RequestPredicateMatcher consumes(String... mediaTypes) { + RequestPredicateMatcher consumes(String... mediaTypes) { this.consumes = Arrays.asList(mediaTypes); return this; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/jersey/JerseyWebEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/jersey/JerseyWebEndpointIntegrationTests.java index d5e63ca99e..a3c7b90766 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/jersey/JerseyWebEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/jersey/JerseyWebEndpointIntegrationTests.java @@ -93,17 +93,17 @@ public class JerseyWebEndpointIntegrationTests static class JerseyConfiguration { @Bean - public TomcatServletWebServerFactory tomcat() { + TomcatServletWebServerFactory tomcat() { return new TomcatServletWebServerFactory(0); } @Bean - public ServletRegistrationBean servletContainer(ResourceConfig resourceConfig) { + ServletRegistrationBean servletContainer(ResourceConfig resourceConfig) { return new ServletRegistrationBean<>(new ServletContainer(resourceConfig), "/*"); } @Bean - public ResourceConfig resourceConfig(Environment environment, WebEndpointDiscoverer endpointDiscoverer, + ResourceConfig resourceConfig(Environment environment, WebEndpointDiscoverer endpointDiscoverer, EndpointMediaTypes endpointMediaTypes) { ResourceConfig resourceConfig = new ResourceConfig(); Collection resources = new JerseyEndpointResourceFactory().createEndpointResources( @@ -121,7 +121,7 @@ public class JerseyWebEndpointIntegrationTests static class AuthenticatedConfiguration { @Bean - public Filter securityFilter() { + Filter securityFilter() { return new OncePerRequestFilter() { @Override diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMappingIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMappingIntegrationTests.java index 3c7c04aee4..d074d8797d 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMappingIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMappingIntegrationTests.java @@ -107,23 +107,22 @@ class ControllerEndpointHandlerMappingIntegrationTests { static class EndpointConfiguration { @Bean - public NettyReactiveWebServerFactory netty() { + NettyReactiveWebServerFactory netty() { return new NettyReactiveWebServerFactory(0); } @Bean - public HttpHandler httpHandler(ApplicationContext applicationContext) { + HttpHandler httpHandler(ApplicationContext applicationContext) { return WebHttpHandlerBuilder.applicationContext(applicationContext).build(); } @Bean - public ControllerEndpointDiscoverer webEndpointDiscoverer(ApplicationContext applicationContext) { + ControllerEndpointDiscoverer webEndpointDiscoverer(ApplicationContext applicationContext) { return new ControllerEndpointDiscoverer(applicationContext, null, Collections.emptyList()); } @Bean - public ControllerEndpointHandlerMapping webEndpointHandlerMapping( - ControllerEndpointsSupplier endpointsSupplier) { + ControllerEndpointHandlerMapping webEndpointHandlerMapping(ControllerEndpointsSupplier endpointsSupplier) { return new ControllerEndpointHandlerMapping(new EndpointMapping("actuator"), endpointsSupplier.getEndpoints(), null); } @@ -131,15 +130,15 @@ class ControllerEndpointHandlerMappingIntegrationTests { } @RestControllerEndpoint(id = "example") - public static class ExampleWebFluxEndpoint { + static class ExampleWebFluxEndpoint { @GetMapping(path = "one", produces = MediaType.TEXT_PLAIN_VALUE) - public String one() { + String one() { return "One"; } @PostMapping("/two") - public ResponseEntity two(@RequestBody Map content) { + ResponseEntity two(@RequestBody Map content) { return ResponseEntity.created(URI.create("/example/" + content.get("id"))).build(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMappingTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMappingTests.java index 3b218cacad..23d0161b2a 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMappingTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMappingTests.java @@ -133,30 +133,30 @@ class ControllerEndpointHandlerMappingTests { } @ControllerEndpoint(id = "first") - private static class FirstTestMvcEndpoint { + static class FirstTestMvcEndpoint { @GetMapping("/") - public String get() { + String get() { return "test"; } } @ControllerEndpoint(id = "second") - private static class SecondTestMvcEndpoint { + static class SecondTestMvcEndpoint { @PostMapping("/") - public void save() { + void save() { } } @ControllerEndpoint(id = "pathless") - private static class PathlessControllerEndpoint { + static class PathlessControllerEndpoint { @GetMapping - public String get() { + String get() { return "test"; } 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 4108fb6550..4b5637dab9 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 @@ -107,17 +107,17 @@ class WebFluxEndpointIntegrationTests private int port; @Bean - public NettyReactiveWebServerFactory netty() { + NettyReactiveWebServerFactory netty() { return new NettyReactiveWebServerFactory(0); } @Bean - public HttpHandler httpHandler(ApplicationContext applicationContext) { + HttpHandler httpHandler(ApplicationContext applicationContext) { return WebHttpHandlerBuilder.applicationContext(applicationContext).build(); } @Bean - public WebFluxEndpointHandlerMapping webEndpointHandlerMapping(Environment environment, + WebFluxEndpointHandlerMapping webEndpointHandlerMapping(Environment environment, WebEndpointDiscoverer endpointDiscoverer, EndpointMediaTypes endpointMediaTypes) { CorsConfiguration corsConfiguration = new CorsConfiguration(); corsConfiguration.setAllowedOrigins(Arrays.asList("https://example.com")); @@ -128,7 +128,7 @@ class WebFluxEndpointIntegrationTests } @Bean - public ApplicationListener serverInitializedListener() { + ApplicationListener serverInitializedListener() { return (event) -> this.port = event.getWebServer().getPort(); } @@ -138,7 +138,7 @@ class WebFluxEndpointIntegrationTests static class AuthenticatedConfiguration { @Bean - public WebFilter webFilter() { + WebFilter webFilter() { return (exchange, chain) -> chain.filter(exchange).subscriberContext( ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("Alice", "secret", Arrays.asList(new SimpleGrantedAuthority("ROLE_ACTUATOR"))))); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMappingIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMappingIntegrationTests.java index 6a87ab9e17..5f9d03922c 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMappingIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMappingIntegrationTests.java @@ -105,18 +105,17 @@ class ControllerEndpointHandlerMappingIntegrationTests { static class EndpointConfiguration { @Bean - public TomcatServletWebServerFactory tomcat() { + TomcatServletWebServerFactory tomcat() { return new TomcatServletWebServerFactory(0); } @Bean - public ControllerEndpointDiscoverer webEndpointDiscoverer(ApplicationContext applicationContext) { + ControllerEndpointDiscoverer webEndpointDiscoverer(ApplicationContext applicationContext) { return new ControllerEndpointDiscoverer(applicationContext, null, Collections.emptyList()); } @Bean - public ControllerEndpointHandlerMapping webEndpointHandlerMapping( - ControllerEndpointsSupplier endpointsSupplier) { + ControllerEndpointHandlerMapping webEndpointHandlerMapping(ControllerEndpointsSupplier endpointsSupplier) { return new ControllerEndpointHandlerMapping(new EndpointMapping("actuator"), endpointsSupplier.getEndpoints(), null); } @@ -124,15 +123,15 @@ class ControllerEndpointHandlerMappingIntegrationTests { } @RestControllerEndpoint(id = "example") - public static class ExampleMvcEndpoint { + static class ExampleMvcEndpoint { @GetMapping(path = "one", produces = MediaType.TEXT_PLAIN_VALUE) - public String one() { + String one() { return "One"; } @PostMapping("/two") - public ResponseEntity two(@RequestBody Map content) { + ResponseEntity two(@RequestBody Map content) { return ResponseEntity.created(URI.create("/example/" + content.get("id"))).build(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMappingTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMappingTests.java index 41462ceca4..f0fae4c17a 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMappingTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMappingTests.java @@ -127,30 +127,30 @@ class ControllerEndpointHandlerMappingTests { } @ControllerEndpoint(id = "first") - private static class FirstTestMvcEndpoint { + static class FirstTestMvcEndpoint { @GetMapping("/") - public String get() { + String get() { return "test"; } } @ControllerEndpoint(id = "second") - private static class SecondTestMvcEndpoint { + static class SecondTestMvcEndpoint { @PostMapping("/") - public void save() { + void save() { } } @ControllerEndpoint(id = "pathless") - private static class PathlessControllerEndpoint { + static class PathlessControllerEndpoint { @GetMapping - public String get() { + String get() { return "test"; } 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 6dfdd85732..84f82b400a 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 @@ -135,12 +135,12 @@ class MvcWebEndpointIntegrationTests static class WebMvcConfiguration { @Bean - public TomcatServletWebServerFactory tomcat() { + TomcatServletWebServerFactory tomcat() { return new TomcatServletWebServerFactory(0); } @Bean - public WebMvcEndpointHandlerMapping webEndpointHandlerMapping(Environment environment, + WebMvcEndpointHandlerMapping webEndpointHandlerMapping(Environment environment, WebEndpointDiscoverer endpointDiscoverer, EndpointMediaTypes endpointMediaTypes) { CorsConfiguration corsConfiguration = new CorsConfiguration(); corsConfiguration.setAllowedOrigins(Arrays.asList("https://example.com")); @@ -156,7 +156,7 @@ class MvcWebEndpointIntegrationTests static class AuthenticatedConfiguration { @Bean - public Filter securityFilter() { + Filter securityFilter() { return new OncePerRequestFilter() { @Override diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/PortHolder.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/PortHolder.java index 68180e4f5f..bb9ead658c 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/PortHolder.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/PortHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package org.springframework.boot.actuate.endpoint.web.test; -class PortHolder { +public class PortHolder { private int port; diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTestInvocationContextProvider.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTestInvocationContextProvider.java index 5589d9c651..8886f5f7c5 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTestInvocationContextProvider.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointTestInvocationContextProvider.java @@ -127,7 +127,7 @@ class WebEndpointTestInvocationContextProvider implements TestTemplateInvocation } - private static class WebEndpointsInvocationContext + static class WebEndpointsInvocationContext implements TestTemplateInvocationContext, BeforeEachCallback, AfterEachCallback, ParameterResolver { private static final Duration TIMEOUT = Duration.ofMinutes(6); @@ -219,17 +219,17 @@ class WebEndpointTestInvocationContextProvider implements TestTemplateInvocation } @Bean - public TomcatServletWebServerFactory tomcat() { + TomcatServletWebServerFactory tomcat() { return new TomcatServletWebServerFactory(0); } @Bean - public ResourceConfig resourceConfig() { + ResourceConfig resourceConfig() { return new ResourceConfig(); } @Bean - public ResourceConfigCustomizer webEndpointRegistrar() { + ResourceConfigCustomizer webEndpointRegistrar() { return this::customize; } @@ -261,12 +261,12 @@ class WebEndpointTestInvocationContextProvider implements TestTemplateInvocation } @Bean - public NettyReactiveWebServerFactory netty() { + NettyReactiveWebServerFactory netty() { return new NettyReactiveWebServerFactory(0); } @Bean - public PortHolder portHolder() { + PortHolder portHolder() { return this.portHolder; } @@ -276,12 +276,12 @@ class WebEndpointTestInvocationContextProvider implements TestTemplateInvocation } @Bean - public HttpHandler httpHandler(ApplicationContext applicationContext) { + HttpHandler httpHandler(ApplicationContext applicationContext) { return WebHttpHandlerBuilder.applicationContext(applicationContext).build(); } @Bean - public WebFluxEndpointHandlerMapping webEndpointReactiveHandlerMapping() { + WebFluxEndpointHandlerMapping webEndpointReactiveHandlerMapping() { List mediaTypes = Arrays.asList(MediaType.APPLICATION_JSON_VALUE, ActuatorMediaType.V2_JSON); EndpointMediaTypes endpointMediaTypes = new EndpointMediaTypes(mediaTypes, mediaTypes); WebEndpointDiscoverer discoverer = new WebEndpointDiscoverer(this.applicationContext, @@ -305,12 +305,12 @@ class WebEndpointTestInvocationContextProvider implements TestTemplateInvocation } @Bean - public TomcatServletWebServerFactory tomcat() { + TomcatServletWebServerFactory tomcat() { return new TomcatServletWebServerFactory(0); } @Bean - public WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping() { + WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping() { List mediaTypes = Arrays.asList(MediaType.APPLICATION_JSON_VALUE, ActuatorMediaType.V2_JSON); EndpointMediaTypes endpointMediaTypes = new EndpointMediaTypes(mediaTypes, mediaTypes); WebEndpointDiscoverer discoverer = new WebEndpointDiscoverer(this.applicationContext, diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/env/EnvironmentEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/env/EnvironmentEndpointTests.java index 2250fd400d..5b0c75e379 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/env/EnvironmentEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/env/EnvironmentEndpointTests.java @@ -285,7 +285,7 @@ class EnvironmentEndpointTests { static class Config { @Bean - public EnvironmentEndpoint environmentEndpoint(Environment environment) { + EnvironmentEndpoint environmentEndpoint(Environment environment) { return new EnvironmentEndpoint(environment); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/env/EnvironmentEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/env/EnvironmentEndpointWebIntegrationTests.java index c5cfbf3fbf..ee9bbc3718 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/env/EnvironmentEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/env/EnvironmentEndpointWebIntegrationTests.java @@ -128,12 +128,12 @@ class EnvironmentEndpointWebIntegrationTests { static class TestConfiguration { @Bean - public EnvironmentEndpoint endpoint(Environment environment) { + EnvironmentEndpoint endpoint(Environment environment) { return new EnvironmentEndpoint(environment); } @Bean - public EnvironmentEndpointWebExtension environmentEndpointWebExtension(EnvironmentEndpoint endpoint) { + EnvironmentEndpointWebExtension environmentEndpointWebExtension(EnvironmentEndpoint endpoint) { return new EnvironmentEndpointWebExtension(endpoint); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthEndpointWebIntegrationTests.java index 5c92e2b825..a20ac1ecc8 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthEndpointWebIntegrationTests.java @@ -141,16 +141,16 @@ class HealthEndpointWebIntegrationTests { } @Configuration(proxyBeanMethods = false) - public static class TestConfiguration { + static class TestConfiguration { @Bean - public HealthIndicatorRegistry healthIndicatorFactory(Map healthIndicators) { + HealthIndicatorRegistry healthIndicatorFactory(Map healthIndicators) { return new HealthIndicatorRegistryFactory().createHealthIndicatorRegistry(healthIndicators); } @Bean @ConditionalOnWebApplication(type = Type.REACTIVE) - public ReactiveHealthIndicatorRegistry reactiveHealthIndicatorRegistry( + ReactiveHealthIndicatorRegistry reactiveHealthIndicatorRegistry( Map reactiveHealthIndicators, Map healthIndicators) { return new ReactiveHealthIndicatorRegistryFactory() @@ -158,21 +158,21 @@ class HealthEndpointWebIntegrationTests { } @Bean - public HealthEndpoint healthEndpoint(HealthIndicatorRegistry registry) { + HealthEndpoint healthEndpoint(HealthIndicatorRegistry registry) { return new HealthEndpoint(new CompositeHealthIndicator(new OrderedHealthAggregator(), registry)); } @Bean @ConditionalOnWebApplication(type = Type.SERVLET) - public HealthEndpointWebExtension healthWebEndpointExtension(HealthEndpoint healthEndpoint) { + HealthEndpointWebExtension healthWebEndpointExtension(HealthEndpoint healthEndpoint) { return new HealthEndpointWebExtension(healthEndpoint, new HealthWebEndpointResponseMapper( new HealthStatusHttpMapper(), ShowDetails.ALWAYS, new HashSet<>(Arrays.asList("ACTUATOR")))); } @Bean @ConditionalOnWebApplication(type = Type.REACTIVE) - public ReactiveHealthEndpointWebExtension reactiveHealthWebEndpointExtension( - ReactiveHealthIndicatorRegistry registry, HealthEndpoint healthEndpoint) { + ReactiveHealthEndpointWebExtension reactiveHealthWebEndpointExtension(ReactiveHealthIndicatorRegistry registry, + HealthEndpoint healthEndpoint) { return new ReactiveHealthEndpointWebExtension( new CompositeReactiveHealthIndicator(new OrderedHealthAggregator(), registry), new HealthWebEndpointResponseMapper(new HealthStatusHttpMapper(), ShowDetails.ALWAYS, @@ -180,12 +180,12 @@ class HealthEndpointWebIntegrationTests { } @Bean - public HealthIndicator alphaHealthIndicator() { + HealthIndicator alphaHealthIndicator() { return () -> Health.up().build(); } @Bean - public HealthIndicator bravoHealthIndicator() { + HealthIndicator bravoHealthIndicator() { return () -> Health.up().build(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/info/InfoEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/info/InfoEndpointWebIntegrationTests.java index e4f04ccb2c..d05a98dc6d 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/info/InfoEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/info/InfoEndpointWebIntegrationTests.java @@ -47,15 +47,15 @@ class InfoEndpointWebIntegrationTests { } @Configuration(proxyBeanMethods = false) - public static class TestConfiguration { + static class TestConfiguration { @Bean - public InfoEndpoint endpoint(ObjectProvider infoContributors) { + InfoEndpoint endpoint(ObjectProvider infoContributors) { return new InfoEndpoint(infoContributors.orderedStream().collect(Collectors.toList())); } @Bean - public InfoContributor beanName1() { + InfoContributor beanName1() { return (builder) -> { Map content = new LinkedHashMap<>(); content.put("key11", "value11"); @@ -65,7 +65,7 @@ class InfoEndpointWebIntegrationTests { } @Bean - public InfoContributor beanName2() { + InfoContributor beanName2() { return (builder) -> { Map content = new LinkedHashMap<>(); content.put("key21", "value21"); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/integration/IntegrationGraphEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/integration/IntegrationGraphEndpointWebIntegrationTests.java index 3a20d75c5d..9266634294 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/integration/IntegrationGraphEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/integration/IntegrationGraphEndpointWebIntegrationTests.java @@ -48,15 +48,15 @@ class IntegrationGraphEndpointWebIntegrationTests { @Configuration(proxyBeanMethods = false) @EnableIntegration - public static class TestConfiguration { + static class TestConfiguration { @Bean - public IntegrationGraphEndpoint endpoint(IntegrationGraphServer integrationGraphServer) { + IntegrationGraphEndpoint endpoint(IntegrationGraphServer integrationGraphServer) { return new IntegrationGraphEndpoint(integrationGraphServer); } @Bean - public IntegrationGraphServer integrationGraphServer() { + IntegrationGraphServer integrationGraphServer() { return new IntegrationGraphServer(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java index 3f82ae8064..4e4adf9aad 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java @@ -99,10 +99,10 @@ class LiquibaseEndpointTests { } @Configuration(proxyBeanMethods = false) - public static class Config { + static class Config { @Bean - public LiquibaseEndpoint endpoint(ApplicationContext context) { + LiquibaseEndpoint endpoint(ApplicationContext context) { return new LiquibaseEndpoint(context); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java index 66b686e003..425ed574b8 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java @@ -77,7 +77,7 @@ class LogFileWebEndpointWebIntegrationTests { static class TestConfiguration { @Bean - public LogFileWebEndpoint logFileEndpoint(Environment environment) { + LogFileWebEndpoint logFileEndpoint(Environment environment) { return new LogFileWebEndpoint(environment); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java index a22ee6d358..692fda90cf 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java @@ -150,12 +150,12 @@ class LoggersEndpointWebIntegrationTests { static class TestConfiguration { @Bean - public LoggingSystem loggingSystem() { + LoggingSystem loggingSystem() { return mock(LoggingSystem.class); } @Bean - public LoggersEndpoint endpoint(LoggingSystem loggingSystem) { + LoggersEndpoint endpoint(LoggingSystem loggingSystem) { return new LoggersEndpoint(loggingSystem); } 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 730ad787f2..3cf1b7595f 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 @@ -81,7 +81,7 @@ class MailHealthIndicatorTests { assertThat(errorMessage.toString().contains("A test exception")).isTrue(); } - public static class SuccessTransport extends Transport { + static class SuccessTransport extends Transport { SuccessTransport(Session session, URLName urlName) { super(session, urlName); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/management/HeapDumpWebEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/management/HeapDumpWebEndpointWebIntegrationTests.java index bae20b6718..07b95102f8 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/management/HeapDumpWebEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/management/HeapDumpWebEndpointWebIntegrationTests.java @@ -72,16 +72,16 @@ class HeapDumpWebEndpointWebIntegrationTests { } @Configuration(proxyBeanMethods = false) - public static class TestConfiguration { + static class TestConfiguration { @Bean - public HeapDumpWebEndpoint endpoint() { + HeapDumpWebEndpoint endpoint() { return new TestHeapDumpWebEndpoint(); } } - private static class TestHeapDumpWebEndpoint extends HeapDumpWebEndpoint { + static class TestHeapDumpWebEndpoint extends HeapDumpWebEndpoint { private boolean available; @@ -94,7 +94,7 @@ class HeapDumpWebEndpointWebIntegrationTests { reset(); } - public void reset() { + void reset() { this.available = true; } @@ -112,7 +112,7 @@ class HeapDumpWebEndpointWebIntegrationTests { }; } - public void setAvailable(boolean available) { + void setAvailable(boolean available) { this.available = available; } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java index 71be9821c2..d3ad3b7f23 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java @@ -71,17 +71,17 @@ class MetricsEndpointWebIntegrationTests { static class TestConfiguration { @Bean - public MeterRegistry registry() { + MeterRegistry registry() { return registry; } @Bean - public MetricsEndpoint metricsEndpoint(MeterRegistry meterRegistry) { + MetricsEndpoint metricsEndpoint(MeterRegistry meterRegistry) { return new MetricsEndpoint(meterRegistry); } @Bean - public JvmMemoryMetrics jvmMemoryMetrics(MeterRegistry meterRegistry) { + JvmMemoryMetrics jvmMemoryMetrics(MeterRegistry meterRegistry) { JvmMemoryMetrics memoryMetrics = new JvmMemoryMetrics(); memoryMetrics.bindTo(meterRegistry); return memoryMetrics; diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpointIntegrationTests.java index 0e519b8e4f..6c3e324340 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpointIntegrationTests.java @@ -45,17 +45,17 @@ class PrometheusScrapeEndpointIntegrationTests { static class TestConfiguration { @Bean - public PrometheusScrapeEndpoint prometheusScrapeEndpoint(CollectorRegistry collectorRegistry) { + PrometheusScrapeEndpoint prometheusScrapeEndpoint(CollectorRegistry collectorRegistry) { return new PrometheusScrapeEndpoint(collectorRegistry); } @Bean - public CollectorRegistry collectorRegistry() { + CollectorRegistry collectorRegistry() { return new CollectorRegistry(true); } @Bean - public MeterRegistry registry(CollectorRegistry registry) { + MeterRegistry registry(CollectorRegistry registry) { return new PrometheusMeterRegistry((k) -> null, registry, Clock.SYSTEM); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/LongTaskTimingHandlerInterceptorTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/LongTaskTimingHandlerInterceptorTests.java index 8422f6f12a..1279f3131a 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/LongTaskTimingHandlerInterceptorTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/LongTaskTimingHandlerInterceptorTests.java @@ -162,7 +162,7 @@ class LongTaskTimingHandlerInterceptorTests { @Timed @Timed(value = "my.long.request", extraTags = { "region", "test" }, longTask = true) @GetMapping("/callable/{id}") - public Callable asyncCallable(@PathVariable Long id) throws Exception { + Callable asyncCallable(@PathVariable Long id) throws Exception { this.callableBarrier.await(); return () -> { try { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterAutoTimedTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterAutoTimedTests.java index 9ef90b6dc8..8c49eef701 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterAutoTimedTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterAutoTimedTests.java @@ -99,7 +99,7 @@ class WebMvcMetricsFilterAutoTimedTests { } @Bean - public WebMvcMetricsFilter webMetricsFilter(WebApplicationContext context, MeterRegistry registry) { + WebMvcMetricsFilter webMetricsFilter(WebApplicationContext context, MeterRegistry registry) { return new WebMvcMetricsFilter(registry, new DefaultWebMvcTagsProvider(), "http.server.requests", (builder) -> builder.publishPercentiles(0.5, 0.95).publishPercentileHistogram(true)); } @@ -111,7 +111,7 @@ class WebMvcMetricsFilterAutoTimedTests { static class Controller { @GetMapping("/{id}") - public String successful(@PathVariable Long id) { + String successful(@PathVariable Long id) { return id.toString(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java index ea1b3d917a..5ee55dbaf4 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java @@ -291,7 +291,7 @@ class WebMvcMetricsFilterTests { @Target({ ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @Timed(percentiles = 0.95) - public @interface Timed95 { + @interface Timed95 { } @@ -375,14 +375,14 @@ class WebMvcMetricsFilterTests { @Timed(extraTags = { "public", "true" }) @GetMapping("/{id}") - public String successfulWithExtraTags(@PathVariable Long id) { + String successfulWithExtraTags(@PathVariable Long id) { return id.toString(); } @Timed @Timed(value = "my.long.request", extraTags = { "region", "test" }, longTask = true) @GetMapping("/callable/{id}") - public Callable asyncCallable(@PathVariable Long id) throws Exception { + Callable asyncCallable(@PathVariable Long id) throws Exception { this.callableBarrier.await(); return () -> { try { @@ -420,31 +420,31 @@ class WebMvcMetricsFilterTests { } @GetMapping("/untimed/{id}") - public String successfulButUntimed(@PathVariable Long id) { + String successfulButUntimed(@PathVariable Long id) { return id.toString(); } @Timed @GetMapping("/error/{id}") - public String alwaysThrowsException(@PathVariable Long id) { + String alwaysThrowsException(@PathVariable Long id) { throw new IllegalStateException("Boom on " + id + "!"); } @Timed @GetMapping("/anonymousError/{id}") - public String alwaysThrowsAnonymousException(@PathVariable Long id) throws Exception { + String alwaysThrowsAnonymousException(@PathVariable Long id) throws Exception { throw new Exception("this exception won't have a simple class name") { }; } @Timed @GetMapping("/unhandledError/{id}") - public String alwaysThrowsUnhandledException(@PathVariable Long id) { + String alwaysThrowsUnhandledException(@PathVariable Long id) { throw new RuntimeException("Boom on " + id + "!"); } @GetMapping("/streamingError") - public ResponseBodyEmitter streamingError() { + ResponseBodyEmitter streamingError() { ResponseBodyEmitter emitter = new ResponseBodyEmitter(); emitter.completeWithError(new IOException("error while writing to the response")); return emitter; @@ -452,25 +452,25 @@ class WebMvcMetricsFilterTests { @Timed @GetMapping("/regex/{id:\\.[a-z]+}") - public String successfulRegex(@PathVariable String id) { + String successfulRegex(@PathVariable String id) { return id; } @Timed(percentiles = { 0.50, 0.95 }) @GetMapping("/percentiles/{id}") - public String percentiles(@PathVariable String id) { + String percentiles(@PathVariable String id) { return id; } @Timed(histogram = true) @GetMapping("/histogram/{id}") - public String histogram(@PathVariable String id) { + String histogram(@PathVariable String id) { return id; } @Timed95 @GetMapping("/metaTimed/{id}") - public String meta(@PathVariable String id) { + String meta(@PathVariable String id) { return id; } @@ -488,7 +488,7 @@ class WebMvcMetricsFilterTests { static class Controller2 { @GetMapping("/{id}") - public String successful(@PathVariable Long id) { + String successful(@PathVariable Long id) { return id.toString(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsIntegrationTests.java index a935c184d9..e1536775e6 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsIntegrationTests.java @@ -105,7 +105,7 @@ class WebMvcMetricsIntegrationTests { } @Bean - public WebMvcMetricsFilter webMetricsFilter(MeterRegistry registry, WebApplicationContext ctx) { + WebMvcMetricsFilter webMetricsFilter(MeterRegistry registry, WebApplicationContext ctx) { return new WebMvcMetricsFilter(registry, new DefaultWebMvcTagsProvider(), "http.server.requests", AutoTimer.ENABLED); } @@ -117,17 +117,17 @@ class WebMvcMetricsIntegrationTests { static class Controller1 { @Bean - public CustomExceptionHandler controllerAdvice() { + CustomExceptionHandler controllerAdvice() { return new CustomExceptionHandler(); } @GetMapping("/handledError") - public String handledError() { + String handledError() { throw new Exception1(); } @GetMapping("/rethrownError") - public String rethrownError() { + String rethrownError() { throw new Exception2(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/scheduling/ScheduledTasksEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/scheduling/ScheduledTasksEndpointTests.java index 0baa43dbb0..7fb2bffe0c 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/scheduling/ScheduledTasksEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/scheduling/ScheduledTasksEndpointTests.java @@ -159,40 +159,40 @@ class ScheduledTasksEndpointTests { static class BaseConfiguration { @Bean - public ScheduledTasksEndpoint endpoint(Collection scheduledTaskHolders) { + ScheduledTasksEndpoint endpoint(Collection scheduledTaskHolders) { return new ScheduledTasksEndpoint(scheduledTaskHolders); } } - private static class FixedDelayScheduledMethod { + static class FixedDelayScheduledMethod { @Scheduled(fixedDelay = 1, initialDelay = 2) - public void fixedDelay() { + void fixedDelay() { } } - private static class FixedRateScheduledMethod { + static class FixedRateScheduledMethod { @Scheduled(fixedRate = 3, initialDelay = 4) - public void fixedRate() { + void fixedRate() { } } - private static class CronScheduledMethod { + static class CronScheduledMethod { @Scheduled(cron = "0 0 0/3 1/1 * ?") - public void cron() { + void cron() { } } - private static class FixedDelayTriggerTask implements SchedulingConfigurer { + static class FixedDelayTriggerTask implements SchedulingConfigurer { @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { @@ -203,7 +203,7 @@ class ScheduledTasksEndpointTests { } - private static class FixedRateTriggerTask implements SchedulingConfigurer { + static class FixedRateTriggerTask implements SchedulingConfigurer { @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { @@ -215,7 +215,7 @@ class ScheduledTasksEndpointTests { } - private static class CronTriggerTask implements SchedulingConfigurer { + static class CronTriggerTask implements SchedulingConfigurer { @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { @@ -224,7 +224,7 @@ class ScheduledTasksEndpointTests { } - private static class CustomTriggerTask implements SchedulingConfigurer { + static class CustomTriggerTask implements SchedulingConfigurer { private static final Trigger trigger = (context) -> new Date(); @@ -235,7 +235,7 @@ class ScheduledTasksEndpointTests { } - private static class CronTriggerRunnable implements Runnable { + static class CronTriggerRunnable implements Runnable { @Override public void run() { @@ -244,7 +244,7 @@ class ScheduledTasksEndpointTests { } - private static class FixedDelayTriggerRunnable implements Runnable { + static class FixedDelayTriggerRunnable implements Runnable { @Override public void run() { @@ -253,7 +253,7 @@ class ScheduledTasksEndpointTests { } - private static class FixedRateTriggerRunnable implements Runnable { + static class FixedRateTriggerRunnable implements Runnable { @Override public void run() { @@ -262,7 +262,7 @@ class ScheduledTasksEndpointTests { } - private static class CustomTriggerRunnable implements Runnable { + static class CustomTriggerRunnable implements Runnable { @Override public void run() { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java index cfc466e7b6..26b1f0757f 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java @@ -73,10 +73,10 @@ class SessionsEndpointWebIntegrationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration { + static class TestConfiguration { @Bean - public SessionsEndpoint sessionsEndpoint() { + SessionsEndpoint sessionsEndpoint() { return new SessionsEndpoint(repository); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracerTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracerTests.java index f3b213f2ad..d056f72f56 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracerTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracerTests.java @@ -309,7 +309,7 @@ class HttpExchangeTracerTests { return output.toString(); } - private static class RequestHeadersFilterHttpExchangeTracer extends HttpExchangeTracer { + static class RequestHeadersFilterHttpExchangeTracer extends HttpExchangeTracer { RequestHeadersFilterHttpExchangeTracer() { super(EnumSet.of(Include.REQUEST_HEADERS)); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/reactive/HttpTraceWebFilterIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/reactive/HttpTraceWebFilterIntegrationTests.java index ff82922589..38a1f8b5a2 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/reactive/HttpTraceWebFilterIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/reactive/HttpTraceWebFilterIntegrationTests.java @@ -92,23 +92,23 @@ class HttpTraceWebFilterIntegrationTests { static class Config { @Bean - public HttpTraceWebFilter httpTraceWebFilter(HttpTraceRepository repository) { + HttpTraceWebFilter httpTraceWebFilter(HttpTraceRepository repository) { Set includes = EnumSet.allOf(Include.class); return new HttpTraceWebFilter(repository, new HttpExchangeTracer(includes), includes); } @Bean - public HttpTraceRepository httpTraceRepository() { + HttpTraceRepository httpTraceRepository() { return new InMemoryHttpTraceRepository(); } @Bean - public HttpHandler httpHandler(ApplicationContext applicationContext) { + HttpHandler httpHandler(ApplicationContext applicationContext) { return WebHttpHandlerBuilder.applicationContext(applicationContext).build(); } @Bean - public RouterFunction router() { + RouterFunction router() { return route(GET("/mono-error"), (request) -> Mono.error(new RuntimeException())).andRoute(GET("/thrown"), (HandlerFunction) (request) -> { throw new RuntimeException(); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java index 1ef72f6394..b0d95504e0 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java @@ -158,7 +158,7 @@ class MappingsEndpointTests { static class EndpointConfiguration { @Bean - public MappingsEndpoint mappingsEndpoint(Collection descriptionProviders, + MappingsEndpoint mappingsEndpoint(Collection descriptionProviders, ApplicationContext context) { return new MappingsEndpoint(descriptionProviders, context); } @@ -171,18 +171,18 @@ class MappingsEndpointTests { static class ReactiveWebConfiguration { @Bean - public DispatcherHandlersMappingDescriptionProvider dispatcherHandlersMappingDescriptionProvider() { + DispatcherHandlersMappingDescriptionProvider dispatcherHandlersMappingDescriptionProvider() { return new DispatcherHandlersMappingDescriptionProvider(); } @Bean - public RouterFunction routerFunction() { + RouterFunction routerFunction() { return route(GET("/one"), (request) -> ServerResponse.ok().build()).andRoute(POST("/two"), (request) -> ServerResponse.ok().build()); } @RequestMapping("/three") - public void three() { + void three() { } @@ -194,29 +194,29 @@ class MappingsEndpointTests { static class ServletWebConfiguration { @Bean - public DispatcherServletsMappingDescriptionProvider dispatcherServletsMappingDescriptionProvider() { + DispatcherServletsMappingDescriptionProvider dispatcherServletsMappingDescriptionProvider() { return new DispatcherServletsMappingDescriptionProvider(); } @Bean - public ServletsMappingDescriptionProvider servletsMappingDescriptionProvider() { + ServletsMappingDescriptionProvider servletsMappingDescriptionProvider() { return new ServletsMappingDescriptionProvider(); } @Bean - public FiltersMappingDescriptionProvider filtersMappingDescriptionProvider() { + FiltersMappingDescriptionProvider filtersMappingDescriptionProvider() { return new FiltersMappingDescriptionProvider(); } @Bean - public DispatcherServlet dispatcherServlet(WebApplicationContext context) throws ServletException { + DispatcherServlet dispatcherServlet(WebApplicationContext context) throws ServletException { DispatcherServlet dispatcherServlet = new DispatcherServlet(context); dispatcherServlet.init(new MockServletConfig()); return dispatcherServlet; } @RequestMapping("/three") - public void three() { + void three() { } @@ -226,8 +226,7 @@ class MappingsEndpointTests { static class CustomDispatcherServletConfiguration { @Bean - public ServletRegistrationBean customDispatcherServletRegistration( - WebApplicationContext context) { + ServletRegistrationBean customDispatcherServletRegistration(WebApplicationContext context) { ServletRegistrationBean registration = new ServletRegistrationBean<>( createTestDispatcherServlet(context)); registration.setName("customDispatcherServletRegistration"); @@ -235,12 +234,12 @@ class MappingsEndpointTests { } @Bean - public DispatcherServlet anotherDispatcherServlet(WebApplicationContext context) { + DispatcherServlet anotherDispatcherServlet(WebApplicationContext context) { return createTestDispatcherServlet(context); } @Bean - public ServletRegistrationBean anotherDispatcherServletRegistration( + ServletRegistrationBean anotherDispatcherServletRegistration( DispatcherServlet dispatcherServlet, WebApplicationContext context) { ServletRegistrationBean registrationBean = new ServletRegistrationBean<>( anotherDispatcherServlet(context)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationMetadataLoader.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationMetadataLoader.java index 6a17c83662..9711f4fcaf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationMetadataLoader.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationMetadataLoader.java @@ -38,7 +38,7 @@ final class AutoConfigurationMetadataLoader { private AutoConfigurationMetadataLoader() { } - public static AutoConfigurationMetadata loadMetadata(ClassLoader classLoader) { + static AutoConfigurationMetadata loadMetadata(ClassLoader classLoader) { return loadMetadata(classLoader, PATH); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java index 65110bf1d2..5bf26d8358 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java @@ -141,7 +141,7 @@ public abstract class AutoConfigurationPackages { this.packageName = ClassUtils.getPackageName(metadata.getClassName()); } - public String getPackageName() { + String getPackageName() { return this.packageName; } @@ -184,7 +184,7 @@ public abstract class AutoConfigurationPackages { this.packages = packages; } - public List get() { + List get() { if (!this.loggedBasePackageInfo) { if (this.packages.isEmpty()) { if (logger.isWarnEnabled()) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java index 0605b7acf6..f8bebeea45 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java @@ -52,7 +52,7 @@ class AutoConfigurationSorter { this.autoConfigurationMetadata = autoConfigurationMetadata; } - public List getInPriorityOrder(Collection classNames) { + List getInPriorityOrder(Collection classNames) { AutoConfigurationClasses classes = new AutoConfigurationClasses(this.metadataReaderFactory, this.autoConfigurationMetadata, classNames); List orderedClassNames = new ArrayList<>(classNames); @@ -107,7 +107,7 @@ class AutoConfigurationSorter { addToClasses(metadataReaderFactory, autoConfigurationMetadata, classNames, true); } - public Set getAllNames() { + Set getAllNames() { return this.classes.keySet(); } @@ -131,11 +131,11 @@ class AutoConfigurationSorter { } } - public AutoConfigurationClass get(String className) { + AutoConfigurationClass get(String className) { return this.classes.get(className); } - public Set getClassesRequestedAfter(String className) { + Set getClassesRequestedAfter(String className) { Set classesRequestedAfter = new LinkedHashSet<>(); classesRequestedAfter.addAll(get(className).getAfter()); this.classes.forEach((name, autoConfigurationClass) -> { @@ -169,7 +169,7 @@ class AutoConfigurationSorter { this.autoConfigurationMetadata = autoConfigurationMetadata; } - public boolean isAvailable() { + boolean isAvailable() { try { if (!wasProcessed()) { getAnnotationMetadata(); @@ -181,7 +181,7 @@ class AutoConfigurationSorter { } } - public Set getBefore() { + Set getBefore() { if (this.before == null) { this.before = (wasProcessed() ? this.autoConfigurationMetadata.getSet(this.className, "AutoConfigureBefore", Collections.emptySet()) : getAnnotationValue(AutoConfigureBefore.class)); @@ -189,7 +189,7 @@ class AutoConfigurationSorter { return this.before; } - public Set getAfter() { + Set getAfter() { if (this.after == null) { this.after = (wasProcessed() ? this.autoConfigurationMetadata.getSet(this.className, "AutoConfigureAfter", Collections.emptySet()) : getAnnotationValue(AutoConfigureAfter.class)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java index 666a190d78..a08555969d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java @@ -61,7 +61,7 @@ class RabbitAnnotationDrivenConfiguration { @Bean @ConditionalOnMissingBean - public SimpleRabbitListenerContainerFactoryConfigurer simpleRabbitListenerContainerFactoryConfigurer() { + SimpleRabbitListenerContainerFactoryConfigurer simpleRabbitListenerContainerFactoryConfigurer() { SimpleRabbitListenerContainerFactoryConfigurer configurer = new SimpleRabbitListenerContainerFactoryConfigurer(); configurer.setMessageConverter(this.messageConverter.getIfUnique()); configurer.setMessageRecoverer(this.messageRecoverer.getIfUnique()); @@ -75,7 +75,7 @@ class RabbitAnnotationDrivenConfiguration { @ConditionalOnMissingBean(name = "rabbitListenerContainerFactory") @ConditionalOnProperty(prefix = "spring.rabbitmq.listener", name = "type", havingValue = "simple", matchIfMissing = true) - public SimpleRabbitListenerContainerFactory simpleRabbitListenerContainerFactory( + SimpleRabbitListenerContainerFactory simpleRabbitListenerContainerFactory( SimpleRabbitListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) { SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory(); configurer.configure(factory, connectionFactory); @@ -84,7 +84,7 @@ class RabbitAnnotationDrivenConfiguration { @Bean @ConditionalOnMissingBean - public DirectRabbitListenerContainerFactoryConfigurer directRabbitListenerContainerFactoryConfigurer() { + DirectRabbitListenerContainerFactoryConfigurer directRabbitListenerContainerFactoryConfigurer() { DirectRabbitListenerContainerFactoryConfigurer configurer = new DirectRabbitListenerContainerFactoryConfigurer(); configurer.setMessageConverter(this.messageConverter.getIfUnique()); configurer.setMessageRecoverer(this.messageRecoverer.getIfUnique()); @@ -97,7 +97,7 @@ class RabbitAnnotationDrivenConfiguration { @Bean(name = "rabbitListenerContainerFactory") @ConditionalOnMissingBean(name = "rabbitListenerContainerFactory") @ConditionalOnProperty(prefix = "spring.rabbitmq.listener", name = "type", havingValue = "direct") - public DirectRabbitListenerContainerFactory directRabbitListenerContainerFactory( + DirectRabbitListenerContainerFactory directRabbitListenerContainerFactory( DirectRabbitListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) { DirectRabbitListenerContainerFactory factory = new DirectRabbitListenerContainerFactory(); configurer.configure(factory, connectionFactory); @@ -107,7 +107,7 @@ class RabbitAnnotationDrivenConfiguration { @Configuration(proxyBeanMethods = false) @EnableRabbit @ConditionalOnMissingBean(name = RabbitListenerConfigUtils.RABBIT_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME) - protected static class EnableRabbitConfiguration { + static class EnableRabbitConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RetryTemplateFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RetryTemplateFactory.java index 9785135160..b063015921 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RetryTemplateFactory.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RetryTemplateFactory.java @@ -38,8 +38,7 @@ class RetryTemplateFactory { this.customizers = customizers; } - public RetryTemplate createRetryTemplate(RabbitProperties.Retry properties, - RabbitRetryTemplateCustomizer.Target target) { + RetryTemplate createRetryTemplate(RabbitProperties.Retry properties, RabbitRetryTemplateCustomizer.Target target) { PropertyMapper map = PropertyMapper.get(); RetryTemplate template = new RetryTemplate(); SimpleRetryPolicy policy = new SimpleRetryPolicy(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java index 17607ca189..36264a8bf2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java @@ -44,7 +44,7 @@ class BatchConfigurerConfiguration { static class JdbcBatchConfiguration { @Bean - public BasicBatchConfigurer batchConfigurer(BatchProperties properties, DataSource dataSource, + BasicBatchConfigurer batchConfigurer(BatchProperties properties, DataSource dataSource, ObjectProvider transactionManagerCustomizers) { return new BasicBatchConfigurer(properties, dataSource, transactionManagerCustomizers.getIfAvailable()); } @@ -57,7 +57,7 @@ class BatchConfigurerConfiguration { static class JpaBatchConfiguration { @Bean - public JpaBatchConfigurer batchConfigurer(BatchProperties properties, DataSource dataSource, + JpaBatchConfigurer batchConfigurer(BatchProperties properties, DataSource dataSource, ObjectProvider transactionManagerCustomizers, EntityManagerFactory entityManagerFactory) { return new JpaBatchConfigurer(properties, dataSource, transactionManagerCustomizers.getIfAvailable(), diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheConfigurations.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheConfigurations.java index 0fa8e0f0aa..0228326998 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheConfigurations.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheConfigurations.java @@ -50,13 +50,13 @@ final class CacheConfigurations { private CacheConfigurations() { } - public static String getConfigurationClass(CacheType cacheType) { + static String getConfigurationClass(CacheType cacheType) { Class configurationClass = MAPPINGS.get(cacheType); Assert.state(configurationClass != null, () -> "Unknown cache type " + cacheType); return configurationClass.getName(); } - public static CacheType getType(String configurationClassName) { + static CacheType getType(String configurationClassName) { for (Map.Entry> entry : MAPPINGS.entrySet()) { if (entry.getValue().getName().equals(configurationClassName)) { return entry.getKey(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java index f509309a06..6145482660 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.util.StringUtils; class CaffeineCacheConfiguration { @Bean - public CaffeineCacheManager cacheManager(CacheProperties cacheProperties, CacheManagerCustomizers customizers, + CaffeineCacheManager cacheManager(CacheProperties cacheProperties, CacheManagerCustomizers customizers, ObjectProvider> caffeine, ObjectProvider caffeineSpec, ObjectProvider> cacheLoader) { CaffeineCacheManager cacheManager = createCacheManager(cacheProperties, caffeine, caffeineSpec, cacheLoader); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java index e71909b56a..619c79f2e2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java @@ -44,13 +44,13 @@ import org.springframework.core.io.Resource; class EhCacheCacheConfiguration { @Bean - public EhCacheCacheManager cacheManager(CacheManagerCustomizers customizers, CacheManager ehCacheCacheManager) { + EhCacheCacheManager cacheManager(CacheManagerCustomizers customizers, CacheManager ehCacheCacheManager) { return customizers.customize(new EhCacheCacheManager(ehCacheCacheManager)); } @Bean @ConditionalOnMissingBean - public CacheManager ehCacheCacheManager(CacheProperties cacheProperties) { + CacheManager ehCacheCacheManager(CacheProperties cacheProperties) { Resource location = cacheProperties.resolveConfigLocation(cacheProperties.getEhcache().getConfig()); if (location != null) { return EhCacheManagerUtils.buildCacheManager(location); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GenericCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GenericCacheConfiguration.java index b2c2d79a06..b6ce554a4c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GenericCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GenericCacheConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; class GenericCacheConfiguration { @Bean - public SimpleCacheManager cacheManager(CacheManagerCustomizers customizers, Collection caches) { + SimpleCacheManager cacheManager(CacheManagerCustomizers customizers, Collection caches) { SimpleCacheManager cacheManager = new SimpleCacheManager(); cacheManager.setCaches(caches); return customizers.customize(cacheManager); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java index 5e84b59150..c78cf732dc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java @@ -50,8 +50,8 @@ import org.springframework.context.annotation.Configuration; class HazelcastCacheConfiguration { @Bean - public HazelcastCacheManager cacheManager(CacheManagerCustomizers customizers, - HazelcastInstance existingHazelcastInstance) throws IOException { + HazelcastCacheManager cacheManager(CacheManagerCustomizers customizers, HazelcastInstance existingHazelcastInstance) + throws IOException { HazelcastCacheManager cacheManager = new HazelcastCacheManager(existingHazelcastInstance); return customizers.customize(cacheManager); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastJCacheCustomizationConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastJCacheCustomizationConfiguration.java index 0ed1c4f7f7..ff0206b2b7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastJCacheCustomizationConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastJCacheCustomizationConfiguration.java @@ -38,8 +38,7 @@ import org.springframework.core.io.Resource; class HazelcastJCacheCustomizationConfiguration { @Bean - public HazelcastPropertiesCustomizer hazelcastPropertiesCustomizer( - ObjectProvider hazelcastInstance) { + HazelcastPropertiesCustomizer hazelcastPropertiesCustomizer(ObjectProvider hazelcastInstance) { return new HazelcastPropertiesCustomizer(hazelcastInstance.getIfUnique()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java index db4b74edc3..d9b6ec2c4d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java @@ -69,14 +69,14 @@ class JCacheCacheConfiguration implements BeanClassLoaderAware { } @Bean - public JCacheCacheManager cacheManager(CacheManagerCustomizers customizers, CacheManager jCacheCacheManager) { + JCacheCacheManager cacheManager(CacheManagerCustomizers customizers, CacheManager jCacheCacheManager) { JCacheCacheManager cacheManager = new JCacheCacheManager(jCacheCacheManager); return customizers.customize(cacheManager); } @Bean @ConditionalOnMissingBean - public CacheManager jCacheCacheManager(CacheProperties cacheProperties, + CacheManager jCacheCacheManager(CacheProperties cacheProperties, ObjectProvider> defaultCacheConfiguration, ObjectProvider cacheManagerCustomizers, ObjectProvider cachePropertiesCustomizers) throws IOException { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java index 2766eafc5e..62c1c7da40 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; class NoOpCacheConfiguration { @Bean - public NoOpCacheManager cacheManager() { + NoOpCacheManager cacheManager() { return new NoOpCacheManager(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java index 8170b77190..5b3ddd15d3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java @@ -53,8 +53,7 @@ import org.springframework.data.redis.serializer.RedisSerializationContext.Seria class RedisCacheConfiguration { @Bean - public RedisCacheManager cacheManager(CacheProperties cacheProperties, - CacheManagerCustomizers cacheManagerCustomizers, + RedisCacheManager cacheManager(CacheProperties cacheProperties, CacheManagerCustomizers cacheManagerCustomizers, ObjectProvider redisCacheConfiguration, ObjectProvider redisCacheManagerBuilderCustomizers, RedisConnectionFactory redisConnectionFactory, ResourceLoader resourceLoader) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/SimpleCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/SimpleCacheConfiguration.java index 0888189d87..26fcfd16b4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/SimpleCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/SimpleCacheConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; class SimpleCacheConfiguration { @Bean - public ConcurrentMapCacheManager cacheManager(CacheProperties cacheProperties, + ConcurrentMapCacheManager cacheManager(CacheProperties cacheProperties, CacheManagerCustomizers cacheManagerCustomizers) { ConcurrentMapCacheManager cacheManager = new ConcurrentMapCacheManager(); List cacheNames = cacheProperties.getCacheNames(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java index 5738e782e6..7b09eea45c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java @@ -163,7 +163,7 @@ public abstract class AbstractNestedCondition extends SpringBootCondition implem return (Condition) BeanUtils.instantiateClass(conditionClass); } - public List getMatchOutcomes() { + List getMatchOutcomes() { List outcomes = new ArrayList<>(); this.memberConditions.forEach((metadata, conditions) -> outcomes .add(new MemberOutcomes(this.context, metadata, conditions).getUltimateOutcome())); @@ -196,7 +196,7 @@ public abstract class AbstractNestedCondition extends SpringBootCondition implem return new ConditionOutcome(condition.matches(this.context, metadata), ConditionMessage.empty()); } - public ConditionOutcome getUltimateOutcome() { + ConditionOutcome getUltimateOutcome() { ConditionMessage.Builder message = ConditionMessage .forCondition("NestedCondition on " + ClassUtils.getShortName(this.metadata.getClassName())); if (this.outcomes.size() == 1) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java index aab7345257..3fee90585c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java @@ -92,7 +92,7 @@ final class BeanTypeRegistry implements SmartInitializingSingleton { * @return the names of beans (or objects created by FactoryBeans) matching the given * object type (including subclasses), or an empty set if none */ - public Set getNamesForType(Class type, TypeExtractor typeExtractor) { + Set getNamesForType(Class type, TypeExtractor typeExtractor) { updateTypesIfNecessary(); return this.beanTypes.entrySet().stream().filter((entry) -> { Class beanType = extractType(entry.getValue(), typeExtractor); @@ -113,7 +113,7 @@ final class BeanTypeRegistry implements SmartInitializingSingleton { * @return the names of beans (or objects created by FactoryBeans) annotated with the * given annotation, or an empty set if none */ - public Set getNamesForAnnotation(Class annotation) { + Set getNamesForAnnotation(Class annotation) { updateTypesIfNecessary(); return this.beanTypes.entrySet().stream() .filter((entry) -> entry.getValue() != null && MergedAnnotations diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/FilteringSpringBootCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/FilteringSpringBootCondition.java index 1f440e8d6a..2c023e8e8b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/FilteringSpringBootCondition.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/FilteringSpringBootCondition.java @@ -115,9 +115,9 @@ abstract class FilteringSpringBootCondition extends SpringBootCondition }; - public abstract boolean matches(String className, ClassLoader classLoader); + abstract boolean matches(String className, ClassLoader classLoader); - public static boolean isPresent(String className, ClassLoader classLoader) { + static boolean isPresent(String className, ClassLoader classLoader) { if (classLoader == null) { classLoader = ClassUtils.getDefaultClassLoader(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseConfigurerAdapterConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseConfigurerAdapterConfiguration.java index 40b49ec129..643ec451c7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseConfigurerAdapterConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseConfigurerAdapterConfiguration.java @@ -43,7 +43,7 @@ class CouchbaseConfigurerAdapterConfiguration { @Bean @ConditionalOnMissingBean - public CouchbaseConfigurer springBootCouchbaseConfigurer() throws Exception { + CouchbaseConfigurer springBootCouchbaseConfigurer() throws Exception { return new SpringBootCouchbaseConfigurer(this.configuration.couchbaseEnvironment(), this.configuration.couchbaseCluster(), this.configuration.couchbaseClusterInfo(), this.configuration.couchbaseClient()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataConfiguration.java index 00adbace91..f3647113cd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataConfiguration.java @@ -56,25 +56,24 @@ abstract class ElasticsearchDataConfiguration { @Bean @ConditionalOnMissingBean - public ElasticsearchConverter elasticsearchConverter(SimpleElasticsearchMappingContext mappingContext) { + ElasticsearchConverter elasticsearchConverter(SimpleElasticsearchMappingContext mappingContext) { return new MappingElasticsearchConverter(mappingContext); } @Bean @ConditionalOnMissingBean - public SimpleElasticsearchMappingContext mappingContext() { + SimpleElasticsearchMappingContext mappingContext() { return new SimpleElasticsearchMappingContext(); } @Bean - public EntityMapper entityMapper(SimpleElasticsearchMappingContext mappingContext) { + EntityMapper entityMapper(SimpleElasticsearchMappingContext mappingContext) { return new DefaultEntityMapper(mappingContext); } @Bean @ConditionalOnMissingBean - public ResultsMapper resultsMapper(SimpleElasticsearchMappingContext mappingContext, - EntityMapper entityMapper) { + ResultsMapper resultsMapper(SimpleElasticsearchMappingContext mappingContext, EntityMapper entityMapper) { return new DefaultResultMapper(mappingContext, entityMapper); } @@ -87,8 +86,8 @@ abstract class ElasticsearchDataConfiguration { @Bean @ConditionalOnMissingBean(value = ElasticsearchOperations.class, name = "elasticsearchTemplate") @ConditionalOnBean(RestHighLevelClient.class) - public ElasticsearchRestTemplate elasticsearchTemplate(RestHighLevelClient client, - ElasticsearchConverter converter, ResultsMapper resultsMapper) { + ElasticsearchRestTemplate elasticsearchTemplate(RestHighLevelClient client, ElasticsearchConverter converter, + ResultsMapper resultsMapper) { return new ElasticsearchRestTemplate(client, converter, resultsMapper); } @@ -101,7 +100,7 @@ abstract class ElasticsearchDataConfiguration { @Bean @ConditionalOnMissingBean(value = ElasticsearchOperations.class, name = "elasticsearchTemplate") @ConditionalOnBean(Client.class) - public ElasticsearchTemplate elasticsearchTemplate(Client client, ElasticsearchConverter converter, + ElasticsearchTemplate elasticsearchTemplate(Client client, ElasticsearchConverter converter, ResultsMapper resultsMapper) { try { return new ElasticsearchTemplate(client, converter, resultsMapper); @@ -120,7 +119,7 @@ abstract class ElasticsearchDataConfiguration { @Bean @ConditionalOnMissingBean(value = ReactiveElasticsearchOperations.class, name = "reactiveElasticsearchTemplate") @ConditionalOnBean(ReactiveElasticsearchClient.class) - public ReactiveElasticsearchTemplate reactiveElasticsearchTemplate(ReactiveElasticsearchClient client, + ReactiveElasticsearchTemplate reactiveElasticsearchTemplate(ReactiveElasticsearchClient client, ElasticsearchConverter converter, ResultsMapper resultsMapper) { ReactiveElasticsearchTemplate template = new ReactiveElasticsearchTemplate(client, converter, resultsMapper); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataConfiguration.java index 5bdd69f12c..204e5a9fde 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataConfiguration.java @@ -42,7 +42,7 @@ class MongoDataConfiguration { @Bean @ConditionalOnMissingBean - public MongoMappingContext mongoMappingContext(ApplicationContext applicationContext, MongoProperties properties, + MongoMappingContext mongoMappingContext(ApplicationContext applicationContext, MongoProperties properties, MongoCustomConversions conversions) throws ClassNotFoundException { PropertyMapper mapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); MongoMappingContext context = new MongoMappingContext(); @@ -58,7 +58,7 @@ class MongoDataConfiguration { @Bean @ConditionalOnMissingBean - public MongoCustomConversions mongoCustomConversions() { + MongoCustomConversions mongoCustomConversions() { return new MongoCustomConversions(Collections.emptyList()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jBookmarkManagementConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jBookmarkManagementConfiguration.java index c5b66018be..0d71fb6866 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jBookmarkManagementConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jBookmarkManagementConfiguration.java @@ -52,13 +52,13 @@ class Neo4jBookmarkManagementConfiguration { @Bean(BOOKMARK_MANAGER_BEAN_NAME) @ConditionalOnWebApplication @Scope(value = WebApplicationContext.SCOPE_REQUEST, proxyMode = ScopedProxyMode.INTERFACES) - public BookmarkManager requestScopedBookmarkManager() { + BookmarkManager requestScopedBookmarkManager() { return new CaffeineBookmarkManager(); } @Bean(BOOKMARK_MANAGER_BEAN_NAME) @ConditionalOnNotWebApplication - public BookmarkManager singletonScopedBookmarkManager() { + BookmarkManager singletonScopedBookmarkManager() { return new CaffeineBookmarkManager(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java index 301ab40b42..ff47497500 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java @@ -55,7 +55,7 @@ class JedisConnectionConfiguration extends RedisConnectionConfiguration { @Bean @ConditionalOnMissingBean(RedisConnectionFactory.class) - public JedisConnectionFactory redisConnectionFactory( + JedisConnectionFactory redisConnectionFactory( ObjectProvider builderCustomizers) throws UnknownHostException { return createJedisConnectionFactory(builderCustomizers); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java index 4ae272246e..d1c7a8bd4e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java @@ -56,13 +56,13 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration { @Bean(destroyMethod = "shutdown") @ConditionalOnMissingBean(ClientResources.class) - public DefaultClientResources lettuceClientResources() { + DefaultClientResources lettuceClientResources() { return DefaultClientResources.create(); } @Bean @ConditionalOnMissingBean(RedisConnectionFactory.class) - public LettuceConnectionFactory redisConnectionFactory( + LettuceConnectionFactory redisConnectionFactory( ObjectProvider builderCustomizers, ClientResources clientResources) throws UnknownHostException { LettuceClientConfiguration clientConfig = getLettuceClientConfiguration(builderCustomizers, clientResources, @@ -132,7 +132,7 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration { */ private static class PoolBuilderFactory { - public LettuceClientConfigurationBuilder createBuilder(Pool properties) { + LettuceClientConfigurationBuilder createBuilder(Pool properties) { return LettucePoolingClientConfiguration.builder().poolConfig(getPoolConfig(properties)); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java index 8665da70ef..f1ef130a00 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java @@ -148,7 +148,7 @@ abstract class RedisConnectionConfiguration { } } - protected static class ConnectionInfo { + static class ConnectionInfo { private final URI uri; @@ -156,25 +156,25 @@ abstract class RedisConnectionConfiguration { private final String password; - public ConnectionInfo(URI uri, boolean useSsl, String password) { + ConnectionInfo(URI uri, boolean useSsl, String password) { this.uri = uri; this.useSsl = useSsl; this.password = password; } - public boolean isUseSsl() { + boolean isUseSsl() { return this.useSsl; } - public String getHostName() { + String getHostName() { return this.uri.getHost(); } - public int getPort() { + int getPort() { return this.uri.getPort(); } - public String getPassword() { + String getPassword() { return this.password; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java index 9ef5fbc887..5a5d3316b9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java @@ -203,11 +203,11 @@ class NoSuchBeanDefinitionFailureAnalyzer extends AbstractInjectionFailureAnalyz this.methodName = (tokens.length != 2) ? null : tokens[1]; } - public String getClassName() { + String getClassName() { return this.className; } - public String getMethodName() { + String getMethodName() { return this.methodName; } 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 85aff52288..98457feda0 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 @@ -352,7 +352,7 @@ public class FlywayAutoConfiguration { this.dataSource = dataSource; } - public List resolveLocations(List locations) { + List resolveLocations(List locations) { if (usesVendorLocation(locations)) { DatabaseDriver databaseDriver = getDatabaseDriver(); return replaceVendorLocations(locations, databaseDriver); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java index 6af352fa5e..ad362826af 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java @@ -38,7 +38,7 @@ class FreeMarkerNonWebConfiguration extends AbstractFreeMarkerConfiguration { @Bean @ConditionalOnMissingBean - public FreeMarkerConfigurationFactoryBean freeMarkerConfiguration() { + FreeMarkerConfigurationFactoryBean freeMarkerConfiguration() { FreeMarkerConfigurationFactoryBean freeMarkerFactoryBean = new FreeMarkerConfigurationFactoryBean(); applyProperties(freeMarkerFactoryBean); return freeMarkerFactoryBean; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerReactiveWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerReactiveWebConfiguration.java index 9217cc5724..a381f0496a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerReactiveWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerReactiveWebConfiguration.java @@ -44,21 +44,21 @@ class FreeMarkerReactiveWebConfiguration extends AbstractFreeMarkerConfiguration @Bean @ConditionalOnMissingBean(FreeMarkerConfig.class) - public FreeMarkerConfigurer freeMarkerConfigurer() { + FreeMarkerConfigurer freeMarkerConfigurer() { FreeMarkerConfigurer configurer = new FreeMarkerConfigurer(); applyProperties(configurer); return configurer; } @Bean - public freemarker.template.Configuration freeMarkerConfiguration(FreeMarkerConfig configurer) { + freemarker.template.Configuration freeMarkerConfiguration(FreeMarkerConfig configurer) { return configurer.getConfiguration(); } @Bean @ConditionalOnMissingBean(name = "freeMarkerViewResolver") @ConditionalOnProperty(name = "spring.freemarker.enabled", matchIfMissing = true) - public FreeMarkerViewResolver freeMarkerViewResolver() { + FreeMarkerViewResolver freeMarkerViewResolver() { FreeMarkerViewResolver resolver = new FreeMarkerViewResolver(); resolver.setPrefix(getProperties().getPrefix()); resolver.setSuffix(getProperties().getSuffix()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java index b126f69624..c801637d39 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java @@ -53,21 +53,21 @@ class FreeMarkerServletWebConfiguration extends AbstractFreeMarkerConfiguration @Bean @ConditionalOnMissingBean(FreeMarkerConfig.class) - public FreeMarkerConfigurer freeMarkerConfigurer() { + FreeMarkerConfigurer freeMarkerConfigurer() { FreeMarkerConfigurer configurer = new FreeMarkerConfigurer(); applyProperties(configurer); return configurer; } @Bean - public freemarker.template.Configuration freeMarkerConfiguration(FreeMarkerConfig configurer) { + freemarker.template.Configuration freeMarkerConfiguration(FreeMarkerConfig configurer) { return configurer.getConfiguration(); } @Bean @ConditionalOnMissingBean(name = "freeMarkerViewResolver") @ConditionalOnProperty(name = "spring.freemarker.enabled", matchIfMissing = true) - public FreeMarkerViewResolver freeMarkerViewResolver() { + FreeMarkerViewResolver freeMarkerViewResolver() { FreeMarkerViewResolver resolver = new FreeMarkerViewResolver(); getProperties().applyToMvcViewResolver(resolver); return resolver; @@ -76,7 +76,7 @@ class FreeMarkerServletWebConfiguration extends AbstractFreeMarkerConfiguration @Bean @ConditionalOnEnabledResourceChain @ConditionalOnMissingFilterBean(ResourceUrlEncodingFilter.class) - public FilterRegistrationBean resourceUrlEncodingFilter() { + FilterRegistrationBean resourceUrlEncodingFilter() { FilterRegistrationBean registration = new FilterRegistrationBean<>( new ResourceUrlEncodingFilter()); registration.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.ERROR); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProvider.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProvider.java index 4d31e74e48..8d2e290e67 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProvider.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProvider.java @@ -36,7 +36,7 @@ public class FreeMarkerTemplateAvailabilityProvider extends PathBasedTemplateAva super("freemarker.template.Configuration", FreeMarkerTemplateAvailabilityProperties.class, "spring.freemarker"); } - static final class FreeMarkerTemplateAvailabilityProperties extends TemplateAvailabilityProperties { + protected static final class FreeMarkerTemplateAvailabilityProperties extends TemplateAvailabilityProperties { private List templateLoaderPath = new ArrayList<>( Arrays.asList(FreeMarkerProperties.DEFAULT_TEMPLATE_LOADER_PATH)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProvider.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProvider.java index bae9057c83..22b6575da3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProvider.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProvider.java @@ -36,7 +36,7 @@ public class GroovyTemplateAvailabilityProvider extends PathBasedTemplateAvailab super("groovy.text.TemplateEngine", GroovyTemplateAvailabilityProperties.class, "spring.groovy.template"); } - static final class GroovyTemplateAvailabilityProperties extends TemplateAvailabilityProperties { + protected static final class GroovyTemplateAvailabilityProperties extends TemplateAvailabilityProperties { private List resourceLoaderPath = new ArrayList<>( Arrays.asList(GroovyTemplateProperties.DEFAULT_RESOURCE_LOADER_PATH)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java index 68183b4030..a26d0f2c9d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java @@ -65,7 +65,7 @@ public class HypermediaHttpMessageConverterConfiguration { private volatile BeanFactory beanFactory; @PostConstruct - public void configureHttpMessageConverters() { + void configureHttpMessageConverters() { if (this.beanFactory instanceof ListableBeanFactory) { configureHttpMessageConverters(((ListableBeanFactory) this.beanFactory) .getBeansOfType(RequestMappingHandlerAdapter.class).values()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientConfiguration.java index 20260048aa..d3ed1a3df4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientConfiguration.java @@ -49,7 +49,7 @@ class HazelcastClientConfiguration { static class HazelcastClientConfigFileConfiguration { @Bean - public HazelcastInstance hazelcastInstance(HazelcastProperties properties) throws IOException { + HazelcastInstance hazelcastInstance(HazelcastProperties properties) throws IOException { Resource config = properties.resolveConfigLocation(); if (config != null) { return new HazelcastClientFactory(config).getHazelcastInstance(); @@ -64,7 +64,7 @@ class HazelcastClientConfiguration { static class HazelcastClientConfigConfiguration { @Bean - public HazelcastInstance hazelcastInstance(ClientConfig config) { + HazelcastInstance hazelcastInstance(ClientConfig config) { return new HazelcastClientFactory(config).getHazelcastInstance(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastServerConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastServerConfiguration.java index 11dd3f432d..0a552bb19d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastServerConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastServerConfiguration.java @@ -47,7 +47,7 @@ class HazelcastServerConfiguration { static class HazelcastServerConfigFileConfiguration { @Bean - public HazelcastInstance hazelcastInstance(HazelcastProperties properties) throws IOException { + HazelcastInstance hazelcastInstance(HazelcastProperties properties) throws IOException { Resource config = properties.resolveConfigLocation(); if (config != null) { return new HazelcastInstanceFactory(config).getHazelcastInstance(); @@ -62,7 +62,7 @@ class HazelcastServerConfiguration { static class HazelcastServerConfigConfiguration { @Bean - public HazelcastInstance hazelcastInstance(Config config) { + HazelcastInstance hazelcastInstance(Config config) { return new HazelcastInstanceFactory(config).getHazelcastInstance(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java index 9c475ecd25..1eacbebd98 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java @@ -43,11 +43,11 @@ class GsonHttpMessageConvertersConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnBean(Gson.class) @Conditional(PreferGsonOrJacksonAndJsonbUnavailableCondition.class) - protected static class GsonHttpMessageConverterConfiguration { + static class GsonHttpMessageConverterConfiguration { @Bean @ConditionalOnMissingBean - public GsonHttpMessageConverter gsonHttpMessageConverter(Gson gson) { + GsonHttpMessageConverter gsonHttpMessageConverter(Gson gson) { GsonHttpMessageConverter converter = new GsonHttpMessageConverter(); converter.setGson(gson); return converter; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JacksonHttpMessageConvertersConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JacksonHttpMessageConvertersConfiguration.java index 1d4647e3ba..687cb29dfc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JacksonHttpMessageConvertersConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JacksonHttpMessageConvertersConfiguration.java @@ -42,14 +42,14 @@ class JacksonHttpMessageConvertersConfiguration { @ConditionalOnBean(ObjectMapper.class) @ConditionalOnProperty(name = HttpMessageConvertersAutoConfiguration.PREFERRED_MAPPER_PROPERTY, havingValue = "jackson", matchIfMissing = true) - protected static class MappingJackson2HttpMessageConverterConfiguration { + static class MappingJackson2HttpMessageConverterConfiguration { @Bean @ConditionalOnMissingBean(value = MappingJackson2HttpMessageConverter.class, ignoredType = { "org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter", "org.springframework.data.rest.webmvc.alps.AlpsJsonHttpMessageConverter" }) - public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter(ObjectMapper objectMapper) { + MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter(ObjectMapper objectMapper) { return new MappingJackson2HttpMessageConverter(objectMapper); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JsonbHttpMessageConvertersConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JsonbHttpMessageConvertersConfiguration.java index 77468b55e3..0f8de6bbef 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JsonbHttpMessageConvertersConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JsonbHttpMessageConvertersConfiguration.java @@ -42,11 +42,11 @@ class JsonbHttpMessageConvertersConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnBean(Jsonb.class) @Conditional(PreferJsonbOrMissingJacksonAndGsonCondition.class) - protected static class JsonbHttpMessageConverterConfiguration { + static class JsonbHttpMessageConverterConfiguration { @Bean @ConditionalOnMissingBean - public JsonbHttpMessageConverter jsonbHttpMessageConverter(Jsonb jsonb) { + JsonbHttpMessageConverter jsonbHttpMessageConverter(Jsonb jsonb) { JsonbHttpMessageConverter converter = new JsonbHttpMessageConverter(); converter.setJsonb(jsonb); return converter; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java index 9d60fbaff0..2d10e79ba3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java @@ -57,7 +57,7 @@ public class CodecsAutoConfiguration { @Bean @Order(0) @ConditionalOnBean(ObjectMapper.class) - public CodecCustomizer jacksonCodecCustomizer(ObjectMapper objectMapper) { + CodecCustomizer jacksonCodecCustomizer(ObjectMapper objectMapper) { return (configurer) -> { CodecConfigurer.DefaultCodecs defaults = configurer.defaultCodecs(); defaults.jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, EMPTY_MIME_TYPES)); @@ -73,7 +73,7 @@ public class CodecsAutoConfiguration { @Bean @Order(0) - public CodecCustomizer loggingCodecCustomizer(HttpProperties properties) { + CodecCustomizer loggingCodecCustomizer(HttpProperties properties) { return (configurer) -> configurer.defaultCodecs() .enableLoggingRequestDetails(properties.isLogRequestDetails()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java index f8ba410e1b..796e3146fc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java @@ -102,7 +102,7 @@ public class JacksonAutoConfiguration { @Bean @Primary @ConditionalOnMissingBean - public ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder) { + ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder) { return builder.createXmlMapper(false).build(); } @@ -116,7 +116,7 @@ public class JacksonAutoConfiguration { private static final Log logger = LogFactory.getLog(JodaDateTimeJacksonConfiguration.class); @Bean - public SimpleModule jodaDateTimeSerializationModule(JacksonProperties jacksonProperties) { + SimpleModule jodaDateTimeSerializationModule(JacksonProperties jacksonProperties) { SimpleModule module = new SimpleModule(); JacksonJodaDateFormat jacksonJodaFormat = getJacksonJodaDateFormat(jacksonProperties); if (jacksonJodaFormat != null) { @@ -154,7 +154,7 @@ public class JacksonAutoConfiguration { @Bean @ConditionalOnMissingBean - public ParameterNamesModule parameterNamesModule() { + ParameterNamesModule parameterNamesModule() { return new ParameterNamesModule(JsonCreator.Mode.DEFAULT); } @@ -166,7 +166,7 @@ public class JacksonAutoConfiguration { @Bean @ConditionalOnMissingBean - public Jackson2ObjectMapperBuilder jacksonObjectMapperBuilder(ApplicationContext applicationContext, + Jackson2ObjectMapperBuilder jacksonObjectMapperBuilder(ApplicationContext applicationContext, List customizers) { Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder(); builder.applicationContext(applicationContext); @@ -189,7 +189,7 @@ public class JacksonAutoConfiguration { static class Jackson2ObjectMapperBuilderCustomizerConfiguration { @Bean - public StandardJackson2ObjectMapperBuilderCustomizer standardJacksonObjectMapperBuilderCustomizer( + StandardJackson2ObjectMapperBuilderCustomizer standardJacksonObjectMapperBuilderCustomizer( ApplicationContext applicationContext, JacksonProperties jacksonProperties) { return new StandardJackson2ObjectMapperBuilderCustomizer(applicationContext, jacksonProperties); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java index 2677868789..d94e9d3ec1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java @@ -55,7 +55,7 @@ abstract class DataSourceConfiguration { @Bean @ConfigurationProperties(prefix = "spring.datasource.tomcat") - public org.apache.tomcat.jdbc.pool.DataSource dataSource(DataSourceProperties properties) { + org.apache.tomcat.jdbc.pool.DataSource dataSource(DataSourceProperties properties) { org.apache.tomcat.jdbc.pool.DataSource dataSource = createDataSource(properties, org.apache.tomcat.jdbc.pool.DataSource.class); DatabaseDriver databaseDriver = DatabaseDriver.fromJdbcUrl(properties.determineUrl()); @@ -81,7 +81,7 @@ abstract class DataSourceConfiguration { @Bean @ConfigurationProperties(prefix = "spring.datasource.hikari") - public HikariDataSource dataSource(DataSourceProperties properties) { + HikariDataSource dataSource(DataSourceProperties properties) { HikariDataSource dataSource = createDataSource(properties, HikariDataSource.class); if (StringUtils.hasText(properties.getName())) { dataSource.setPoolName(properties.getName()); @@ -103,7 +103,7 @@ abstract class DataSourceConfiguration { @Bean @ConfigurationProperties(prefix = "spring.datasource.dbcp2") - public org.apache.commons.dbcp2.BasicDataSource dataSource(DataSourceProperties properties) { + org.apache.commons.dbcp2.BasicDataSource dataSource(DataSourceProperties properties) { return createDataSource(properties, org.apache.commons.dbcp2.BasicDataSource.class); } @@ -118,7 +118,7 @@ abstract class DataSourceConfiguration { static class Generic { @Bean - public DataSource dataSource(DataSourceProperties properties) { + DataSource dataSource(DataSourceProperties properties) { return properties.initializeDataSourceBuilder().build(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java index 8ce43395db..5b862d4024 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java @@ -80,7 +80,7 @@ class DataSourceInitializer { this(dataSource, properties, null); } - public DataSource getDataSource() { + DataSource getDataSource() { return this.dataSource; } @@ -89,7 +89,7 @@ class DataSourceInitializer { * @return {@code true} if the schema was created * @see DataSourceProperties#getSchema() */ - public boolean createSchema() { + boolean createSchema() { List scripts = getScripts("spring.datasource.schema", this.properties.getSchema(), "schema"); if (!scripts.isEmpty()) { if (!isEnabled()) { @@ -107,7 +107,7 @@ class DataSourceInitializer { * Initialize the schema if necessary. * @see DataSourceProperties#getData() */ - public void initSchema() { + void initSchema() { List scripts = getScripts("spring.datasource.data", this.properties.getData(), "data"); if (!scripts.isEmpty()) { if (!isEnabled()) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java index c30fb564a6..96351d9ec6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java @@ -62,7 +62,7 @@ class DataSourceJmxConfiguration { } @PostConstruct - public void validateMBeans() { + void validateMBeans() { HikariDataSource hikariDataSource = DataSourceUnwrapper.unwrap(this.dataSource, HikariDataSource.class); if (hikariDataSource != null && hikariDataSource.isRegisterMbeans()) { this.mBeanExporter.ifUnique((exporter) -> exporter.addExcludedBean("dataSource")); @@ -79,7 +79,7 @@ class DataSourceJmxConfiguration { @Bean @ConditionalOnMissingBean(name = "dataSourceMBean") - public Object dataSourceMBean(DataSource dataSource) { + Object dataSourceMBean(DataSource dataSource) { DataSourceProxy dataSourceProxy = DataSourceUnwrapper.unwrap(dataSource, DataSourceProxy.class); if (dataSourceProxy != null) { try { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java index 53748faad4..c0ab1f5b8c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java @@ -518,11 +518,11 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB this.connection = connection; } - public DataSourceProperties getProperties() { + DataSourceProperties getProperties() { return this.properties; } - public EmbeddedDatabaseConnection getConnection() { + EmbeddedDatabaseConnection getConnection() { return this.connection; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java index d16081028c..1664c622f6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java @@ -55,7 +55,7 @@ public class DataSourceTransactionManagerAutoConfiguration { @Bean @ConditionalOnMissingBean(PlatformTransactionManager.class) - public DataSourceTransactionManager transactionManager(DataSource dataSource, + DataSourceTransactionManager transactionManager(DataSource dataSource, ObjectProvider transactionManagerCustomizers) { DataSourceTransactionManager transactionManager = new DataSourceTransactionManager(dataSource); transactionManagerCustomizers.ifAvailable((customizers) -> customizers.customize(transactionManager)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateConfiguration.java index 5c1ac9d74e..2043304293 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateConfiguration.java @@ -36,7 +36,7 @@ class JdbcTemplateConfiguration { @Bean @Primary - public JdbcTemplate jdbcTemplate(DataSource dataSource, JdbcProperties properties) { + JdbcTemplate jdbcTemplate(DataSource dataSource, JdbcProperties properties) { JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); JdbcProperties.Template template = properties.getTemplate(); jdbcTemplate.setFetchSize(template.getFetchSize()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/NamedParameterJdbcTemplateConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/NamedParameterJdbcTemplateConfiguration.java index 0512fe9a28..1d9a20889b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/NamedParameterJdbcTemplateConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/NamedParameterJdbcTemplateConfiguration.java @@ -37,7 +37,7 @@ class NamedParameterJdbcTemplateConfiguration { @Bean @Primary - public NamedParameterJdbcTemplate namedParameterJdbcTemplate(JdbcTemplate jdbcTemplate) { + NamedParameterJdbcTemplate namedParameterJdbcTemplate(JdbcTemplate jdbcTemplate) { return new NamedParameterJdbcTemplate(jdbcTemplate); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProvidersConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProvidersConfiguration.java index b095859cb6..d34a183bfb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProvidersConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProvidersConfiguration.java @@ -43,7 +43,7 @@ public class DataSourcePoolMetadataProvidersConfiguration { static class TomcatDataSourcePoolMetadataProviderConfiguration { @Bean - public DataSourcePoolMetadataProvider tomcatPoolDataSourceMetadataProvider() { + DataSourcePoolMetadataProvider tomcatPoolDataSourceMetadataProvider() { return (dataSource) -> { org.apache.tomcat.jdbc.pool.DataSource tomcatDataSource = DataSourceUnwrapper.unwrap(dataSource, org.apache.tomcat.jdbc.pool.DataSource.class); @@ -61,7 +61,7 @@ public class DataSourcePoolMetadataProvidersConfiguration { static class HikariPoolDataSourceMetadataProviderConfiguration { @Bean - public DataSourcePoolMetadataProvider hikariPoolDataSourceMetadataProvider() { + DataSourcePoolMetadataProvider hikariPoolDataSourceMetadataProvider() { return (dataSource) -> { HikariDataSource hikariDataSource = DataSourceUnwrapper.unwrap(dataSource, HikariDataSource.class); if (hikariDataSource != null) { @@ -78,7 +78,7 @@ public class DataSourcePoolMetadataProvidersConfiguration { static class CommonsDbcp2PoolDataSourceMetadataProviderConfiguration { @Bean - public DataSourcePoolMetadataProvider commonsDbcp2PoolDataSourceMetadataProvider() { + DataSourcePoolMetadataProvider commonsDbcp2PoolDataSourceMetadataProvider() { return (dataSource) -> { BasicDataSource dbcpDataSource = DataSourceUnwrapper.unwrap(dataSource, BasicDataSource.class); if (dbcpDataSource != null) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java index ff175a3f0e..9011c0f2ff 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java @@ -201,7 +201,7 @@ public class JerseyAutoConfiguration implements ServletContextAware { static class JacksonResourceConfigCustomizer { @Bean - public ResourceConfigCustomizer resourceConfigCustomizer(final ObjectMapper objectMapper) { + ResourceConfigCustomizer resourceConfigCustomizer(final ObjectMapper objectMapper) { return (ResourceConfig config) -> { config.register(JacksonFeature.class); config.register(new ObjectMapperContextResolver(objectMapper), ContextResolver.class); @@ -213,7 +213,7 @@ public class JerseyAutoConfiguration implements ServletContextAware { static class JaxbObjectMapperCustomizer { @Autowired - public void addJaxbAnnotationIntrospector(ObjectMapper objectMapper) { + void addJaxbAnnotationIntrospector(ObjectMapper objectMapper) { JaxbAnnotationIntrospector jaxbAnnotationIntrospector = new JaxbAnnotationIntrospector( objectMapper.getTypeFactory()); objectMapper.setAnnotationIntrospectors( diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java index f9b083223b..271a3a9da4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java @@ -62,7 +62,7 @@ class JmsAnnotationDrivenConfiguration { @Bean @ConditionalOnMissingBean - public DefaultJmsListenerContainerFactoryConfigurer jmsListenerContainerFactoryConfigurer() { + DefaultJmsListenerContainerFactoryConfigurer jmsListenerContainerFactoryConfigurer() { DefaultJmsListenerContainerFactoryConfigurer configurer = new DefaultJmsListenerContainerFactoryConfigurer(); configurer.setDestinationResolver(this.destinationResolver.getIfUnique()); configurer.setTransactionManager(this.transactionManager.getIfUnique()); @@ -74,7 +74,7 @@ class JmsAnnotationDrivenConfiguration { @Bean @ConditionalOnSingleCandidate(ConnectionFactory.class) @ConditionalOnMissingBean(name = "jmsListenerContainerFactory") - public DefaultJmsListenerContainerFactory jmsListenerContainerFactory( + DefaultJmsListenerContainerFactory jmsListenerContainerFactory( DefaultJmsListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) { DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory(); configurer.configure(factory, connectionFactory); @@ -84,17 +84,17 @@ class JmsAnnotationDrivenConfiguration { @Configuration(proxyBeanMethods = false) @EnableJms @ConditionalOnMissingBean(name = JmsListenerConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME) - protected static class EnableJmsConfiguration { + static class EnableJmsConfiguration { } @Configuration(proxyBeanMethods = false) @ConditionalOnJndi - protected static class JndiConfiguration { + static class JndiConfiguration { @Bean @ConditionalOnMissingBean(DestinationResolver.class) - public JndiDestinationResolver destinationResolver() { + JndiDestinationResolver destinationResolver() { JndiDestinationResolver resolver = new JndiDestinationResolver(); resolver.setFallbackToDynamicDestination(true); return resolver; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java index 4cf76e7e9e..1390e7acd1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java @@ -68,7 +68,7 @@ class ActiveMQConnectionFactoryConfiguration { @Bean @ConditionalOnProperty(prefix = "spring.jms.cache", name = "enabled", havingValue = "true", matchIfMissing = true) - public CachingConnectionFactory cachingJmsConnectionFactory(JmsProperties jmsProperties) { + CachingConnectionFactory cachingJmsConnectionFactory(JmsProperties jmsProperties) { JmsProperties.Cache cacheProperties = jmsProperties.getCache(); CachingConnectionFactory connectionFactory = new CachingConnectionFactory(createConnectionFactory()); connectionFactory.setCacheConsumers(cacheProperties.isConsumers()); @@ -79,7 +79,7 @@ class ActiveMQConnectionFactoryConfiguration { @Bean @ConditionalOnProperty(prefix = "spring.jms.cache", name = "enabled", havingValue = "false") - public ActiveMQConnectionFactory jmsConnectionFactory() { + ActiveMQConnectionFactory jmsConnectionFactory() { return createConnectionFactory(); } @@ -97,7 +97,7 @@ class ActiveMQConnectionFactoryConfiguration { @Bean(destroyMethod = "stop") @ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "true", matchIfMissing = false) - public JmsPoolConnectionFactory pooledJmsConnectionFactory(ActiveMQProperties properties, + JmsPoolConnectionFactory pooledJmsConnectionFactory(ActiveMQProperties properties, ObjectProvider factoryCustomizers) { ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactoryFactory(properties, factoryCustomizers.orderedStream().collect(Collectors.toList())) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java index 25df16e77d..0c2125986c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java @@ -50,7 +50,7 @@ class ActiveMQConnectionFactoryFactory { this.factoryCustomizers = (factoryCustomizers != null) ? factoryCustomizers : Collections.emptyList(); } - public T createConnectionFactory(Class factoryClass) { + T createConnectionFactory(Class factoryClass) { try { return doCreateConnectionFactory(factoryClass); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java index 8d4686ab0e..7493d7950a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java @@ -48,7 +48,7 @@ class ActiveMQXAConnectionFactoryConfiguration { @Primary @Bean(name = { "jmsConnectionFactory", "xaJmsConnectionFactory" }) - public ConnectionFactory jmsConnectionFactory(ActiveMQProperties properties, + ConnectionFactory jmsConnectionFactory(ActiveMQProperties properties, ObjectProvider factoryCustomizers, XAConnectionFactoryWrapper wrapper) throws Exception { ActiveMQXAConnectionFactory connectionFactory = new ActiveMQConnectionFactoryFactory(properties, @@ -60,7 +60,7 @@ class ActiveMQXAConnectionFactoryConfiguration { @Bean @ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "false", matchIfMissing = true) - public ActiveMQConnectionFactory nonXaJmsConnectionFactory(ActiveMQProperties properties, + ActiveMQConnectionFactory nonXaJmsConnectionFactory(ActiveMQProperties properties, ObjectProvider factoryCustomizers) { return new ActiveMQConnectionFactoryFactory(properties, factoryCustomizers.orderedStream().collect(Collectors.toList())) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java index 8c59c6efc2..7c441fa984 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java @@ -61,7 +61,7 @@ class ArtemisConnectionFactoryConfiguration { @Bean @ConditionalOnProperty(prefix = "spring.jms.cache", name = "enabled", havingValue = "true", matchIfMissing = true) - public CachingConnectionFactory cachingJmsConnectionFactory(JmsProperties jmsProperties) { + CachingConnectionFactory cachingJmsConnectionFactory(JmsProperties jmsProperties) { JmsProperties.Cache cacheProperties = jmsProperties.getCache(); CachingConnectionFactory connectionFactory = new CachingConnectionFactory(createConnectionFactory()); connectionFactory.setCacheConsumers(cacheProperties.isConsumers()); @@ -72,7 +72,7 @@ class ArtemisConnectionFactoryConfiguration { @Bean @ConditionalOnProperty(prefix = "spring.jms.cache", name = "enabled", havingValue = "false") - public ActiveMQConnectionFactory jmsConnectionFactory() { + ActiveMQConnectionFactory jmsConnectionFactory() { return createConnectionFactory(); } @@ -90,7 +90,7 @@ class ArtemisConnectionFactoryConfiguration { @Bean(destroyMethod = "stop") @ConditionalOnProperty(prefix = "spring.artemis.pool", name = "enabled", havingValue = "true", matchIfMissing = false) - public JmsPoolConnectionFactory pooledJmsConnectionFactory(ListableBeanFactory beanFactory, + JmsPoolConnectionFactory pooledJmsConnectionFactory(ListableBeanFactory beanFactory, ArtemisProperties properties) { ActiveMQConnectionFactory connectionFactory = new ArtemisConnectionFactoryFactory(beanFactory, properties) .createConnectionFactory(ActiveMQConnectionFactory.class); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java index 069856ccfc..a339e252e4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java @@ -56,7 +56,7 @@ class ArtemisConnectionFactoryFactory { this.properties = properties; } - public T createConnectionFactory(Class factoryClass) { + T createConnectionFactory(Class factoryClass) { try { startEmbeddedJms(); return doCreateConnectionFactory(factoryClass); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java index 0438acfa3e..c3a56aab85 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java @@ -48,7 +48,7 @@ class ArtemisEmbeddedConfigurationFactory { this.properties = properties.getEmbedded(); } - public Configuration createConfiguration() { + Configuration createConfiguration() { ConfigurationImpl configuration = new ConfigurationImpl(); configuration.setSecurityEnabled(false); configuration.setPersistenceEnabled(this.properties.isPersistent()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedServerConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedServerConfiguration.java index 1bc3d02038..c36ab76a3c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedServerConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedServerConfiguration.java @@ -55,13 +55,13 @@ class ArtemisEmbeddedServerConfiguration { @Bean @ConditionalOnMissingBean - public org.apache.activemq.artemis.core.config.Configuration artemisConfiguration() { + org.apache.activemq.artemis.core.config.Configuration artemisConfiguration() { return new ArtemisEmbeddedConfigurationFactory(this.properties).createConfiguration(); } @Bean(initMethod = "start", destroyMethod = "stop") @ConditionalOnMissingBean - public EmbeddedJMS artemisServer(org.apache.activemq.artemis.core.config.Configuration configuration, + EmbeddedJMS artemisServer(org.apache.activemq.artemis.core.config.Configuration configuration, JMSConfiguration jmsConfiguration, ObjectProvider configurationCustomizers) { EmbeddedJMS server = new EmbeddedJMS(); @@ -74,7 +74,7 @@ class ArtemisEmbeddedServerConfiguration { @Bean @ConditionalOnMissingBean - public JMSConfiguration artemisJmsConfiguration(ObjectProvider queuesConfiguration, + JMSConfiguration artemisJmsConfiguration(ObjectProvider queuesConfiguration, ObjectProvider topicsConfiguration) { JMSConfiguration configuration = new JMSConfigurationImpl(); addAll(configuration.getQueueConfigurations(), queuesConfiguration); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java index 2a77dcf031..77bff3666a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java @@ -44,14 +44,14 @@ class ArtemisXAConnectionFactoryConfiguration { @Primary @Bean(name = { "jmsConnectionFactory", "xaJmsConnectionFactory" }) - public ConnectionFactory jmsConnectionFactory(ListableBeanFactory beanFactory, ArtemisProperties properties, + ConnectionFactory jmsConnectionFactory(ListableBeanFactory beanFactory, ArtemisProperties properties, XAConnectionFactoryWrapper wrapper) throws Exception { return wrapper.wrapConnectionFactory(new ArtemisConnectionFactoryFactory(beanFactory, properties) .createConnectionFactory(ActiveMQXAConnectionFactory.class)); } @Bean - public ActiveMQXAConnectionFactory nonXaJmsConnectionFactory(ListableBeanFactory beanFactory, + ActiveMQXAConnectionFactory nonXaJmsConnectionFactory(ListableBeanFactory beanFactory, ArtemisProperties properties) { return new ArtemisConnectionFactoryFactory(beanFactory, properties) .createConnectionFactory(ActiveMQXAConnectionFactory.class); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SpringTransaction.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SpringTransaction.java index b0d0a2dfe7..4e5a782f66 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SpringTransaction.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SpringTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ class SpringTransaction implements Transaction { this.transactionStatus = transactionStatus; } - public TransactionStatus getTxStatus() { + TransactionStatus getTxStatus() { return this.transactionStatus; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java index a73523d70f..5c03f0bde9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/SqlDialectLookup.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ final class SqlDialectLookup { * @param dataSource the source {@link DataSource} * @return the most suitable {@link SQLDialect} */ - public static SQLDialect getDialect(DataSource dataSource) { + static SQLDialect getDialect(DataSource dataSource) { if (dataSource == null) { return SQLDialect.DEFAULT; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java index f23243448f..1fb2e2643d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java @@ -92,7 +92,7 @@ class KafkaAnnotationDrivenConfiguration { @Bean @ConditionalOnMissingBean - public ConcurrentKafkaListenerContainerFactoryConfigurer kafkaListenerContainerFactoryConfigurer() { + ConcurrentKafkaListenerContainerFactoryConfigurer kafkaListenerContainerFactoryConfigurer() { ConcurrentKafkaListenerContainerFactoryConfigurer configurer = new ConcurrentKafkaListenerContainerFactoryConfigurer(); configurer.setKafkaProperties(this.properties); MessageConverter messageConverterToUse = (this.properties.getListener().getType().equals(Type.BATCH)) @@ -110,7 +110,7 @@ class KafkaAnnotationDrivenConfiguration { @Bean @ConditionalOnMissingBean(name = "kafkaListenerContainerFactory") - public ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory( + ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory( ConcurrentKafkaListenerContainerFactoryConfigurer configurer, ConsumerFactory kafkaConsumerFactory) { ConcurrentKafkaListenerContainerFactory factory = new ConcurrentKafkaListenerContainerFactory<>(); @@ -121,7 +121,7 @@ class KafkaAnnotationDrivenConfiguration { @Configuration(proxyBeanMethods = false) @EnableKafka @ConditionalOnMissingBean(name = KafkaListenerConfigUtils.KAFKA_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME) - protected static class EnableKafkaConfiguration { + static class EnableKafkaConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java index cc99740df4..0715989686 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java @@ -1153,11 +1153,11 @@ public class KafkaProperties { @SuppressWarnings("serial") private static class Properties extends HashMap { - public java.util.function.Consumer in(String key) { + java.util.function.Consumer in(String key) { return (value) -> put(key, value); } - public Properties with(Ssl ssl, Map properties) { + Properties with(Ssl ssl, Map properties) { putAll(ssl.buildProperties()); putAll(properties); return this; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaStreamsAnnotationDrivenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaStreamsAnnotationDrivenConfiguration.java index 9baba0686e..06f22c7e0b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaStreamsAnnotationDrivenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaStreamsAnnotationDrivenConfiguration.java @@ -53,7 +53,7 @@ class KafkaStreamsAnnotationDrivenConfiguration { @ConditionalOnMissingBean @Bean(KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME) - public KafkaStreamsConfiguration defaultKafkaStreamsConfig(Environment environment) { + KafkaStreamsConfiguration defaultKafkaStreamsConfig(Environment environment) { Map streamsProperties = this.properties.buildStreamsProperties(); if (this.properties.getStreams().getApplicationId() == null) { String applicationName = environment.getProperty("spring.application.name"); @@ -67,7 +67,7 @@ class KafkaStreamsAnnotationDrivenConfiguration { } @Bean - public KafkaStreamsFactoryBeanConfigurer kafkaStreamsFactoryBeanConfigurer( + KafkaStreamsFactoryBeanConfigurer kafkaStreamsFactoryBeanConfigurer( @Qualifier(KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_BUILDER_BEAN_NAME) StreamsBuilderFactoryBean factoryBean) { return new KafkaStreamsFactoryBeanConfigurer(this.properties, factoryBean); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderJndiConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderJndiConfiguration.java index b2828c3d9f..2d86791307 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderJndiConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderJndiConfiguration.java @@ -48,7 +48,7 @@ class MailSenderJndiConfiguration { } @Bean - public JavaMailSenderImpl mailSender(Session session) { + JavaMailSenderImpl mailSender(Session session) { JavaMailSenderImpl sender = new JavaMailSenderImpl(); sender.setDefaultEncoding(this.properties.getDefaultEncoding().name()); sender.setSession(session); @@ -57,7 +57,7 @@ class MailSenderJndiConfiguration { @Bean @ConditionalOnMissingBean - public Session session() { + Session session() { String jndiName = this.properties.getJndiName(); try { return JndiLocatorDelegate.createDefaultResourceRefLocator().lookup(jndiName, Session.class); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java index 5f5da82af8..3ac8ffa77c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java @@ -39,7 +39,7 @@ class MailSenderPropertiesConfiguration { @Bean @ConditionalOnMissingBean - public JavaMailSenderImpl mailSender(MailProperties properties) { + JavaMailSenderImpl mailSender(MailProperties properties) { JavaMailSenderImpl sender = new JavaMailSenderImpl(); applyProperties(properties, sender); return sender; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java index da92a76654..0e87bd1a7c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java @@ -67,7 +67,7 @@ public class MongoReactiveAutoConfiguration { @Bean @Order(Ordered.HIGHEST_PRECEDENCE) - public NettyDriverMongoClientSettingsBuilderCustomizer nettyDriverCustomizer( + NettyDriverMongoClientSettingsBuilderCustomizer nettyDriverCustomizer( ObjectProvider settings) { return new NettyDriverMongoClientSettingsBuilderCustomizer(settings); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java index e92a3d0b29..cbc3d9ee87 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java @@ -187,7 +187,7 @@ public class EmbeddedMongoAutoConfiguration { static class RuntimeConfigConfiguration { @Bean - public IRuntimeConfig embeddedMongoRuntimeConfig( + IRuntimeConfig embeddedMongoRuntimeConfig( ObjectProvider downloadConfigBuilderCustomizers) { Logger logger = LoggerFactory.getLogger(getClass().getPackage().getName() + ".EmbeddedMongo"); ProcessOutput processOutput = new ProcessOutput(Processors.logTo(logger, Slf4jLevel.INFO), diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheReactiveWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheReactiveWebConfiguration.java index f2cde14a29..4aa926fafa 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheReactiveWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheReactiveWebConfiguration.java @@ -32,7 +32,7 @@ class MustacheReactiveWebConfiguration { @Bean @ConditionalOnMissingBean - public MustacheViewResolver mustacheViewResolver(Compiler mustacheCompiler, MustacheProperties mustache) { + MustacheViewResolver mustacheViewResolver(Compiler mustacheCompiler, MustacheProperties mustache) { MustacheViewResolver resolver = new MustacheViewResolver(mustacheCompiler); resolver.setPrefix(mustache.getPrefix()); resolver.setSuffix(mustache.getSuffix()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java index ec958418ad..884a019ecd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java @@ -32,7 +32,7 @@ class MustacheServletWebConfiguration { @Bean @ConditionalOnMissingBean - public MustacheViewResolver mustacheViewResolver(Compiler mustacheCompiler, MustacheProperties mustache) { + MustacheViewResolver mustacheViewResolver(Compiler mustacheCompiler, MustacheProperties mustache) { MustacheViewResolver resolver = new MustacheViewResolver(mustacheCompiler); mustache.applyToMvcViewResolver(resolver); resolver.setCharset(mustache.getCharsetName()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java index ae269ada2c..6cc0743eea 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,7 +65,7 @@ final class DatabaseLookup { * @param dataSource the source {@link DataSource} * @return the most suitable {@link Database} */ - public static Database getDatabase(DataSource dataSource) { + static Database getDatabase(DataSource dataSource) { if (dataSource == null) { return Database.DEFAULT; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateDefaultDdlAutoProvider.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateDefaultDdlAutoProvider.java index 139e3b3e0f..3792d9536b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateDefaultDdlAutoProvider.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateDefaultDdlAutoProvider.java @@ -38,7 +38,7 @@ class HibernateDefaultDdlAutoProvider implements SchemaManagementProvider { this.providers = providers; } - public String getDefaultDdlAuto(DataSource dataSource) { + String getDefaultDdlAuto(DataSource dataSource) { if (!EmbeddedDatabaseConnection.isEmbedded(dataSource)) { return "none"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java index c908cf3585..ad8a11f3e4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java @@ -66,7 +66,7 @@ public class RSocketServerAutoConfiguration { static class WebFluxServerAutoConfiguration { @Bean - public RSocketWebSocketNettyRouteProvider rSocketWebsocketRouteProvider(RSocketProperties properties, + RSocketWebSocketNettyRouteProvider rSocketWebsocketRouteProvider(RSocketProperties properties, RSocketMessageHandler messageHandler) { return new RSocketWebSocketNettyRouteProvider(properties.getServer().getMappingPath(), messageHandler.serverAcceptor()); @@ -80,14 +80,14 @@ public class RSocketServerAutoConfiguration { @Bean @ConditionalOnMissingBean - public ReactorResourceFactory reactorResourceFactory() { + ReactorResourceFactory reactorResourceFactory() { return new ReactorResourceFactory(); } @Bean @ConditionalOnMissingBean - public RSocketServerFactory rSocketServerFactory(RSocketProperties properties, - ReactorResourceFactory resourceFactory, ObjectProvider customizers) { + RSocketServerFactory rSocketServerFactory(RSocketProperties properties, ReactorResourceFactory resourceFactory, + ObjectProvider customizers) { NettyRSocketServerFactory factory = new NettyRSocketServerFactory(); factory.setResourceFactory(resourceFactory); PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); @@ -99,7 +99,7 @@ public class RSocketServerAutoConfiguration { @Bean @ConditionalOnMissingBean - public RSocketServerBootstrap rSocketServerBootstrap(RSocketServerFactory rSocketServerFactory, + RSocketServerBootstrap rSocketServerBootstrap(RSocketServerFactory rSocketServerFactory, RSocketMessageHandler rSocketMessageHandler) { return new RSocketServerBootstrap(rSocketServerFactory, rSocketMessageHandler.serverAcceptor()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2ClientRegistrationRepositoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2ClientRegistrationRepositoryConfiguration.java index 740052d7f1..62c3502079 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2ClientRegistrationRepositoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2ClientRegistrationRepositoryConfiguration.java @@ -44,7 +44,7 @@ class OAuth2ClientRegistrationRepositoryConfiguration { @Bean @ConditionalOnMissingBean(ClientRegistrationRepository.class) - public InMemoryClientRegistrationRepository clientRegistrationRepository(OAuth2ClientProperties properties) { + InMemoryClientRegistrationRepository clientRegistrationRepository(OAuth2ClientProperties properties) { List registrations = new ArrayList<>( OAuth2ClientPropertiesRegistrationAdapter.getClientRegistrations(properties).values()); return new InMemoryClientRegistrationRepository(registrations); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java index 8d55647990..8b77628c49 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java @@ -40,15 +40,13 @@ class OAuth2WebSecurityConfiguration { @Bean @ConditionalOnMissingBean - public OAuth2AuthorizedClientService authorizedClientService( - ClientRegistrationRepository clientRegistrationRepository) { + OAuth2AuthorizedClientService authorizedClientService(ClientRegistrationRepository clientRegistrationRepository) { return new InMemoryOAuth2AuthorizedClientService(clientRegistrationRepository); } @Bean @ConditionalOnMissingBean - public OAuth2AuthorizedClientRepository authorizedClientRepository( - OAuth2AuthorizedClientService authorizedClientService) { + OAuth2AuthorizedClientRepository authorizedClientRepository(OAuth2AuthorizedClientService authorizedClientService) { return new AuthenticatedPrincipalOAuth2AuthorizedClientRepository(authorizedClientService); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java index 9ccb1050de..46342ca607 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java @@ -58,13 +58,13 @@ class ReactiveOAuth2ResourceServerJwkConfiguration { @Bean @ConditionalOnProperty(name = "spring.security.oauth2.resourceserver.jwt.jwk-set-uri") - public ReactiveJwtDecoder jwtDecoder() { + ReactiveJwtDecoder jwtDecoder() { return new NimbusReactiveJwtDecoder(this.properties.getJwkSetUri()); } @Bean @Conditional(KeyValueCondition.class) - public NimbusReactiveJwtDecoder jwtDecoderByPublicKeyValue() throws Exception { + NimbusReactiveJwtDecoder jwtDecoderByPublicKeyValue() throws Exception { RSAPublicKey publicKey = (RSAPublicKey) KeyFactory.getInstance("RSA") .generatePublic(new X509EncodedKeySpec(getKeySpec(this.properties.readPublicKey()))); return NimbusReactiveJwtDecoder.withPublicKey(publicKey).build(); @@ -77,7 +77,7 @@ class ReactiveOAuth2ResourceServerJwkConfiguration { @Bean @Conditional(IssuerUriCondition.class) - public ReactiveJwtDecoder jwtDecoderByIssuerUri() { + ReactiveJwtDecoder jwtDecoderByIssuerUri() { return ReactiveJwtDecoders.fromOidcIssuerLocation(this.properties.getIssuerUri()); } @@ -89,8 +89,7 @@ class ReactiveOAuth2ResourceServerJwkConfiguration { @Bean @ConditionalOnBean(ReactiveJwtDecoder.class) - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http, - ReactiveJwtDecoder jwtDecoder) { + SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http, ReactiveJwtDecoder jwtDecoder) { http.authorizeExchange().anyExchange().authenticated().and().oauth2ResourceServer().jwt() .jwtDecoder(jwtDecoder); return http.build(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerOpaqueTokenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerOpaqueTokenConfiguration.java index a77144b34a..ab37be7253 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerOpaqueTokenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerOpaqueTokenConfiguration.java @@ -42,7 +42,7 @@ class ReactiveOAuth2ResourceServerOpaqueTokenConfiguration { @Bean @ConditionalOnProperty(name = "spring.security.oauth2.resourceserver.opaquetoken.introspection-uri") - public NimbusReactiveOAuth2TokenIntrospectionClient oAuth2TokenIntrospectionClient( + NimbusReactiveOAuth2TokenIntrospectionClient oAuth2TokenIntrospectionClient( OAuth2ResourceServerProperties properties) { OAuth2ResourceServerProperties.Opaquetoken opaqueToken = properties.getOpaquetoken(); return new NimbusReactiveOAuth2TokenIntrospectionClient(opaqueToken.getIntrospectionUri(), @@ -57,7 +57,7 @@ class ReactiveOAuth2ResourceServerOpaqueTokenConfiguration { @Bean @ConditionalOnBean(ReactiveOAuth2TokenIntrospectionClient.class) - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { + SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { http.authorizeExchange().anyExchange().authenticated().and().oauth2ResourceServer().opaqueToken(); return http.build(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java index 8320bd221e..6a0f30dc5b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java @@ -59,14 +59,14 @@ class OAuth2ResourceServerJwtConfiguration { @Bean @ConditionalOnProperty(name = "spring.security.oauth2.resourceserver.jwt.jwk-set-uri") - public JwtDecoder jwtDecoderByJwkKeySetUri() { + JwtDecoder jwtDecoderByJwkKeySetUri() { return NimbusJwtDecoder.withJwkSetUri(this.properties.getJwkSetUri()) .jwsAlgorithm(SignatureAlgorithm.from(this.properties.getJwsAlgorithm())).build(); } @Bean @Conditional(KeyValueCondition.class) - public JwtDecoder jwtDecoderByPublicKeyValue() throws Exception { + JwtDecoder jwtDecoderByPublicKeyValue() throws Exception { RSAPublicKey publicKey = (RSAPublicKey) KeyFactory.getInstance("RSA") .generatePublic(new X509EncodedKeySpec(getKeySpec(this.properties.readPublicKey()))); return NimbusJwtDecoder.withPublicKey(publicKey).build(); @@ -79,7 +79,7 @@ class OAuth2ResourceServerJwtConfiguration { @Bean @Conditional(IssuerUriCondition.class) - public JwtDecoder jwtDecoderByIssuerUri() { + JwtDecoder jwtDecoderByIssuerUri() { return JwtDecoders.fromOidcIssuerLocation(this.properties.getIssuerUri()); } @@ -91,7 +91,7 @@ class OAuth2ResourceServerJwtConfiguration { @Bean @ConditionalOnBean(JwtDecoder.class) - public WebSecurityConfigurerAdapter jwtDecoderWebSecurityConfigurerAdapter() { + WebSecurityConfigurerAdapter jwtDecoderWebSecurityConfigurerAdapter() { return new WebSecurityConfigurerAdapter() { @Override protected void configure(HttpSecurity http) throws Exception { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java index f8c0b2d3db..8eb5fe2788 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java @@ -42,8 +42,7 @@ class OAuth2ResourceServerOpaqueTokenConfiguration { @Bean @ConditionalOnProperty(name = "spring.security.oauth2.resourceserver.opaquetoken.introspection-uri") - public NimbusOAuth2TokenIntrospectionClient oAuth2TokenIntrospectionClient( - OAuth2ResourceServerProperties properties) { + NimbusOAuth2TokenIntrospectionClient oAuth2TokenIntrospectionClient(OAuth2ResourceServerProperties properties) { OAuth2ResourceServerProperties.Opaquetoken opaqueToken = properties.getOpaquetoken(); return new NimbusOAuth2TokenIntrospectionClient(opaqueToken.getIntrospectionUri(), opaqueToken.getClientId(), opaqueToken.getClientSecret()); @@ -57,7 +56,7 @@ class OAuth2ResourceServerOpaqueTokenConfiguration { @Bean @ConditionalOnBean(OAuth2TokenIntrospectionClient.class) - public WebSecurityConfigurerAdapter opaqueTokenWebSecurityConfigurerAdapter() { + WebSecurityConfigurerAdapter opaqueTokenWebSecurityConfigurerAdapter() { return new WebSecurityConfigurerAdapter() { @Override protected void configure(HttpSecurity http) throws Exception { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java index 7904f845a1..88371ab426 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java @@ -51,16 +51,16 @@ class JdbcSessionConfiguration { @Bean @ConditionalOnMissingBean - public JdbcSessionDataSourceInitializer jdbcSessionDataSourceInitializer(DataSource dataSource, + JdbcSessionDataSourceInitializer jdbcSessionDataSourceInitializer(DataSource dataSource, ResourceLoader resourceLoader, JdbcSessionProperties properties) { return new JdbcSessionDataSourceInitializer(dataSource, resourceLoader, properties); } @Configuration - public static class SpringBootJdbcHttpSessionConfiguration extends JdbcHttpSessionConfiguration { + static class SpringBootJdbcHttpSessionConfiguration extends JdbcHttpSessionConfiguration { @Autowired - public void customize(SessionProperties sessionProperties, JdbcSessionProperties jdbcSessionProperties) { + void customize(SessionProperties sessionProperties, JdbcSessionProperties jdbcSessionProperties) { Duration timeout = sessionProperties.getTimeout(); if (timeout != null) { setMaxInactiveIntervalInSeconds((int) timeout.getSeconds()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoReactiveSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoReactiveSessionConfiguration.java index 6660b24044..b7bd1f73ed 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoReactiveSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoReactiveSessionConfiguration.java @@ -47,7 +47,7 @@ class MongoReactiveSessionConfiguration { static class SpringBootReactiveMongoWebSessionConfiguration extends ReactiveMongoWebSessionConfiguration { @Autowired - public void customize(SessionProperties sessionProperties, MongoSessionProperties mongoSessionProperties) { + void customize(SessionProperties sessionProperties, MongoSessionProperties mongoSessionProperties) { Duration timeout = sessionProperties.getTimeout(); if (timeout != null) { setMaxInactiveIntervalInSeconds((int) timeout.getSeconds()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java index 22944defa0..f43c7b3568 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java @@ -47,7 +47,7 @@ class RedisReactiveSessionConfiguration { static class SpringBootRedisWebSessionConfiguration extends RedisWebSessionConfiguration { @Autowired - public void customize(SessionProperties sessionProperties, RedisSessionProperties redisSessionProperties) { + void customize(SessionProperties sessionProperties, RedisSessionProperties redisSessionProperties) { Duration timeout = sessionProperties.getTimeout(); if (timeout != null) { setMaxInactiveIntervalInSeconds((int) timeout.getSeconds()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java index ff02bd42ae..3f830e6614 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java @@ -53,7 +53,7 @@ class RedisSessionConfiguration { @Bean @ConditionalOnMissingBean - public ConfigureRedisAction configureRedisAction(RedisSessionProperties redisSessionProperties) { + ConfigureRedisAction configureRedisAction(RedisSessionProperties redisSessionProperties) { switch (redisSessionProperties.getConfigureAction()) { case NOTIFY_KEYSPACE_EVENTS: return new ConfigureNotifyKeyspaceEventsAction(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java index c766828de8..64f453e010 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java @@ -92,7 +92,7 @@ public class SessionAutoConfiguration { @Bean @Conditional(DefaultCookieSerializerCondition.class) - public DefaultCookieSerializer cookieSerializer(ServerProperties serverProperties) { + DefaultCookieSerializer cookieSerializer(ServerProperties serverProperties) { Cookie cookie = serverProperties.getServlet().getSession().getCookie(); DefaultCookieSerializer cookieSerializer = new DefaultCookieSerializer(); PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); @@ -139,7 +139,7 @@ public class SessionAutoConfiguration { */ static class RememberMeServicesCookieSerializerCustomizer { - public void apply(DefaultCookieSerializer cookieSerializer) { + void apply(DefaultCookieSerializer cookieSerializer) { cookieSerializer.setRememberMeRequestAttribute(SpringSessionRememberMeServices.REMEMBER_ME_LOGIN_ATTR); } @@ -229,7 +229,7 @@ public class SessionAutoConfiguration { } @PostConstruct - public void checkAvailableImplementations() { + void checkAvailableImplementations() { List> availableCandidates = new ArrayList<>(); for (String candidate : this.candidates) { addCandidateIfAvailable(availableCandidates, candidate); @@ -304,7 +304,7 @@ public class SessionAutoConfiguration { } @PostConstruct - public void checkSessionRepository() { + void checkSessionRepository() { StoreType storeType = this.sessionProperties.getStoreType(); if (storeType != StoreType.NONE && this.sessionRepositoryProvider.getIfAvailable() == null && storeType != null) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java index 9e85a3625e..a5726ebe75 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.session.web.http.SessionRepositoryFilter; class SessionRepositoryFilterConfiguration { @Bean - public FilterRegistrationBean> sessionRepositoryFilterRegistration( + FilterRegistrationBean> sessionRepositoryFilterRegistration( SessionProperties sessionProperties, SessionRepositoryFilter filter) { FilterRegistrationBean> registration = new FilterRegistrationBean<>(filter); registration.setDispatcherTypes(getDispatcherTypes(sessionProperties)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionStoreMappings.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionStoreMappings.java index 6d391a00e6..d1412f385e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionStoreMappings.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionStoreMappings.java @@ -50,13 +50,13 @@ final class SessionStoreMappings { private SessionStoreMappings() { } - public static String getConfigurationClass(WebApplicationType webApplicationType, StoreType sessionStoreType) { + static String getConfigurationClass(WebApplicationType webApplicationType, StoreType sessionStoreType) { Configurations configurations = MAPPINGS.get(sessionStoreType); Assert.state(configurations != null, () -> "Unknown session store type " + sessionStoreType); return configurations.getConfiguration(webApplicationType); } - public static StoreType getType(WebApplicationType webApplicationType, String configurationClass) { + static StoreType getType(WebApplicationType webApplicationType, String configurationClass) { return MAPPINGS.entrySet().stream() .filter((entry) -> ObjectUtils.nullSafeEquals(configurationClass, entry.getValue().getConfiguration(webApplicationType))) @@ -75,7 +75,7 @@ final class SessionStoreMappings { this.reactiveConfiguration = reactiveConfiguration; } - public String getConfiguration(WebApplicationType webApplicationType) { + String getConfiguration(WebApplicationType webApplicationType) { switch (webApplicationType) { case SERVLET: return getName(this.servletConfiguration); @@ -85,7 +85,7 @@ final class SessionStoreMappings { return null; } - private String getName(Class configuration) { + String getName(Class configuration) { return (configuration != null) ? configuration.getName() : null; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index 27d12a10fd..ad19a5bc68 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -97,7 +97,7 @@ public class ThymeleafAutoConfiguration { } @PostConstruct - public void checkTemplateLocationExists() { + void checkTemplateLocationExists() { boolean checkTemplateLocation = this.properties.isCheckTemplateLocation(); if (checkTemplateLocation) { TemplateLocation location = new TemplateLocation(this.properties.getPrefix()); @@ -109,7 +109,7 @@ public class ThymeleafAutoConfiguration { } @Bean - public SpringResourceTemplateResolver defaultTemplateResolver() { + SpringResourceTemplateResolver defaultTemplateResolver() { SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver(); resolver.setApplicationContext(this.applicationContext); resolver.setPrefix(this.properties.getPrefix()); @@ -134,7 +134,7 @@ public class ThymeleafAutoConfiguration { @Bean @ConditionalOnMissingBean - public SpringTemplateEngine templateEngine(ThymeleafProperties properties, + SpringTemplateEngine templateEngine(ThymeleafProperties properties, ObjectProvider templateResolvers, ObjectProvider dialects) { SpringTemplateEngine engine = new SpringTemplateEngine(); engine.setEnableSpringELCompiler(properties.isEnableSpringElCompiler()); @@ -154,7 +154,7 @@ public class ThymeleafAutoConfiguration { @Bean @ConditionalOnEnabledResourceChain @ConditionalOnMissingFilterBean(ResourceUrlEncodingFilter.class) - public FilterRegistrationBean resourceUrlEncodingFilter() { + FilterRegistrationBean resourceUrlEncodingFilter() { FilterRegistrationBean registration = new FilterRegistrationBean<>( new ResourceUrlEncodingFilter()); registration.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.ERROR); @@ -166,7 +166,7 @@ public class ThymeleafAutoConfiguration { @Bean @ConditionalOnMissingBean(name = "thymeleafViewResolver") - public ThymeleafViewResolver thymeleafViewResolver(ThymeleafProperties properties, + ThymeleafViewResolver thymeleafViewResolver(ThymeleafProperties properties, SpringTemplateEngine templateEngine) { ThymeleafViewResolver resolver = new ThymeleafViewResolver(); resolver.setTemplateEngine(templateEngine); @@ -205,7 +205,7 @@ public class ThymeleafAutoConfiguration { @Bean @ConditionalOnMissingBean(ISpringWebFluxTemplateEngine.class) - public SpringWebFluxTemplateEngine templateEngine(ThymeleafProperties properties, + SpringWebFluxTemplateEngine templateEngine(ThymeleafProperties properties, ObjectProvider templateResolvers, ObjectProvider dialects) { SpringWebFluxTemplateEngine engine = new SpringWebFluxTemplateEngine(); engine.setEnableSpringELCompiler(properties.isEnableSpringElCompiler()); @@ -224,7 +224,7 @@ public class ThymeleafAutoConfiguration { @Bean @ConditionalOnMissingBean(name = "thymeleafReactiveViewResolver") - public ThymeleafReactiveViewResolver thymeleafViewResolver(ISpringWebFluxTemplateEngine templateEngine, + ThymeleafReactiveViewResolver thymeleafViewResolver(ISpringWebFluxTemplateEngine templateEngine, ThymeleafProperties properties) { ThymeleafReactiveViewResolver resolver = new ThymeleafReactiveViewResolver(); resolver.setTemplateEngine(templateEngine); @@ -256,11 +256,11 @@ public class ThymeleafAutoConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnClass(LayoutDialect.class) - protected static class ThymeleafWebLayoutConfiguration { + static class ThymeleafWebLayoutConfiguration { @Bean @ConditionalOnMissingBean - public LayoutDialect layoutDialect() { + LayoutDialect layoutDialect() { return new LayoutDialect(); } @@ -268,11 +268,11 @@ public class ThymeleafAutoConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnClass(DataAttributeDialect.class) - protected static class DataAttributeDialectConfiguration { + static class DataAttributeDialectConfiguration { @Bean @ConditionalOnMissingBean - public DataAttributeDialect dialect() { + DataAttributeDialect dialect() { return new DataAttributeDialect(); } @@ -280,11 +280,11 @@ public class ThymeleafAutoConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ SpringSecurityDialect.class }) - protected static class ThymeleafSecurityDialectConfiguration { + static class ThymeleafSecurityDialectConfiguration { @Bean @ConditionalOnMissingBean - public SpringSecurityDialect securityDialect() { + SpringSecurityDialect securityDialect() { return new SpringSecurityDialect(); } @@ -292,11 +292,11 @@ public class ThymeleafAutoConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Java8TimeDialect.class) - protected static class ThymeleafJava8TimeDialect { + static class ThymeleafJava8TimeDialect { @Bean @ConditionalOnMissingBean - public Java8TimeDialect java8TimeDialect() { + Java8TimeDialect java8TimeDialect() { return new Java8TimeDialect(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java index 19e85b3003..5bf7a27be3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java @@ -62,7 +62,7 @@ class AtomikosJtaConfiguration { @Bean(initMethod = "init", destroyMethod = "shutdownWait") @ConditionalOnMissingBean(UserTransactionService.class) - public UserTransactionServiceImp userTransactionService(AtomikosProperties atomikosProperties, + UserTransactionServiceImp userTransactionService(AtomikosProperties atomikosProperties, JtaProperties jtaProperties) { Properties properties = new Properties(); if (StringUtils.hasText(jtaProperties.getTransactionManagerId())) { @@ -83,8 +83,7 @@ class AtomikosJtaConfiguration { @Bean(initMethod = "init", destroyMethod = "close") @ConditionalOnMissingBean - public UserTransactionManager atomikosTransactionManager(UserTransactionService userTransactionService) - throws Exception { + UserTransactionManager atomikosTransactionManager(UserTransactionService userTransactionService) throws Exception { UserTransactionManager manager = new UserTransactionManager(); manager.setStartupTransactionService(false); manager.setForceShutdown(true); @@ -93,19 +92,18 @@ class AtomikosJtaConfiguration { @Bean @ConditionalOnMissingBean(XADataSourceWrapper.class) - public AtomikosXADataSourceWrapper xaDataSourceWrapper() { + AtomikosXADataSourceWrapper xaDataSourceWrapper() { return new AtomikosXADataSourceWrapper(); } @Bean @ConditionalOnMissingBean - public static AtomikosDependsOnBeanFactoryPostProcessor atomikosDependsOnBeanFactoryPostProcessor() { + static AtomikosDependsOnBeanFactoryPostProcessor atomikosDependsOnBeanFactoryPostProcessor() { return new AtomikosDependsOnBeanFactoryPostProcessor(); } @Bean - public JtaTransactionManager transactionManager(UserTransaction userTransaction, - TransactionManager transactionManager, + JtaTransactionManager transactionManager(UserTransaction userTransaction, TransactionManager transactionManager, ObjectProvider transactionManagerCustomizers) { JtaTransactionManager jtaTransactionManager = new JtaTransactionManager(userTransaction, transactionManager); transactionManagerCustomizers.ifAvailable((customizers) -> customizers.customize(jtaTransactionManager)); @@ -118,7 +116,7 @@ class AtomikosJtaConfiguration { @Bean @ConditionalOnMissingBean(XAConnectionFactoryWrapper.class) - public AtomikosXAConnectionFactoryWrapper xaConnectionFactoryWrapper() { + AtomikosXAConnectionFactoryWrapper xaConnectionFactoryWrapper() { return new AtomikosXAConnectionFactoryWrapper(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java index 5abcb54e1c..1edf664e77 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java @@ -61,7 +61,7 @@ class BitronixJtaConfiguration { @Bean @ConditionalOnMissingBean @ConfigurationProperties(prefix = "spring.jta.bitronix.properties") - public bitronix.tm.Configuration bitronixConfiguration(JtaProperties jtaProperties) { + bitronix.tm.Configuration bitronixConfiguration(JtaProperties jtaProperties) { bitronix.tm.Configuration config = TransactionManagerServices.getConfiguration(); if (StringUtils.hasText(jtaProperties.getTransactionManagerId())) { config.setServerId(jtaProperties.getTransactionManagerId()); @@ -83,26 +83,25 @@ class BitronixJtaConfiguration { @Bean @ConditionalOnMissingBean(TransactionManager.class) - public BitronixTransactionManager bitronixTransactionManager(bitronix.tm.Configuration configuration) { + BitronixTransactionManager bitronixTransactionManager(bitronix.tm.Configuration configuration) { // Inject configuration to force ordering return TransactionManagerServices.getTransactionManager(); } @Bean @ConditionalOnMissingBean(XADataSourceWrapper.class) - public BitronixXADataSourceWrapper xaDataSourceWrapper() { + BitronixXADataSourceWrapper xaDataSourceWrapper() { return new BitronixXADataSourceWrapper(); } @Bean @ConditionalOnMissingBean - public static BitronixDependentBeanFactoryPostProcessor bitronixDependentBeanFactoryPostProcessor() { + static BitronixDependentBeanFactoryPostProcessor bitronixDependentBeanFactoryPostProcessor() { return new BitronixDependentBeanFactoryPostProcessor(); } @Bean - public JtaTransactionManager transactionManager(UserTransaction userTransaction, - TransactionManager transactionManager, + JtaTransactionManager transactionManager(UserTransaction userTransaction, TransactionManager transactionManager, ObjectProvider transactionManagerCustomizers) { JtaTransactionManager jtaTransactionManager = new JtaTransactionManager(userTransaction, transactionManager); transactionManagerCustomizers.ifAvailable((customizers) -> customizers.customize(jtaTransactionManager)); @@ -115,7 +114,7 @@ class BitronixJtaConfiguration { @Bean @ConditionalOnMissingBean(XAConnectionFactoryWrapper.class) - public BitronixXAConnectionFactoryWrapper xaConnectionFactoryWrapper() { + BitronixXAConnectionFactoryWrapper xaConnectionFactoryWrapper() { return new BitronixXAConnectionFactoryWrapper(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JndiJtaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JndiJtaConfiguration.java index 26cb13d0a6..2bee60e2b5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JndiJtaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JndiJtaConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.transaction.jta.JtaTransactionManager; class JndiJtaConfiguration { @Bean - public JtaTransactionManager transactionManager( + JtaTransactionManager transactionManager( ObjectProvider transactionManagerCustomizers) { JtaTransactionManager jtaTransactionManager = new JtaTransactionManagerFactoryBean().getObject(); transactionManagerCustomizers.ifAvailable((customizers) -> customizers.customize(jtaTransactionManager)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java index 4291faec91..7a8a3b5139 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java @@ -60,12 +60,12 @@ abstract class ReactiveWebServerFactoryConfiguration { @Bean @ConditionalOnMissingBean - public ReactorResourceFactory reactorServerResourceFactory() { + ReactorResourceFactory reactorServerResourceFactory() { return new ReactorResourceFactory(); } @Bean - public NettyReactiveWebServerFactory nettyReactiveWebServerFactory(ReactorResourceFactory resourceFactory, + NettyReactiveWebServerFactory nettyReactiveWebServerFactory(ReactorResourceFactory resourceFactory, ObjectProvider routes) { NettyReactiveWebServerFactory serverFactory = new NettyReactiveWebServerFactory(); serverFactory.setResourceFactory(resourceFactory); @@ -81,7 +81,7 @@ abstract class ReactiveWebServerFactoryConfiguration { static class EmbeddedTomcat { @Bean - public TomcatReactiveWebServerFactory tomcatReactiveWebServerFactory( + TomcatReactiveWebServerFactory tomcatReactiveWebServerFactory( ObjectProvider connectorCustomizers, ObjectProvider contextCustomizers, ObjectProvider> protocolHandlerCustomizers) { @@ -104,12 +104,12 @@ abstract class ReactiveWebServerFactoryConfiguration { @Bean @ConditionalOnMissingBean - public JettyResourceFactory jettyServerResourceFactory() { + JettyResourceFactory jettyServerResourceFactory() { return new JettyResourceFactory(); } @Bean - public JettyReactiveWebServerFactory jettyReactiveWebServerFactory(JettyResourceFactory resourceFactory, + JettyReactiveWebServerFactory jettyReactiveWebServerFactory(JettyResourceFactory resourceFactory, ObjectProvider serverCustomizers) { JettyReactiveWebServerFactory serverFactory = new JettyReactiveWebServerFactory(); serverFactory.getServerCustomizers().addAll(serverCustomizers.orderedStream().collect(Collectors.toList())); @@ -125,7 +125,7 @@ abstract class ReactiveWebServerFactoryConfiguration { static class EmbeddedUndertow { @Bean - public UndertowReactiveWebServerFactory undertowReactiveWebServerFactory( + UndertowReactiveWebServerFactory undertowReactiveWebServerFactory( ObjectProvider deploymentInfoCustomizers, ObjectProvider builderCustomizers) { UndertowReactiveWebServerFactory factory = new UndertowReactiveWebServerFactory(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java index c7ebde4a34..39f3779841 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java @@ -242,7 +242,7 @@ public class WebFluxAutoConfiguration { static class ResourceChainCustomizerConfiguration { @Bean - public ResourceChainResourceHandlerRegistrationCustomizer resourceHandlerRegistrationCustomizer() { + ResourceChainResourceHandlerRegistrationCustomizer resourceHandlerRegistrationCustomizer() { return new ResourceChainResourceHandlerRegistrationCustomizer(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java index 531020f554..d6f0d0a65f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java @@ -546,7 +546,7 @@ public class WebMvcAutoConfiguration { static class ResourceChainCustomizerConfiguration { @Bean - public ResourceChainResourceHandlerRegistrationCustomizer resourceHandlerRegistrationCustomizer() { + ResourceChainResourceHandlerRegistrationCustomizer resourceHandlerRegistrationCustomizer() { return new ResourceChainResourceHandlerRegistrationCustomizer(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java index c320a0996f..35d12435ba 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java @@ -137,7 +137,7 @@ public class ErrorMvcAutoConfiguration { @Bean @ConditionalOnBean(DispatcherServlet.class) @ConditionalOnMissingBean - public DefaultErrorViewResolver conventionErrorViewResolver() { + DefaultErrorViewResolver conventionErrorViewResolver() { return new DefaultErrorViewResolver(this.applicationContext, this.resourceProperties); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java index c1de5e4b54..f453a14772 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java @@ -53,7 +53,7 @@ public class WebSocketReactiveAutoConfiguration { @Bean @ConditionalOnMissingBean(name = "websocketReactiveWebServerCustomizer") - public TomcatWebSocketReactiveWebServerCustomizer websocketReactiveWebServerCustomizer() { + TomcatWebSocketReactiveWebServerCustomizer websocketReactiveWebServerCustomizer() { return new TomcatWebSocketReactiveWebServerCustomizer(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java index f57ccb8e12..de8a544e0b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java @@ -65,7 +65,7 @@ public class WebSocketServletAutoConfiguration { @Bean @ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer") - public TomcatWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() { + TomcatWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() { return new TomcatWebSocketServletWebServerCustomizer(); } @@ -77,7 +77,7 @@ public class WebSocketServletAutoConfiguration { @Bean @ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer") - public JettyWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() { + JettyWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() { return new JettyWebSocketServletWebServerCustomizer(); } @@ -89,7 +89,7 @@ public class WebSocketServletAutoConfiguration { @Bean @ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer") - public UndertowWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() { + UndertowWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() { return new UndertowWebSocketServletWebServerCustomizer(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java index 636dfb0164..d116626562 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java @@ -224,13 +224,13 @@ class AutoConfigurationImportSelectorTests { return Collections.singletonList((event) -> this.lastEvent = event); } - public AutoConfigurationImportEvent getLastEvent() { + AutoConfigurationImportEvent getLastEvent() { return this.lastEvent; } } - private static class TestAutoConfigurationImportFilter implements AutoConfigurationImportFilter, BeanFactoryAware { + static class TestAutoConfigurationImportFilter implements AutoConfigurationImportFilter, BeanFactoryAware { private final Set nonMatching = new HashSet<>(); @@ -256,7 +256,7 @@ class AutoConfigurationImportSelectorTests { this.beanFactory = beanFactory; } - public BeanFactory getBeanFactory() { + BeanFactory getBeanFactory() { return this.beanFactory; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java index 1dce4b0a5a..900f0c0868 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java @@ -54,13 +54,13 @@ class AutoConfigurationReproTests { } @Configuration(proxyBeanMethods = false) - public static class Config { + static class Config { } @Configuration(proxyBeanMethods = false) @ImportResource("classpath:/early-init-test.xml") - public static class EarlyInitConfig { + static class EarlyInitConfig { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java index ceb6825892..1ddbcca63d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java @@ -199,73 +199,73 @@ class AutoConfigurationSorterTests { } @AutoConfigureOrder - public static class OrderUnspecified { + static class OrderUnspecified { } @AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE) - public static class OrderLowest { + static class OrderLowest { } @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE) - public static class OrderHighest { + static class OrderHighest { } @AutoConfigureAfter(AutoConfigureB.class) - public static class AutoConfigureA { + static class AutoConfigureA { } @AutoConfigureAfter(name = "org.springframework.boot.autoconfigure.AutoConfigurationSorterTests$AutoConfigureB") - public static class AutoConfigureA2 { + static class AutoConfigureA2 { } @AutoConfigureAfter({ AutoConfigureC.class, AutoConfigureD.class, AutoConfigureE.class }) - public static class AutoConfigureB { + static class AutoConfigureB { } - public static class AutoConfigureC { + static class AutoConfigureC { } @AutoConfigureAfter(AutoConfigureA.class) - public static class AutoConfigureD { + static class AutoConfigureD { } - public static class AutoConfigureE { + static class AutoConfigureE { } @AutoConfigureBefore(AutoConfigureB.class) - public static class AutoConfigureW { + static class AutoConfigureW { } @AutoConfigureBefore(name = "org.springframework.boot.autoconfigure.AutoConfigurationSorterTests$AutoConfigureB") - public static class AutoConfigureW2 { + static class AutoConfigureW2 { } - public static class AutoConfigureX { + static class AutoConfigureX { } @AutoConfigureBefore(AutoConfigureX.class) - public static class AutoConfigureY { + static class AutoConfigureY { } @AutoConfigureBefore(AutoConfigureY.class) - public static class AutoConfigureZ { + static class AutoConfigureZ { } - private static class SkipCycleMetadataReaderFactory extends CachingMetadataReaderFactory { + static class SkipCycleMetadataReaderFactory extends CachingMetadataReaderFactory { @Override public MetadataReader getMetadataReader(String className) throws IOException { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationsTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationsTests.java index e6c8095c3b..3b7435594a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationsTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationsTests.java @@ -37,11 +37,11 @@ class AutoConfigurationsTests { } @AutoConfigureAfter(AutoConfigureB.class) - public static class AutoConfigureA { + static class AutoConfigureA { } - public static class AutoConfigureB { + static class AutoConfigureB { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigureConfigurationClassTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigureConfigurationClassTests.java deleted file mode 100644 index ebc93d7e27..0000000000 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigureConfigurationClassTests.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.boot.autoconfigure; - -import org.springframework.boot.testsupport.context.AbstractConfigurationClassTests; - -/** - * Tests for the auto-configure module's {@code @Configuration} classes. - * - * @author Andy Wilkinson - */ -public class AutoConfigureConfigurationClassTests extends AbstractConfigurationClassTests { - -} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java index cca72b9884..5f84b03fd0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java @@ -312,7 +312,7 @@ class ImportAutoConfigurationImportSelectorTests { } - private static class TestImportAutoConfigurationImportSelector extends ImportAutoConfigurationImportSelector { + static class TestImportAutoConfigurationImportSelector extends ImportAutoConfigurationImportSelector { @Override protected Collection loadFactoryNames(Class source) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SharedMetadataReaderFactoryContextInitializerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SharedMetadataReaderFactoryContextInitializerTests.java index 8da3f7e22e..8ee879d2de 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SharedMetadataReaderFactoryContextInitializerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SharedMetadataReaderFactoryContextInitializerTests.java @@ -55,7 +55,7 @@ class SharedMetadataReaderFactoryContextInitializerTests { assertThat(definition.getAttribute("seen")).isEqualTo(true); } - protected static class TestConfig { + static class TestConfig { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringBootApplicationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringBootApplicationTests.java index e6f2945c6f..d4260e10f4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringBootApplicationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringBootApplicationTests.java @@ -46,12 +46,12 @@ class SpringBootApplicationTests { } @SpringBootApplication - private static class DefaultSpringBootApplication { + static class DefaultSpringBootApplication { } @SpringBootApplication(proxyBeanMethods = false) - private static class NoBeanMethodProxyingSpringBootApplication { + static class NoBeanMethodProxyingSpringBootApplication { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java index 96de272f6d..84982b51e6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java @@ -54,7 +54,7 @@ class SpringJUnitTests { @Configuration(proxyBeanMethods = false) @Import({ PropertyPlaceholderAutoConfiguration.class }) - public static class TestConfiguration { + static class TestConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/TestAutoConfigurationSorter.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/TestAutoConfigurationSorter.java index 8d51a6d4a3..728fbb110d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/TestAutoConfigurationSorter.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/TestAutoConfigurationSorter.java @@ -16,6 +16,8 @@ package org.springframework.boot.autoconfigure; +import java.util.Collection; +import java.util.List; import java.util.Properties; import org.springframework.core.type.classreading.MetadataReaderFactory; @@ -31,4 +33,9 @@ public class TestAutoConfigurationSorter extends AutoConfigurationSorter { super(metadataReaderFactory, AutoConfigurationMetadataLoader.loadMetadata(new Properties())); } + @Override + public List getInPriorityOrder(Collection classNames) { + return super.getInPriorityOrder(classNames); + } + } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfigurationTests.java index 600fa09609..12b2ebe7ac 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfigurationTests.java @@ -146,12 +146,12 @@ class SpringApplicationAdminJmxAutoConfigurationTests { static class MultipleMBeanExportersConfiguration { @Bean - public MBeanExporter firstMBeanExporter() { + MBeanExporter firstMBeanExporter() { return new MBeanExporter(); } @Bean - public MBeanExporter secondMBeanExporter() { + MBeanExporter secondMBeanExporter() { return new MBeanExporter(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java index 59e160060d..396a191905 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java @@ -680,12 +680,12 @@ class RabbitAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration { + static class TestConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration2 { + static class TestConfiguration2 { @Bean ConnectionFactory aDifferentConnectionFactory() { @@ -695,7 +695,7 @@ class RabbitAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration3 { + static class TestConfiguration3 { @Bean RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory, MessageConverter messageConverter) { @@ -705,14 +705,14 @@ class RabbitAutoConfigurationTests { } @Bean - public MessageConverter testMessageConverter() { + MessageConverter testMessageConverter() { return mock(MessageConverter.class); } } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration4 { + static class TestConfiguration4 { @Bean RabbitMessagingTemplate messagingTemplate(RabbitTemplate rabbitTemplate) { @@ -724,7 +724,7 @@ class RabbitAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration5 { + static class TestConfiguration5 { @Bean RabbitListenerContainerFactory rabbitListenerContainerFactory() { @@ -734,58 +734,58 @@ class RabbitAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class MessageConvertersConfiguration { + static class MessageConvertersConfiguration { @Bean @Primary - public MessageConverter myMessageConverter() { + MessageConverter myMessageConverter() { return mock(MessageConverter.class); } @Bean - public MessageConverter anotherMessageConverter() { + MessageConverter anotherMessageConverter() { return mock(MessageConverter.class); } } @Configuration(proxyBeanMethods = false) - protected static class MessageRecoverersConfiguration { + static class MessageRecoverersConfiguration { @Bean @Primary - public MessageRecoverer myMessageRecoverer() { + MessageRecoverer myMessageRecoverer() { return mock(MessageRecoverer.class); } @Bean - public MessageRecoverer anotherMessageRecoverer() { + MessageRecoverer anotherMessageRecoverer() { return mock(MessageRecoverer.class); } } @Configuration(proxyBeanMethods = false) - protected static class ConnectionNameStrategyConfiguration { + static class ConnectionNameStrategyConfiguration { private final AtomicInteger counter = new AtomicInteger(); @Bean - public ConnectionNameStrategy myConnectionNameStrategy() { + ConnectionNameStrategy myConnectionNameStrategy() { return (connectionFactory) -> "test#" + this.counter.getAndIncrement(); } } @Configuration(proxyBeanMethods = false) - protected static class RabbitRetryTemplateCustomizerConfiguration { + static class RabbitRetryTemplateCustomizerConfiguration { private final BackOffPolicy backOffPolicy = new ExponentialBackOffPolicy(); private final RetryPolicy retryPolicy = new NeverRetryPolicy(); @Bean - public RabbitRetryTemplateCustomizer rabbitTemplateRetryTemplateCustomizer() { + RabbitRetryTemplateCustomizer rabbitTemplateRetryTemplateCustomizer() { return (target, template) -> { if (target.equals(RabbitRetryTemplateCustomizer.Target.SENDER)) { template.setBackOffPolicy(this.backOffPolicy); @@ -794,7 +794,7 @@ class RabbitAutoConfigurationTests { } @Bean - public RabbitRetryTemplateCustomizer rabbitListenerRetryTemplateCustomizer() { + RabbitRetryTemplateCustomizer rabbitListenerRetryTemplateCustomizer() { return (target, template) -> { if (target.equals(RabbitRetryTemplateCustomizer.Target.LISTENER)) { template.setRetryPolicy(this.retryPolicy); @@ -806,12 +806,12 @@ class RabbitAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableRabbit - protected static class EnableRabbitConfiguration { + static class EnableRabbitConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class NoEnableRabbitConfiguration { + static class NoEnableRabbitConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java index 91046d7b12..58a3e64d46 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java @@ -100,26 +100,26 @@ class AopAutoConfigurationTests { @EnableAspectJAutoProxy @Configuration(proxyBeanMethods = false) @Import(TestConfiguration.class) - protected static class CustomTestConfiguration { + static class CustomTestConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration { + static class TestConfiguration { @Bean - public TestAspect aspect() { + TestAspect aspect() { return new TestAspect(); } @Bean - public TestInterface bean() { + TestInterface bean() { return new TestBean(); } } - protected static class TestBean implements TestInterface { + static class TestBean implements TestInterface { @Override public void foo() { @@ -128,22 +128,22 @@ class AopAutoConfigurationTests { } @Aspect - protected static class TestAspect { + static class TestAspect { private boolean called; - public boolean isCalled() { + boolean isCalled() { return this.called; } @Before("execution(* foo(..))") - public void before() { + void before() { this.called = true; } } - public interface TestInterface { + interface TestInterface { void foo(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java index f093213c4a..d9ed265e86 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java @@ -234,19 +234,19 @@ class BatchAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class EmptyConfiguration { + static class EmptyConfiguration { } @EnableBatchProcessing @TestAutoConfigurationPackage(City.class) - protected static class TestConfiguration { + static class TestConfiguration { } @EnableBatchProcessing @TestAutoConfigurationPackage(City.class) - protected static class TestCustomConfiguration implements BatchConfigurer { + static class TestCustomConfiguration implements BatchConfigurer { private JobRepository jobRepository; @@ -284,7 +284,7 @@ class BatchAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableBatchProcessing - protected static class NamedJobConfigurationWithRegisteredJob { + static class NamedJobConfigurationWithRegisteredJob { @Autowired private JobRegistry jobRegistry; @@ -293,14 +293,14 @@ class BatchAutoConfigurationTests { private JobRepository jobRepository; @Bean - public JobRegistryBeanPostProcessor registryProcessor() { + JobRegistryBeanPostProcessor registryProcessor() { JobRegistryBeanPostProcessor processor = new JobRegistryBeanPostProcessor(); processor.setJobRegistry(this.jobRegistry); return processor; } @Bean - public Job discreteJob() { + Job discreteJob() { AbstractJob job = new AbstractJob("discreteRegisteredJob") { @Override @@ -326,13 +326,13 @@ class BatchAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableBatchProcessing - protected static class NamedJobConfigurationWithLocalJob { + static class NamedJobConfigurationWithLocalJob { @Autowired private JobRepository jobRepository; @Bean - public Job discreteJob() { + Job discreteJob() { AbstractJob job = new AbstractJob("discreteLocalJob") { @Override @@ -358,13 +358,13 @@ class BatchAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableBatchProcessing - protected static class JobConfiguration { + static class JobConfiguration { @Autowired private JobRepository jobRepository; @Bean - public Job job() { + Job job() { AbstractJob job = new AbstractJob() { @Override diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java index 019e86c527..6bc5790be7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java @@ -89,7 +89,7 @@ public class BatchAutoConfigurationWithoutJpaTests { @EnableBatchProcessing @TestAutoConfigurationPackage(City.class) - protected static class DefaultConfiguration { + static class DefaultConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunnerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunnerTests.java index 67da126148..e02e1c5eba 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunnerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunnerTests.java @@ -200,7 +200,7 @@ class JobLauncherCommandLineRunnerTests { @Configuration(proxyBeanMethods = false) @EnableBatchProcessing - protected static class BatchConfiguration implements BatchConfigurer { + static class BatchConfiguration implements BatchConfigurer { private ResourcelessTransactionManager transactionManager = new ResourcelessTransactionManager(); @@ -209,11 +209,11 @@ class JobLauncherCommandLineRunnerTests { private MapJobRepositoryFactoryBean jobRepositoryFactory = new MapJobRepositoryFactoryBean( this.transactionManager); - public BatchConfiguration() throws Exception { + BatchConfiguration() throws Exception { this.jobRepository = this.jobRepositoryFactory.getObject(); } - public void clear() { + void clear() { this.jobRepositoryFactory.clear(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/AbstractCacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/AbstractCacheAutoConfigurationTests.java index 4b7dbe147f..a7cab890b1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/AbstractCacheAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/AbstractCacheAutoConfigurationTests.java @@ -80,63 +80,63 @@ abstract class AbstractCacheAutoConfigurationTests { static class CacheManagerCustomizersConfiguration { @Bean - public CacheManagerCustomizer allCacheManagerCustomizer() { + CacheManagerCustomizer allCacheManagerCustomizer() { return new CacheManagerTestCustomizer() { }; } @Bean - public CacheManagerCustomizer simpleCacheManagerCustomizer() { + CacheManagerCustomizer simpleCacheManagerCustomizer() { return new CacheManagerTestCustomizer() { }; } @Bean - public CacheManagerCustomizer genericCacheManagerCustomizer() { + CacheManagerCustomizer genericCacheManagerCustomizer() { return new CacheManagerTestCustomizer() { }; } @Bean - public CacheManagerCustomizer couchbaseCacheManagerCustomizer() { + CacheManagerCustomizer couchbaseCacheManagerCustomizer() { return new CacheManagerTestCustomizer() { }; } @Bean - public CacheManagerCustomizer redisCacheManagerCustomizer() { + CacheManagerCustomizer redisCacheManagerCustomizer() { return new CacheManagerTestCustomizer() { }; } @Bean - public CacheManagerCustomizer ehcacheCacheManagerCustomizer() { + CacheManagerCustomizer ehcacheCacheManagerCustomizer() { return new CacheManagerTestCustomizer() { }; } @Bean - public CacheManagerCustomizer hazelcastCacheManagerCustomizer() { + CacheManagerCustomizer hazelcastCacheManagerCustomizer() { return new CacheManagerTestCustomizer() { }; } @Bean - public CacheManagerCustomizer infinispanCacheManagerCustomizer() { + CacheManagerCustomizer infinispanCacheManagerCustomizer() { return new CacheManagerTestCustomizer() { }; } @Bean - public CacheManagerCustomizer caffeineCacheManagerCustomizer() { + CacheManagerCustomizer caffeineCacheManagerCustomizer() { return new CacheManagerTestCustomizer() { }; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java index d1a9430c07..438bca9fca 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java @@ -699,12 +699,12 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class GenericCacheConfiguration { @Bean - public Cache firstCache() { + Cache firstCache() { return new ConcurrentMapCache("first"); } @Bean - public Cache secondCache() { + Cache secondCache() { return new ConcurrentMapCache("second"); } @@ -728,7 +728,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class CouchbaseCacheConfiguration { @Bean - public Bucket bucket() { + Bucket bucket() { BucketManager bucketManager = mock(BucketManager.class); Bucket bucket = mock(Bucket.class); given(bucket.bucketManager()).willReturn(bucketManager); @@ -748,7 +748,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class RedisConfiguration { @Bean - public RedisConnectionFactory redisConnectionFactory() { + RedisConnectionFactory redisConnectionFactory() { return mock(RedisConnectionFactory.class); } @@ -759,7 +759,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class RedisWithCacheConfigurationConfiguration { @Bean - public org.springframework.data.redis.cache.RedisCacheConfiguration customRedisCacheConfiguration() { + org.springframework.data.redis.cache.RedisCacheConfiguration customRedisCacheConfiguration() { return org.springframework.data.redis.cache.RedisCacheConfiguration.defaultCacheConfig() .entryTtl(java.time.Duration.ofSeconds(30)).prefixKeysWith("bar"); } @@ -771,7 +771,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class RedisWithRedisCacheManagerBuilderCustomizerConfiguration { @Bean - public RedisCacheManagerBuilderCustomizer ttlRedisCacheManagerBuilderCustomizer() { + RedisCacheManagerBuilderCustomizer ttlRedisCacheManagerBuilderCustomizer() { return (builder) -> builder.cacheDefaults( RedisCacheConfiguration.defaultCacheConfig().entryTtl(java.time.Duration.ofSeconds(10))); } @@ -789,7 +789,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class JCacheCustomConfiguration { @Bean - public CompleteConfiguration defaultCacheConfiguration() { + CompleteConfiguration defaultCacheConfiguration() { return mock(CompleteConfiguration.class); } @@ -800,7 +800,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class JCacheCustomCacheManager { @Bean - public javax.cache.CacheManager customJCacheCacheManager() { + javax.cache.CacheManager customJCacheCacheManager() { javax.cache.CacheManager cacheManager = mock(javax.cache.CacheManager.class); given(cacheManager.getCacheNames()).willReturn(Collections.emptyList()); return cacheManager; @@ -830,7 +830,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class EhCacheCustomCacheManager { @Bean - public net.sf.ehcache.CacheManager customEhCacheCacheManager() { + net.sf.ehcache.CacheManager customEhCacheCacheManager() { net.sf.ehcache.CacheManager cacheManager = mock(net.sf.ehcache.CacheManager.class); given(cacheManager.getStatus()).willReturn(Status.STATUS_ALIVE); given(cacheManager.getCacheNames()).willReturn(new String[0]); @@ -844,7 +844,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class HazelcastCustomHazelcastInstance { @Bean - public HazelcastInstance customHazelcastInstance() { + HazelcastInstance customHazelcastInstance() { return mock(HazelcastInstance.class); } @@ -855,7 +855,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class InfinispanCustomConfiguration { @Bean - public ConfigurationBuilder configurationBuilder() { + ConfigurationBuilder configurationBuilder() { ConfigurationBuilder builder = mock(ConfigurationBuilder.class); given(builder.build()).willReturn(new ConfigurationBuilder().build()); return builder; @@ -868,7 +868,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class CustomCacheManagerConfiguration { @Bean - public CacheManager cacheManager() { + CacheManager cacheManager() { return new ConcurrentMapCacheManager("custom1"); } @@ -880,8 +880,8 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT @Override @Bean - // The @Bean annotation is important, see CachingConfigurerSupport Javadoc public CacheManager cacheManager() { + // The @Bean annotation is important, see CachingConfigurerSupport Javadoc return new ConcurrentMapCacheManager("custom1"); } @@ -893,10 +893,9 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT @Override @Bean - // The @Bean annotation is important, see CachingConfigurerSupport Javadoc public CacheResolver cacheResolver() { + // The @Bean annotation is important, see CachingConfigurerSupport Javadoc return (context) -> Collections.singleton(mock(Cache.class)); - } } @@ -906,7 +905,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class SpecificCacheResolverConfiguration { @Bean - public CacheResolver myCacheResolver() { + CacheResolver myCacheResolver() { return mock(CacheResolver.class); } @@ -939,13 +938,13 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT static class CacheManagerPostProcessorConfiguration { @Bean - public static BeanPostProcessor cacheManagerBeanPostProcessor() { + static BeanPostProcessor cacheManagerBeanPostProcessor() { return new CacheManagerPostProcessor(); } } - private static class CacheManagerPostProcessor implements BeanPostProcessor { + static class CacheManagerPostProcessor implements BeanPostProcessor { private final List cacheManagers = new ArrayList<>(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java index 61a0923ba9..21ade868c2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java @@ -75,7 +75,7 @@ class CacheManagerCustomizersTests { } - private static class TestCustomizer implements CacheManagerCustomizer { + static class TestCustomizer implements CacheManagerCustomizer { private int count; @@ -84,13 +84,13 @@ class CacheManagerCustomizersTests { this.count++; } - public int getCount() { + int getCount() { return this.count; } } - private static class TestConcurrentMapCacheManagerCustomizer extends TestCustomizer { + static class TestConcurrentMapCacheManagerCustomizer extends TestCustomizer { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java index 3ac1f9f0e1..f2d9362ffe 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java @@ -111,7 +111,7 @@ class CassandraAutoConfigurationTests { static class MockCustomizerConfig { @Bean - public ClusterBuilderCustomizer customizer() { + ClusterBuilderCustomizer customizer() { return mock(ClusterBuilderCustomizer.class); } @@ -121,7 +121,7 @@ class CassandraAutoConfigurationTests { static class SimpleCustomizerConfig { @Bean - public ClusterBuilderCustomizer customizer() { + ClusterBuilderCustomizer customizer() { return (clusterBuilder) -> clusterBuilder.withClusterName("overridden-name"); } @@ -131,7 +131,7 @@ class CassandraAutoConfigurationTests { static class ClusterFactoryConfig { @Bean - public TestClusterFactory clusterFactory() { + TestClusterFactory clusterFactory() { return new TestClusterFactory(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AbstractNestedConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AbstractNestedConditionTests.java index 39410492f7..830af0c1e4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AbstractNestedConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AbstractNestedConditionTests.java @@ -64,10 +64,10 @@ class AbstractNestedConditionTests { @Configuration(proxyBeanMethods = false) @Conditional(ValidNestedCondition.class) - public static class ValidConfig { + static class ValidConfig { @Bean - public String myBean() { + String myBean() { return "myBean"; } @@ -93,10 +93,10 @@ class AbstractNestedConditionTests { @Configuration(proxyBeanMethods = false) @Conditional(InvalidNestedCondition.class) - public static class InvalidConfig { + static class InvalidConfig { @Bean - public String myBean() { + String myBean() { return "myBean"; } @@ -122,7 +122,7 @@ class AbstractNestedConditionTests { @Configuration(proxyBeanMethods = false) @Conditional(DoubleNestedCondition.class) - public static class DoubleNestedConfig { + static class DoubleNestedConfig { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AllNestedConditionsTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AllNestedConditionsTests.java index a165daf68b..ed51acf45b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AllNestedConditionsTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AllNestedConditionsTests.java @@ -70,10 +70,10 @@ class AllNestedConditionsTests { @Configuration(proxyBeanMethods = false) @Conditional(OnPropertyAAndBCondition.class) - public static class Config { + static class Config { @Bean - public String myBean() { + String myBean() { return "myBean"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AnyNestedConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AnyNestedConditionTests.java index a64dbdf4bc..634eaf199b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AnyNestedConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AnyNestedConditionTests.java @@ -73,10 +73,10 @@ class AnyNestedConditionTests { @Configuration(proxyBeanMethods = false) @Conditional(OnPropertyAorBCondition.class) - public static class Config { + static class Config { @Bean - public String myBean() { + String myBean() { return "myBean"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java index 7504d484be..41fb3c5434 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java @@ -277,14 +277,14 @@ class ConditionEvaluationReportTests { @Configuration(proxyBeanMethods = false) @Conditional({ ConditionEvaluationReportTests.MatchParseCondition.class, ConditionEvaluationReportTests.NoMatchBeanCondition.class }) - public static class NegativeOuterConfig { + static class NegativeOuterConfig { @Configuration(proxyBeanMethods = false) @Conditional({ ConditionEvaluationReportTests.MatchParseCondition.class }) - public static class PositiveInnerConfig { + static class PositiveInnerConfig { @Bean - public String negativeOuterPositiveInnerBean() { + String negativeOuterPositiveInnerBean() { return "negativeOuterPositiveInnerBean"; } 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 7ddd3db686..b588ccfe8c 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 @@ -223,10 +223,10 @@ class ConditionalOnBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnBean(name = "foo") - protected static class OnBeanNameConfiguration { + static class OnBeanNameConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -234,10 +234,10 @@ class ConditionalOnBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnBean(name = "foo", value = Date.class) - protected static class OnBeanNameAndTypeConfiguration { + static class OnBeanNameAndTypeConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -245,10 +245,10 @@ class ConditionalOnBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnBean(annotation = EnableScheduling.class) - protected static class OnAnnotationConfiguration { + static class OnAnnotationConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -256,10 +256,10 @@ class ConditionalOnBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnBean(String.class) - protected static class OnBeanClassConfiguration { + static class OnBeanClassConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -267,10 +267,10 @@ class ConditionalOnBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnBean(type = "java.lang.String") - protected static class OnBeanClassNameConfiguration { + static class OnBeanClassNameConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -278,10 +278,10 @@ class ConditionalOnBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnBean(type = "some.type.Missing") - protected static class OnBeanMissingClassConfiguration { + static class OnBeanMissingClassConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -289,10 +289,10 @@ class ConditionalOnBeanTests { @Configuration(proxyBeanMethods = false) @EnableScheduling - protected static class FooConfiguration { + static class FooConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } @@ -300,20 +300,20 @@ class ConditionalOnBeanTests { @Configuration(proxyBeanMethods = false) @ImportResource("org/springframework/boot/autoconfigure/condition/foo.xml") - protected static class XmlConfiguration { + static class XmlConfiguration { } @Configuration(proxyBeanMethods = false) @ImportResource("org/springframework/boot/autoconfigure/condition/foo.xml") @Import(OnBeanNameConfiguration.class) - protected static class CombinedXmlConfiguration { + static class CombinedXmlConfiguration { } @Configuration(proxyBeanMethods = false) @Import(WithPropertyPlaceholderClassNameRegistrar.class) - protected static class WithPropertyPlaceholderClassName { + static class WithPropertyPlaceholderClassName { } @@ -321,7 +321,7 @@ class ConditionalOnBeanTests { static class FactoryBeanConfiguration { @Bean - public ExampleFactoryBean exampleBeanFactoryBean() { + ExampleFactoryBean exampleBeanFactoryBean() { return new ExampleFactoryBean(); } @@ -332,13 +332,13 @@ class ConditionalOnBeanTests { static class OnAnnotationWithFactoryBeanConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } } - protected static class WithPropertyPlaceholderClassNameRegistrar implements ImportBeanDefinitionRegistrar { + static class WithPropertyPlaceholderClassNameRegistrar implements ImportBeanDefinitionRegistrar { @Override public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, @@ -350,7 +350,7 @@ class ConditionalOnBeanTests { } - public static class ExampleFactoryBean implements FactoryBean { + static class ExampleFactoryBean implements FactoryBean { @Override public ExampleBean getObject() { @@ -370,10 +370,10 @@ class ConditionalOnBeanTests { } @Configuration(proxyBeanMethods = false) - public static class OriginalDefinition { + static class OriginalDefinition { @Bean - public String testBean() { + String testBean() { return "test"; } @@ -381,10 +381,10 @@ class ConditionalOnBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnBean(String.class) - public static class OverridingDefinition { + static class OverridingDefinition { @Bean - public Integer testBean() { + Integer testBean() { return 1; } @@ -392,7 +392,7 @@ class ConditionalOnBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnBean(String.class) - public static class ConsumingConfiguration { + static class ConsumingConfiguration { ConsumingConfiguration(String testBean) { } @@ -403,7 +403,7 @@ class ConditionalOnBeanTests { static class ParameterizedWithCustomConfig { @Bean - public CustomExampleBean customExampleBean() { + CustomExampleBean customExampleBean() { return new CustomExampleBean(); } @@ -413,7 +413,7 @@ class ConditionalOnBeanTests { static class ParameterizedWithoutCustomConfig { @Bean - public OtherExampleBean otherExampleBean() { + OtherExampleBean otherExampleBean() { return new OtherExampleBean(); } @@ -423,7 +423,7 @@ class ConditionalOnBeanTests { static class ParameterizedWithoutCustomContainerConfig { @Bean - public TestParameterizedContainer otherExampleBean() { + TestParameterizedContainer otherExampleBean() { return new TestParameterizedContainer<>(); } @@ -433,7 +433,7 @@ class ConditionalOnBeanTests { static class ParameterizedWithCustomContainerConfig { @Bean - public TestParameterizedContainer customExampleBean() { + TestParameterizedContainer customExampleBean() { return new TestParameterizedContainer<>(); } @@ -444,7 +444,7 @@ class ConditionalOnBeanTests { @Bean @ConditionalOnBean(value = CustomExampleBean.class, parameterizedContainer = TestParameterizedContainer.class) - public CustomExampleBean conditionalCustomExampleBean() { + CustomExampleBean conditionalCustomExampleBean() { return new CustomExampleBean(); } @@ -455,7 +455,7 @@ class ConditionalOnBeanTests { @Bean @ConditionalOnBean(parameterizedContainer = TestParameterizedContainer.class) - public CustomExampleBean conditionalCustomExampleBean() { + CustomExampleBean conditionalCustomExampleBean() { return new CustomExampleBean(); } @@ -466,14 +466,14 @@ class ConditionalOnBeanTests { @Bean @ConditionalOnBean(parameterizedContainer = TestParameterizedContainer.class) - public TestParameterizedContainer conditionalCustomExampleBean() { + TestParameterizedContainer conditionalCustomExampleBean() { return new TestParameterizedContainer<>(); } } @TestAnnotation - public static class ExampleBean { + static class ExampleBean { private String value; @@ -488,7 +488,7 @@ class ConditionalOnBeanTests { } - public static class CustomExampleBean extends ExampleBean { + static class CustomExampleBean extends ExampleBean { CustomExampleBean() { super("custom subclass"); @@ -496,7 +496,7 @@ class ConditionalOnBeanTests { } - public static class OtherExampleBean extends ExampleBean { + static class OtherExampleBean extends ExampleBean { OtherExampleBean() { super("other subclass"); @@ -507,7 +507,7 @@ class ConditionalOnBeanTests { @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented - public @interface TestAnnotation { + @interface TestAnnotation { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java index 5a705d620b..3bd18519c1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java @@ -83,10 +83,10 @@ class ConditionalOnClassTests { @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ConditionalOnClassTests.class) - protected static class BasicConfiguration { + static class BasicConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -94,20 +94,20 @@ class ConditionalOnClassTests { @Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "FOO") - protected static class MissingConfiguration { + static class MissingConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } } @Configuration(proxyBeanMethods = false) - protected static class FooConfiguration { + static class FooConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } @@ -115,14 +115,14 @@ class ConditionalOnClassTests { @Configuration(proxyBeanMethods = false) @ImportResource("org/springframework/boot/autoconfigure/condition/foo.xml") - protected static class XmlConfiguration { + static class XmlConfiguration { } @Configuration(proxyBeanMethods = false) @Import(BasicConfiguration.class) @ImportResource("org/springframework/boot/autoconfigure/condition/foo.xml") - protected static class CombinedXmlConfiguration { + static class CombinedXmlConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java index 6545aab8de..8cdeafcefd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java @@ -55,7 +55,7 @@ class ConditionalOnCloudPlatformTests { static class CloudFoundryPlatformConfig { @Bean - public String foo() { + String foo() { return "foo"; } @@ -66,7 +66,7 @@ class ConditionalOnCloudPlatformTests { @Bean @ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY) - public String foo() { + String foo() { return "foo"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java index f6d4cfbc72..9316faba01 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java @@ -79,10 +79,10 @@ class ConditionalOnExpressionTests { @Configuration(proxyBeanMethods = false) @ConditionalOnExpression("false") - protected static class MissingConfiguration { + static class MissingConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -90,10 +90,10 @@ class ConditionalOnExpressionTests { @Configuration(proxyBeanMethods = false) @ConditionalOnExpression("true") - protected static class BasicConfiguration { + static class BasicConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } @@ -101,10 +101,10 @@ class ConditionalOnExpressionTests { @Configuration(proxyBeanMethods = false) @ConditionalOnExpression("true ? null : false") - protected static class NullConfiguration { + static class NullConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java index e6b911e111..4e470ab631 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java @@ -130,7 +130,7 @@ class ConditionalOnJndiTests { static class JndiAvailableConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } @@ -141,13 +141,13 @@ class ConditionalOnJndiTests { static class JndiConditionConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } } - private static class MockableOnJndi extends OnJndiCondition { + static class MockableOnJndi extends OnJndiCondition { private boolean jndiAvailable = true; @@ -168,7 +168,7 @@ class ConditionalOnJndiTests { }; } - public void setFoundLocation(String foundLocation) { + void setFoundLocation(String foundLocation) { this.foundLocation = foundLocation; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java index 1f9c9bec48..d0c118aeff 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java @@ -336,11 +336,11 @@ public class ConditionalOnMissingBeanTests { } @Configuration(proxyBeanMethods = false) - protected static class OnBeanInAncestorsConfiguration { + static class OnBeanInAncestorsConfiguration { @Bean @ConditionalOnMissingBean(search = SearchStrategy.ANCESTORS) - public ExampleBean exampleBean2() { + ExampleBean exampleBean2() { return new ExampleBean("test"); } @@ -348,10 +348,10 @@ public class ConditionalOnMissingBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = "foo") - protected static class OnBeanNameConfiguration { + static class OnBeanNameConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -360,20 +360,20 @@ public class ConditionalOnMissingBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = "foo", value = Date.class) @ConditionalOnBean(name = "foo", value = Date.class) - protected static class OnBeanNameAndTypeConfiguration { + static class OnBeanNameAndTypeConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } } @Configuration(proxyBeanMethods = false) - protected static class FactoryBeanConfiguration { + static class FactoryBeanConfiguration { @Bean - public FactoryBean exampleBeanFactoryBean() { + FactoryBean exampleBeanFactoryBean() { return new ExampleFactoryBean("foo"); } @@ -383,7 +383,7 @@ public class ConditionalOnMissingBeanTests { @ComponentScan(basePackages = "org.springframework.boot.autoconfigure.condition.scan", includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ScannedFactoryBeanConfiguration.class)) - protected static class ComponentScannedFactoryBeanBeanMethodConfiguration { + static class ComponentScannedFactoryBeanBeanMethodConfiguration { } @@ -391,36 +391,36 @@ public class ConditionalOnMissingBeanTests { @ComponentScan(basePackages = "org.springframework.boot.autoconfigure.condition.scan", includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ScannedFactoryBeanWithBeanMethodArgumentsConfiguration.class)) - protected static class ComponentScannedFactoryBeanBeanMethodWithArgumentsConfiguration { + static class ComponentScannedFactoryBeanBeanMethodWithArgumentsConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class FactoryBeanWithBeanMethodArgumentsConfiguration { + static class FactoryBeanWithBeanMethodArgumentsConfiguration { @Bean - public FactoryBean exampleBeanFactoryBean(@Value("${theValue}") String value) { + FactoryBean exampleBeanFactoryBean(@Value("${theValue}") String value) { return new ExampleFactoryBean(value); } } @Configuration(proxyBeanMethods = false) - protected static class ConcreteFactoryBeanConfiguration { + static class ConcreteFactoryBeanConfiguration { @Bean - public ExampleFactoryBean exampleBeanFactoryBean() { + ExampleFactoryBean exampleBeanFactoryBean() { return new ExampleFactoryBean("foo"); } } @Configuration(proxyBeanMethods = false) - protected static class UnhelpfulFactoryBeanConfiguration { + static class UnhelpfulFactoryBeanConfiguration { @Bean @SuppressWarnings("rawtypes") - public FactoryBean exampleBeanFactoryBean() { + FactoryBean exampleBeanFactoryBean() { return new ExampleFactoryBean("foo"); } @@ -428,11 +428,11 @@ public class ConditionalOnMissingBeanTests { @Configuration(proxyBeanMethods = false) @Import(NonspecificFactoryBeanClassAttributeRegistrar.class) - protected static class NonspecificFactoryBeanClassAttributeConfiguration { + static class NonspecificFactoryBeanClassAttributeConfiguration { } - protected static class NonspecificFactoryBeanClassAttributeRegistrar implements ImportBeanDefinitionRegistrar { + static class NonspecificFactoryBeanClassAttributeRegistrar implements ImportBeanDefinitionRegistrar { @Override public void registerBeanDefinitions(AnnotationMetadata meta, BeanDefinitionRegistry registry) { @@ -446,11 +446,11 @@ public class ConditionalOnMissingBeanTests { @Configuration(proxyBeanMethods = false) @Import(NonspecificFactoryBeanClassAttributeRegistrar.class) - protected static class NonspecificFactoryBeanStringAttributeConfiguration { + static class NonspecificFactoryBeanStringAttributeConfiguration { } - protected static class NonspecificFactoryBeanStringAttributeRegistrar implements ImportBeanDefinitionRegistrar { + static class NonspecificFactoryBeanStringAttributeRegistrar implements ImportBeanDefinitionRegistrar { @Override public void registerBeanDefinitions(AnnotationMetadata meta, BeanDefinitionRegistry registry) { @@ -465,11 +465,11 @@ public class ConditionalOnMissingBeanTests { @Configuration(proxyBeanMethods = false) @Import(FactoryBeanRegistrar.class) - protected static class RegisteredFactoryBeanConfiguration { + static class RegisteredFactoryBeanConfiguration { } - protected static class FactoryBeanRegistrar implements ImportBeanDefinitionRegistrar { + static class FactoryBeanRegistrar implements ImportBeanDefinitionRegistrar { @Override public void registerBeanDefinitions(AnnotationMetadata meta, BeanDefinitionRegistry registry) { @@ -482,49 +482,49 @@ public class ConditionalOnMissingBeanTests { @Configuration(proxyBeanMethods = false) @ImportResource("org/springframework/boot/autoconfigure/condition/factorybean.xml") - protected static class FactoryBeanXmlConfiguration { + static class FactoryBeanXmlConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class ConditionalOnFactoryBean { + static class ConditionalOnFactoryBean { @Bean @ConditionalOnMissingBean(ExampleBean.class) - public ExampleBean createExampleBean() { + ExampleBean createExampleBean() { return new ExampleBean("direct"); } } @Configuration(proxyBeanMethods = false) - protected static class ConditionalOnIgnoredSubclass { + static class ConditionalOnIgnoredSubclass { @Bean @ConditionalOnMissingBean(value = ExampleBean.class, ignored = CustomExampleBean.class) - public ExampleBean exampleBean() { + ExampleBean exampleBean() { return new ExampleBean("test"); } } @Configuration(proxyBeanMethods = false) - protected static class ConditionalOnIgnoredSubclassByName { + static class ConditionalOnIgnoredSubclassByName { @Bean @ConditionalOnMissingBean(value = ExampleBean.class, ignoredType = "org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBeanTests.CustomExampleBean") - public ExampleBean exampleBean() { + ExampleBean exampleBean() { return new ExampleBean("test"); } } @Configuration(proxyBeanMethods = false) - protected static class CustomExampleBeanConfiguration { + static class CustomExampleBeanConfiguration { @Bean - public CustomExampleBean customExampleBean() { + CustomExampleBean customExampleBean() { return new CustomExampleBean(); } @@ -532,10 +532,10 @@ public class ConditionalOnMissingBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(annotation = EnableScheduling.class) - protected static class OnAnnotationConfiguration { + static class OnAnnotationConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -543,10 +543,10 @@ public class ConditionalOnMissingBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(annotation = TestAnnotation.class) - protected static class OnAnnotationWithFactoryBeanConfiguration { + static class OnAnnotationWithFactoryBeanConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -554,10 +554,10 @@ public class ConditionalOnMissingBeanTests { @Configuration(proxyBeanMethods = false) @EnableScheduling - protected static class FooConfiguration { + static class FooConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } @@ -565,10 +565,10 @@ public class ConditionalOnMissingBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = "foo") - protected static class HierarchyConsidered { + static class HierarchyConsidered { @Bean - public String bar() { + String bar() { return "bar"; } @@ -576,31 +576,31 @@ public class ConditionalOnMissingBeanTests { @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = "foo", search = SearchStrategy.CURRENT) - protected static class HierarchyNotConsidered { + static class HierarchyNotConsidered { @Bean - public String bar() { + String bar() { return "bar"; } } @Configuration(proxyBeanMethods = false) - protected static class ExampleBeanConfiguration { + static class ExampleBeanConfiguration { @Bean - public ExampleBean exampleBean() { + ExampleBean exampleBean() { return new ExampleBean("test"); } } @Configuration(proxyBeanMethods = false) - protected static class ImpliedOnBeanMethod { + static class ImpliedOnBeanMethod { @Bean @ConditionalOnMissingBean - public ExampleBean exampleBean2() { + ExampleBean exampleBean2() { return new ExampleBean("test"); } @@ -629,9 +629,9 @@ public class ConditionalOnMissingBeanTests { } - public static class NonspecificFactoryBean implements FactoryBean { + static class NonspecificFactoryBean implements FactoryBean { - public NonspecificFactoryBean(String value) { + NonspecificFactoryBean(String value) { Assert.state(!value.contains("$"), "value should not contain '$'"); } @@ -656,7 +656,7 @@ public class ConditionalOnMissingBeanTests { static class ParameterizedWithCustomConfig { @Bean - public CustomExampleBean customExampleBean() { + CustomExampleBean customExampleBean() { return new CustomExampleBean(); } @@ -666,7 +666,7 @@ public class ConditionalOnMissingBeanTests { static class ParameterizedWithoutCustomConfig { @Bean - public OtherExampleBean otherExampleBean() { + OtherExampleBean otherExampleBean() { return new OtherExampleBean(); } @@ -676,7 +676,7 @@ public class ConditionalOnMissingBeanTests { static class ParameterizedWithoutCustomContainerConfig { @Bean - public TestParameterizedContainer otherExampleBean() { + TestParameterizedContainer otherExampleBean() { return new TestParameterizedContainer<>(); } @@ -686,7 +686,7 @@ public class ConditionalOnMissingBeanTests { static class ParameterizedWithCustomContainerConfig { @Bean - public TestParameterizedContainer customExampleBean() { + TestParameterizedContainer customExampleBean() { return new TestParameterizedContainer<>(); } @@ -698,7 +698,7 @@ public class ConditionalOnMissingBeanTests { @Bean @ConditionalOnMissingBean(value = CustomExampleBean.class, parameterizedContainer = TestParameterizedContainer.class) - public CustomExampleBean conditionalCustomExampleBean() { + CustomExampleBean conditionalCustomExampleBean() { return new CustomExampleBean(); } @@ -709,7 +709,7 @@ public class ConditionalOnMissingBeanTests { @Bean @ConditionalOnMissingBean(parameterizedContainer = TestParameterizedContainer.class) - public CustomExampleBean conditionalCustomExampleBean() { + CustomExampleBean conditionalCustomExampleBean() { return new CustomExampleBean(); } @@ -720,7 +720,7 @@ public class ConditionalOnMissingBeanTests { @Bean @ConditionalOnMissingBean(parameterizedContainer = TestParameterizedContainer.class) - public TestParameterizedContainer conditionalCustomExampleBean() { + TestParameterizedContainer conditionalCustomExampleBean() { return new TestParameterizedContainer<>(); } @@ -742,17 +742,17 @@ public class ConditionalOnMissingBeanTests { } - public static class CustomExampleBean extends ExampleBean { + static class CustomExampleBean extends ExampleBean { - public CustomExampleBean() { + CustomExampleBean() { super("custom subclass"); } } - public static class OtherExampleBean extends ExampleBean { + static class OtherExampleBean extends ExampleBean { - public OtherExampleBean() { + OtherExampleBean() { super("other subclass"); } @@ -761,7 +761,7 @@ public class ConditionalOnMissingBeanTests { @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented - public @interface TestAnnotation { + @interface TestAnnotation { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanWithFilteredClasspathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanWithFilteredClasspathTests.java index 5a5a1818d9..7d97813a35 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanWithFilteredClasspathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanWithFilteredClasspathTests.java @@ -60,7 +60,7 @@ public class ConditionalOnMissingBeanWithFilteredClasspathTests { @Bean @ConditionalOnMissingBean( type = "org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBeanWithFilteredClasspathTests.TestCacheManager") - public String foo() { + String foo() { return "foo"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java index bfd39cf907..342eb1825e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java @@ -51,10 +51,10 @@ class ConditionalOnMissingClassTests { @Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClassTests") - protected static class BasicConfiguration { + static class BasicConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -62,20 +62,20 @@ class ConditionalOnMissingClassTests { @Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("FOO") - protected static class MissingConfiguration { + static class MissingConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } } @Configuration(proxyBeanMethods = false) - protected static class FooConfiguration { + static class FooConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java index 285f4576c3..c428c218ca 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java @@ -59,15 +59,15 @@ class ConditionalOnNotWebApplicationTests { } @Configuration(proxyBeanMethods = false) - protected static class ReactiveApplicationConfig { + static class ReactiveApplicationConfig { @Bean - public ReactiveWebServerFactory reactiveWebServerFactory() { + ReactiveWebServerFactory reactiveWebServerFactory() { return new MockReactiveWebServerFactory(); } @Bean - public HttpHandler httpHandler() { + HttpHandler httpHandler() { return (request, response) -> Mono.empty(); } @@ -75,10 +75,10 @@ class ConditionalOnNotWebApplicationTests { @Configuration(proxyBeanMethods = false) @ConditionalOnNotWebApplication - protected static class NotWebApplicationConfiguration { + static class NotWebApplicationConfiguration { @Bean - public String none() { + String none() { return "none"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java index d7dc04fecd..1ed53089b7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java @@ -254,10 +254,10 @@ class ConditionalOnPropertyTests { @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = { "property1", "property2" }) - protected static class MultiplePropertiesRequiredConfiguration { + static class MultiplePropertiesRequiredConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } @@ -265,10 +265,10 @@ class ConditionalOnPropertyTests { @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.", name = "the-relaxed-property") - protected static class RelaxedPropertiesRequiredConfiguration { + static class RelaxedPropertiesRequiredConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } @@ -276,10 +276,10 @@ class ConditionalOnPropertyTests { @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring", name = "property") - protected static class RelaxedPropertiesRequiredConfigurationWithShortPrefix { + static class RelaxedPropertiesRequiredConfigurationWithShortPrefix { @Bean - public String foo() { + String foo() { return "foo"; } @@ -291,7 +291,7 @@ class ConditionalOnPropertyTests { static class EnabledIfNotConfiguredOtherwiseConfig { @Bean - public String foo() { + String foo() { return "foo"; } @@ -303,7 +303,7 @@ class ConditionalOnPropertyTests { static class DisabledIfNotConfiguredOtherwiseConfig { @Bean - public String foo() { + String foo() { return "foo"; } @@ -314,7 +314,7 @@ class ConditionalOnPropertyTests { static class SimpleValueConfig { @Bean - public String foo() { + String foo() { return "foo"; } @@ -325,7 +325,7 @@ class ConditionalOnPropertyTests { static class DefaultValueConfig { @Bean - public String foo() { + String foo() { return "foo"; } @@ -336,7 +336,7 @@ class ConditionalOnPropertyTests { static class PrefixValueConfig { @Bean - public String foo() { + String foo() { return "foo"; } @@ -347,7 +347,7 @@ class ConditionalOnPropertyTests { static class MultiValuesConfig { @Bean - public String foo() { + String foo() { return "foo"; } @@ -355,10 +355,10 @@ class ConditionalOnPropertyTests { @Configuration(proxyBeanMethods = false) @ConditionalOnProperty("some.property") - protected static class ValueAttribute { + static class ValueAttribute { @Bean - public String foo() { + String foo() { return "foo"; } @@ -366,10 +366,10 @@ class ConditionalOnPropertyTests { @Configuration(proxyBeanMethods = false) @ConditionalOnProperty - protected static class NoNameOrValueAttribute { + static class NoNameOrValueAttribute { @Bean - public String foo() { + String foo() { return "foo"; } @@ -377,10 +377,10 @@ class ConditionalOnPropertyTests { @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "x", name = "y") - protected static class NameAndValueAttribute { + static class NameAndValueAttribute { @Bean - public String foo() { + String foo() { return "foo"; } @@ -388,10 +388,10 @@ class ConditionalOnPropertyTests { @Configuration(proxyBeanMethods = false) @ConditionalOnMyFeature - protected static class MetaAnnotation { + static class MetaAnnotation { @Bean - public String foo() { + String foo() { return "foo"; } @@ -400,10 +400,10 @@ class ConditionalOnPropertyTests { @Configuration(proxyBeanMethods = false) @ConditionalOnMyFeature @ConditionalOnProperty(prefix = "my.other.feature", name = "enabled", havingValue = "true", matchIfMissing = false) - protected static class MetaAnnotationAndDirectAnnotation { + static class MetaAnnotationAndDirectAnnotation { @Bean - public String foo() { + String foo() { return "foo"; } @@ -412,7 +412,7 @@ class ConditionalOnPropertyTests { @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) @ConditionalOnProperty(prefix = "my.feature", name = "enabled", havingValue = "true", matchIfMissing = false) - public @interface ConditionalOnMyFeature { + @interface ConditionalOnMyFeature { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java index 97143b68ba..e01c32696d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java @@ -60,10 +60,10 @@ class ConditionalOnResourceTests { @Configuration(proxyBeanMethods = false) @ConditionalOnResource(resources = "foo") - protected static class MissingConfiguration { + static class MissingConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } @@ -71,10 +71,10 @@ class ConditionalOnResourceTests { @Configuration(proxyBeanMethods = false) @ConditionalOnResource(resources = "schema.sql") - protected static class BasicConfiguration { + static class BasicConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } @@ -82,10 +82,10 @@ class ConditionalOnResourceTests { @Configuration(proxyBeanMethods = false) @ConditionalOnResource(resources = "${schema}") - protected static class PlaceholderConfiguration { + static class PlaceholderConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java index c91f3b84dd..be8366b24b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java @@ -150,10 +150,10 @@ class ConditionalOnSingleCandidateTests { @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(String.class) - protected static class OnBeanSingleCandidateConfiguration { + static class OnBeanSingleCandidateConfiguration { @Bean - public String baz(String s) { + String baz(String s) { return s; } @@ -161,10 +161,10 @@ class ConditionalOnSingleCandidateTests { @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(value = String.class, search = SearchStrategy.ANCESTORS) - protected static class OnBeanSingleCandidateInAncestorsConfiguration { + static class OnBeanSingleCandidateInAncestorsConfiguration { @Bean - public String baz(String s) { + String baz(String s) { return s; } @@ -172,53 +172,53 @@ class ConditionalOnSingleCandidateTests { @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(value = String.class, type = "java.lang.String") - protected static class OnBeanSingleCandidateTwoTypesConfiguration { + static class OnBeanSingleCandidateTwoTypesConfiguration { } @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate - protected static class OnBeanSingleCandidateNoTypeConfiguration { + static class OnBeanSingleCandidateNoTypeConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class FooConfiguration { + static class FooConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } } @Configuration(proxyBeanMethods = false) - protected static class FooPrimaryConfiguration { + static class FooPrimaryConfiguration { @Bean @Primary - public String foo() { + String foo() { return "foo"; } } @Configuration(proxyBeanMethods = false) - protected static class BarConfiguration { + static class BarConfiguration { @Bean - public String bar() { + String bar() { return "bar"; } } @Configuration(proxyBeanMethods = false) - protected static class BarPrimaryConfiguration { + static class BarPrimaryConfiguration { @Bean @Primary - public String bar() { + String bar() { return "bar"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java index a6b25e2e67..83ea467f2b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java @@ -87,10 +87,10 @@ class ConditionalOnWebApplicationTests { @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication - protected static class AnyWebApplicationConfiguration { + static class AnyWebApplicationConfiguration { @Bean - public String any() { + String any() { return "any"; } @@ -98,10 +98,10 @@ class ConditionalOnWebApplicationTests { @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) - protected static class ServletWebApplicationConfiguration { + static class ServletWebApplicationConfiguration { @Bean - public String servlet() { + String servlet() { return "servlet"; } @@ -109,20 +109,20 @@ class ConditionalOnWebApplicationTests { @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.REACTIVE) - protected static class ReactiveWebApplicationConfiguration { + static class ReactiveWebApplicationConfiguration { @Bean - public String reactive() { + String reactive() { return "reactive"; } @Bean - public ReactiveWebServerFactory reactiveWebServerFactory() { + ReactiveWebServerFactory reactiveWebServerFactory() { return new MockReactiveWebServerFactory(); } @Bean - public HttpHandler httpHandler() { + HttpHandler httpHandler() { return (request, response) -> Mono.empty(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditionsTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditionsTests.java index 2fb26e96e9..3c0e28cad1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditionsTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditionsTests.java @@ -72,10 +72,10 @@ class NoneNestedConditionsTests { @Configuration(proxyBeanMethods = false) @Conditional(NeitherPropertyANorPropertyBCondition.class) - public static class Config { + static class Config { @Bean - public String myBean() { + String myBean() { return "myBean"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java index 4649034311..fa30238ad5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java @@ -77,7 +77,7 @@ public class OnBeanConditionTypeDeductionFailureTests { @Bean @ConditionalOnMissingBean - public ObjectMapper objectMapper() { + ObjectMapper objectMapper() { return new ObjectMapper(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnPropertyListConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnPropertyListConditionTests.java index b483749930..9185e2137a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnPropertyListConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnPropertyListConditionTests.java @@ -66,10 +66,10 @@ class OnPropertyListConditionTests { @Configuration(proxyBeanMethods = false) @Conditional(TestPropertyListCondition.class) - protected static class TestConfig { + static class TestConfig { @Bean - public String foo() { + String foo() { return "foo"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java index 3b2e0a7aeb..dfc936fdd8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java @@ -75,7 +75,7 @@ class ResourceConditionTests { static class DefaultLocationConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } @@ -86,13 +86,13 @@ class ResourceConditionTests { static class UnknownDefaultLocationConfiguration { @Bean - public String foo() { + String foo() { return "foo"; } } - private static class DefaultLocationResourceCondition extends ResourceCondition { + static class DefaultLocationResourceCondition extends ResourceCondition { DefaultLocationResourceCondition() { super("test", "spring.foo.test.config", "classpath:/logging.properties"); @@ -100,7 +100,7 @@ class ResourceConditionTests { } - private static class UnknownDefaultLocationResourceCondition extends ResourceCondition { + static class UnknownDefaultLocationResourceCondition extends ResourceCondition { UnknownDefaultLocationResourceCondition() { super("test", "spring.foo.test.config", "classpath:/this-file-does-not-exist.xml"); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/SpringBootConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/SpringBootConditionTests.java index f0fdb4d270..7be194374f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/SpringBootConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/SpringBootConditionTests.java @@ -49,22 +49,22 @@ class SpringBootConditionTests { @Configuration(proxyBeanMethods = false) @Conditional(AlwaysThrowsCondition.class) - public static class ErrorOnClass { + static class ErrorOnClass { } @Configuration(proxyBeanMethods = false) - public static class ErrorOnMethod { + static class ErrorOnMethod { @Bean @Conditional(AlwaysThrowsCondition.class) - public String myBean() { + String myBean() { return "bean"; } } - public static class AlwaysThrowsCondition extends SpringBootCondition { + static class AlwaysThrowsCondition extends SpringBootCondition { @Override public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java index 49df1f2018..1ba583cdac 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java @@ -75,11 +75,11 @@ class ConfigurationPropertiesAutoConfigurationTests { private String name = "default"; - public String getName() { + String getName() { return this.name; } - public void setName(String name) { + void setName(String name) { this.name = name; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java index a1f4e60709..be856f254e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java @@ -48,7 +48,7 @@ class MessageSourceAutoConfigurationIntegrationTests { } @Configuration(proxyBeanMethods = false) - protected static class Config { + static class Config { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java index 8a605a6010..049b86e06d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java @@ -50,7 +50,7 @@ class MessageSourceAutoConfigurationProfileTests { } @Configuration(proxyBeanMethods = false) - protected static class Config { + static class Config { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java index 8579f73ece..64509150cc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java @@ -191,31 +191,31 @@ class MessageSourceAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @PropertySource("classpath:/switch-messages.properties") - protected static class Config { + static class Config { } @Configuration(proxyBeanMethods = false) - protected static class CustomMessageSourceConfiguration { + static class CustomMessageSourceConfiguration { @Bean - public MessageSource messageSource() { + MessageSource messageSource() { return new TestMessageSource(); } } @Configuration(proxyBeanMethods = false) - protected static class CustomBeanNameMessageSourceConfiguration { + static class CustomBeanNameMessageSourceConfiguration { @Bean - public MessageSource codeReturningMessageSource() { + MessageSource codeReturningMessageSource() { return new TestMessageSource(); } } - private static class TestMessageSource implements MessageSource { + static class TestMessageSource implements MessageSource { @Override public String getMessage(String code, Object[] args, String defaultMessage, Locale locale) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfigurationTests.java index e309a7f69e..cb866b16f8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfigurationTests.java @@ -68,7 +68,7 @@ class PropertyPlaceholderAutoConfigurationTests { @Value("${foo:bar}") private String foo; - public String getFoo() { + String getFoo() { return this.foo; } @@ -78,7 +78,7 @@ class PropertyPlaceholderAutoConfigurationTests { static class PlaceholdersOverride { @Bean - public static PropertySourcesPlaceholderConfigurer morePlaceholders() { + static PropertySourcesPlaceholderConfigurer morePlaceholders() { PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer(); configurer.setProperties(StringUtils.splitArrayElementsIntoProperties(new String[] { "foo=spam" }, "=")); configurer.setLocalOverride(true); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java index da7c1c844e..d11bc5eda0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java @@ -66,12 +66,12 @@ class CouchbaseAutoConfigurationIntegrationTests { static class CustomConfiguration { @Bean - public Cluster myCustomCouchbaseCluster() { + Cluster myCustomCouchbaseCluster() { return mock(Cluster.class); } @Bean - public Bucket myCustomCouchbaseClient() { + Bucket myCustomCouchbaseClient() { return mock(CouchbaseBucket.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsConditionTests.java index 2ca1ddfcdf..5f3d3c9bd7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsConditionTests.java @@ -54,10 +54,10 @@ class OnBootstrapHostsConditionTests { @Configuration(proxyBeanMethods = false) @Conditional(OnBootstrapHostsCondition.class) - protected static class TestConfig { + static class TestConfig { @Bean - public String foo() { + String foo() { return "foo"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java index a435e86228..4ae58190ea 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java @@ -109,14 +109,14 @@ class PersistenceExceptionTranslationAutoConfigurationTests { static class TestConfiguration { @Bean - public TestRepository testRepository(EntityManagerFactory entityManagerFactory) { + TestRepository testRepository(EntityManagerFactory entityManagerFactory) { return new TestRepository(entityManagerFactory.createEntityManager()); } } @Repository - private static class TestRepository { + static class TestRepository { private final EntityManager entityManager; @@ -124,7 +124,7 @@ class PersistenceExceptionTranslationAutoConfigurationTests { this.entityManager = entityManager; } - public void doSomething() { + void doSomething() { this.entityManager.persist(null); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ConditionalOnRepositoryTypeTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ConditionalOnRepositoryTypeTests.java index 38325c9149..5f6c4b5c65 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ConditionalOnRepositoryTypeTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ConditionalOnRepositoryTypeTests.java @@ -109,13 +109,13 @@ class ConditionalOnRepositoryTypeTests { @Configuration(proxyBeanMethods = false) @ConditionalOnRepositoryType(store = "test", type = RepositoryType.IMPERATIVE) - protected static class ImperativeRepository { + static class ImperativeRepository { } @Configuration(proxyBeanMethods = false) @ConditionalOnRepositoryType(store = "test", type = RepositoryType.REACTIVE) - protected static class ReactiveRepository { + static class ReactiveRepository { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/CityCouchbaseRepository.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/CityCouchbaseRepository.java index 0a43bf73e3..94b51988cb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/CityCouchbaseRepository.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/CityCouchbaseRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,9 +19,6 @@ package org.springframework.boot.autoconfigure.data.alt.couchbase; import org.springframework.boot.autoconfigure.data.couchbase.city.City; import org.springframework.data.repository.Repository; -/** - * @author Eddú Meléndez - */ public interface CityCouchbaseRepository extends Repository { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java index e9a3477a29..1867a4c7e5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java @@ -106,7 +106,7 @@ class CassandraDataAutoConfigurationTests { assertThat(this.context.getBeansOfType(Session.class)).isEmpty(); } - public void load(Class... config) { + void load(Class... config) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); TestPropertyValues.of("spring.data.cassandra.keyspaceName:boot_test").applyTo(ctx); if (!ObjectUtils.isEmpty(config)) { @@ -128,7 +128,7 @@ class CassandraDataAutoConfigurationTests { static class TestConfiguration { @Bean - public Session getObject() { + Session getObject() { return mock(Session.class); } @@ -144,13 +144,13 @@ class CassandraDataAutoConfigurationTests { static class CustomConversionConfig { @Bean - public CassandraCustomConversions myCassandraCustomConversions() { + CassandraCustomConversions myCassandraCustomConversions() { return new CassandraCustomConversions(Collections.singletonList(new MyConverter())); } } - private static class MyConverter implements Converter { + static class MyConverter implements Converter { @Override public String convert(Person o) { @@ -159,7 +159,7 @@ class CassandraDataAutoConfigurationTests { } - private static class Person { + static class Person { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java index 739f4f0b30..bc2032d859 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java @@ -99,7 +99,7 @@ class CassandraReactiveDataAutoConfigurationTests { static class TestConfiguration { @Bean - public Session session() { + Session session() { return mock(Session.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigurationTests.java index 1a840a1eee..15a0c6c62a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigurationTests.java @@ -112,7 +112,7 @@ class CassandraReactiveRepositoriesAutoConfigurationTests { static class TestConfiguration { @Bean - public Session Session() { + Session Session() { return mock(Session.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigurationTests.java index 77c95f0b0b..022b23f3e2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigurationTests.java @@ -108,7 +108,7 @@ class CassandraRepositoriesAutoConfigurationTests { static class TestConfiguration { @Bean - public Session session() { + Session session() { return mock(Session.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java index a40ec2b76f..93f420cfe5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java @@ -159,7 +159,7 @@ class CouchbaseDataAutoConfigurationTests { static class CustomConversionsConfig { @Bean(BeanNames.COUCHBASE_CUSTOM_CONVERSIONS) - public CouchbaseCustomConversions myCustomConversions() { + CouchbaseCustomConversions myCustomConversions() { return new CouchbaseCustomConversions(Collections.singletonList(new MyConverter())); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java index dc3d1350fc..64edbbbb10 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java @@ -68,17 +68,17 @@ class CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests { @TestAutoConfigurationPackage(CouchbaseAutoConfiguration.class) @EnableCouchbaseRepositories(basePackageClasses = CityRepository.class) @EnableReactiveCouchbaseRepositories(basePackageClasses = ReactiveCityRepository.class) - protected static class ImperativeAndReactiveConfiguration { + static class ImperativeAndReactiveConfiguration { } @Configuration(proxyBeanMethods = false) @Import({ CouchbaseTestConfigurer.class, Registrar.class }) - protected static class BaseConfiguration { + static class BaseConfiguration { } - protected static class Registrar implements ImportSelector { + static class Registrar implements ImportSelector { @Override public String[] selectImports(AnnotationMetadata importingClassMetadata) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfigurationTests.java index 28c1761980..6a95904f29 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfigurationTests.java @@ -134,7 +134,7 @@ class CouchbaseReactiveDataAutoConfigurationTests { static class CustomConversionsConfig { @Bean(BeanNames.COUCHBASE_CUSTOM_CONVERSIONS) - public CouchbaseCustomConversions myCustomConversions() { + CouchbaseCustomConversions myCustomConversions() { return new CouchbaseCustomConversions(Collections.singletonList(new MyConverter())); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java index b96018ccfd..913679474c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java @@ -111,7 +111,7 @@ class CouchbaseReactiveRepositoriesAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) @Import(CouchbaseTestConfigurer.class) - protected static class NoRepositoryConfiguration { + static class NoRepositoryConfiguration { } @@ -119,7 +119,7 @@ class CouchbaseReactiveRepositoriesAutoConfigurationTests { @TestAutoConfigurationPackage(CouchbaseReactiveRepositoriesAutoConfigurationTests.class) @EnableCouchbaseRepositories(basePackageClasses = CityCouchbaseRepository.class) @Import(CouchbaseDataAutoConfigurationTests.CustomCouchbaseConfiguration.class) - protected static class CustomizedConfiguration { + static class CustomizedConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java index 2f77aa1e73..1659d1049d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java @@ -108,7 +108,7 @@ class CouchbaseRepositoriesAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) @Import(CouchbaseTestConfigurer.class) - protected static class NoRepositoryConfiguration { + static class NoRepositoryConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java index ffafbebcf2..187e1da22e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java @@ -90,7 +90,7 @@ class ElasticsearchAutoConfigurationTests { static class CustomConfiguration { @Bean - public Client myClient() { + Client myClient() { return mock(Client.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java index 1a47f550c3..f22c9c23c5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java @@ -113,7 +113,7 @@ class ElasticsearchDataAutoConfigurationTests { static class CustomTransportTemplate { @Bean - public ElasticsearchTemplate elasticsearchTemplate() { + ElasticsearchTemplate elasticsearchTemplate() { return mock(ElasticsearchTemplate.class); } @@ -123,7 +123,7 @@ class ElasticsearchDataAutoConfigurationTests { static class CustomRestTemplate { @Bean - public ElasticsearchRestTemplate elasticsearchTemplate() { + ElasticsearchRestTemplate elasticsearchTemplate() { return mock(ElasticsearchRestTemplate.class); } @@ -133,7 +133,7 @@ class ElasticsearchDataAutoConfigurationTests { static class CustomReactiveRestTemplate { @Bean - public ReactiveElasticsearchTemplate reactiveElasticsearchTemplate() { + ReactiveElasticsearchTemplate reactiveElasticsearchTemplate() { return mock(ReactiveElasticsearchTemplate.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveRestClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveRestClientAutoConfigurationTests.java index 9d383ab44b..82d489a22a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveRestClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveRestClientAutoConfigurationTests.java @@ -91,7 +91,7 @@ public class ReactiveRestClientAutoConfigurationTests { static class CustomClientConfiguration { @Bean - public ReactiveElasticsearchClient customClient() { + ReactiveElasticsearchClient customClient() { return mock(ReactiveElasticsearchClient.class); } @@ -101,7 +101,7 @@ public class ReactiveRestClientAutoConfigurationTests { static class CustomClientConfigConfiguration { @Bean - public ClientConfiguration customClientConfiguration() { + ClientConfiguration customClientConfiguration() { return ClientConfiguration.localhost(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/ReactiveCityRepository.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/ReactiveCityRepository.java index 444e0502c8..7648918ffd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/ReactiveCityRepository.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/ReactiveCityRepository.java @@ -18,9 +18,6 @@ package org.springframework.boot.autoconfigure.data.elasticsearch.city; import org.springframework.data.repository.reactive.ReactiveCrudRepository; -/** - * @author Brian Clozel - */ public interface ReactiveCityRepository extends ReactiveCrudRepository { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java index cc72a1cd5d..8a01c7d7c2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java @@ -103,19 +103,19 @@ class JdbcRepositoriesAutoConfigurationTests { } @TestAutoConfigurationPackage(City.class) - private static class TestConfiguration { + static class TestConfiguration { } @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) - protected static class EmptyConfiguration { + static class EmptyConfiguration { } @TestAutoConfigurationPackage(EmptyDataPackage.class) @EnableJdbcRepositories(basePackageClasses = City.class) - private static class EnableRepositoriesConfiguration { + static class EnableRepositoriesConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/city/CityRepository.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/city/CityRepository.java index 96701f9029..5a1cd3ab39 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/city/CityRepository.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/city/CityRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,11 +18,6 @@ package org.springframework.boot.autoconfigure.data.jdbc.city; import org.springframework.data.repository.CrudRepository; -/** - * Data JDBC repository for working with {@link City Cities}. - * - * @author Andy Wilkinson - */ public interface CityRepository extends CrudRepository { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java index b4659613ba..6310e6294b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java @@ -127,16 +127,16 @@ class JpaRepositoriesAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableScheduling @Import(TestConfiguration.class) - protected static class MultipleAsyncTaskExecutorConfiguration { + static class MultipleAsyncTaskExecutorConfiguration { } @Configuration(proxyBeanMethods = false) @Import(TestConfiguration.class) - protected static class SingleAsyncTaskExecutorConfiguration { + static class SingleAsyncTaskExecutorConfiguration { @Bean - public SimpleAsyncTaskExecutor testAsyncTaskExecutor() { + SimpleAsyncTaskExecutor testAsyncTaskExecutor() { return new SimpleAsyncTaskExecutor(); } @@ -144,7 +144,7 @@ class JpaRepositoriesAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) - protected static class TestConfiguration { + static class TestConfiguration { } @@ -154,7 +154,7 @@ class JpaRepositoriesAutoConfigurationTests { excludeFilters = { @Filter(type = FilterType.ASSIGNABLE_TYPE, value = CityMongoDbRepository.class), @Filter(type = FilterType.ASSIGNABLE_TYPE, value = CitySolrRepository.class) }) @TestAutoConfigurationPackage(City.class) - protected static class CustomConfiguration { + static class CustomConfiguration { } @@ -162,7 +162,7 @@ class JpaRepositoriesAutoConfigurationTests { // To not find any repositories @EnableJpaRepositories("foo.bar") @TestAutoConfigurationPackage(City.class) - protected static class SortOfInvalidCustomConfiguration { + static class SortOfInvalidCustomConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaWebAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaWebAutoConfigurationTests.java index 118e51506d..20012a8298 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaWebAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaWebAutoConfigurationTests.java @@ -66,7 +66,7 @@ class JpaWebAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) @EnableWebMvc - protected static class TestConfiguration { + static class TestConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java index 0e16bf9eb4..08c3a057cf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java @@ -78,20 +78,20 @@ class LdapRepositoriesAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(Person.class) - protected static class TestConfiguration { + static class TestConfiguration { } @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) - protected static class EmptyConfiguration { + static class EmptyConfiguration { } @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(LdapRepositoriesAutoConfigurationTests.class) @EnableLdapRepositories(basePackageClasses = PersonLdapRepository.class) - protected static class CustomizedConfiguration { + static class CustomizedConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java index 52208f3e84..e58cebd935 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java @@ -111,7 +111,7 @@ class MixedMongoRepositoriesAutoConfigurationTests { @TestAutoConfigurationPackage(MongoAutoConfiguration.class) // Not this package or its parent @EnableMongoRepositories(basePackageClasses = Country.class) - protected static class TestConfiguration { + static class TestConfiguration { } @@ -120,7 +120,7 @@ class MixedMongoRepositoriesAutoConfigurationTests { @EnableMongoRepositories(basePackageClasses = Country.class) @EntityScan(basePackageClasses = City.class) @EnableJpaRepositories(basePackageClasses = CityRepository.class) - protected static class MixedConfiguration { + static class MixedConfiguration { } @@ -128,7 +128,7 @@ class MixedMongoRepositoriesAutoConfigurationTests { @TestAutoConfigurationPackage(MongoAutoConfiguration.class) @EntityScan(basePackageClasses = City.class) @EnableJpaRepositories(basePackageClasses = CityRepository.class) - protected static class JpaConfiguration { + static class JpaConfiguration { } @@ -137,17 +137,17 @@ class MixedMongoRepositoriesAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(CityRepository.class) @EnableJpaRepositories(basePackageClasses = CityRepository.class) - protected static class OverlapConfiguration { + static class OverlapConfiguration { } @Configuration(proxyBeanMethods = false) @Import(Registrar.class) - protected static class BaseConfiguration { + static class BaseConfiguration { } - protected static class Registrar implements ImportSelector { + static class Registrar implements ImportSelector { @Override public String[] selectImports(AnnotationMetadata importingClassMetadata) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java index 2013256928..00a8e32f33 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java @@ -194,7 +194,7 @@ class MongoDataAutoConfigurationTests { static class CustomConversionsConfig { @Bean - public MongoCustomConversions customConversions() { + MongoCustomConversions customConversions() { return new MongoCustomConversions(Arrays.asList(new MyConverter())); } @@ -216,7 +216,7 @@ class MongoDataAutoConfigurationTests { } - private static class MyConverter implements Converter { + static class MyConverter implements Converter { @Override public Boolean convert(MongoClient source) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java index 3ddcaa615f..a197912c0e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java @@ -68,17 +68,17 @@ class MongoReactiveAndBlockingRepositoriesAutoConfigurationTests { @TestAutoConfigurationPackage(MongoAutoConfiguration.class) @EnableMongoRepositories(basePackageClasses = ReactiveCityRepository.class) @EnableReactiveMongoRepositories(basePackageClasses = ReactiveCityRepository.class) - protected static class BlockingAndReactiveConfiguration { + static class BlockingAndReactiveConfiguration { } @Configuration(proxyBeanMethods = false) @Import(Registrar.class) - protected static class BaseConfiguration { + static class BaseConfiguration { } - protected static class Registrar implements ImportSelector { + static class Registrar implements ImportSelector { @Override public String[] selectImports(AnnotationMetadata importingClassMetadata) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigurationTests.java index c607f84e97..e028059f36 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigurationTests.java @@ -100,20 +100,20 @@ class MongoReactiveRepositoriesAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) - protected static class TestConfiguration { + static class TestConfiguration { } @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) - protected static class EmptyConfiguration { + static class EmptyConfiguration { } @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(MongoReactiveRepositoriesAutoConfigurationTests.class) @EnableMongoRepositories(basePackageClasses = CityMongoDbRepository.class) - protected static class CustomizedConfiguration { + static class CustomizedConfiguration { } @@ -121,7 +121,7 @@ class MongoReactiveRepositoriesAutoConfigurationTests { // To not find any repositories @EnableReactiveMongoRepositories("foo.bar") @TestAutoConfigurationPackage(MongoReactiveRepositoriesAutoConfigurationTests.class) - protected static class SortOfInvalidCustomConfiguration { + static class SortOfInvalidCustomConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java index 136a967f45..a2efc5b9cb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java @@ -96,20 +96,20 @@ class MongoRepositoriesAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) - protected static class TestConfiguration { + static class TestConfiguration { } @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) - protected static class EmptyConfiguration { + static class EmptyConfiguration { } @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(MongoRepositoriesAutoConfigurationTests.class) @EnableMongoRepositories(basePackageClasses = CityMongoDbRepository.class) - protected static class CustomizedConfiguration { + static class CustomizedConfiguration { } @@ -117,7 +117,7 @@ class MongoRepositoriesAutoConfigurationTests { // To not find any repositories @EnableMongoRepositories("foo.bar") @TestAutoConfigurationPackage(MongoRepositoriesAutoConfigurationTests.class) - protected static class SortOfInvalidCustomConfiguration { + static class SortOfInvalidCustomConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java index bbe8d220f4..419c940790 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java @@ -108,7 +108,7 @@ class MixedNeo4jRepositoriesAutoConfigurationTests { @TestAutoConfigurationPackage(EmptyMarker.class) // Not this package or its parent @EnableNeo4jRepositories(basePackageClasses = Country.class) - protected static class TestConfiguration { + static class TestConfiguration { } @@ -117,7 +117,7 @@ class MixedNeo4jRepositoriesAutoConfigurationTests { @EnableNeo4jRepositories(basePackageClasses = Country.class) @EntityScan(basePackageClasses = City.class) @EnableJpaRepositories(basePackageClasses = CityRepository.class) - protected static class MixedConfiguration { + static class MixedConfiguration { } @@ -125,7 +125,7 @@ class MixedNeo4jRepositoriesAutoConfigurationTests { @TestAutoConfigurationPackage(EmptyMarker.class) @EntityScan(basePackageClasses = City.class) @EnableJpaRepositories(basePackageClasses = CityRepository.class) - protected static class JpaConfiguration { + static class JpaConfiguration { } @@ -134,7 +134,7 @@ class MixedNeo4jRepositoriesAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(CityRepository.class) @EnableJpaRepositories(basePackageClasses = CityRepository.class) - protected static class OverlapConfiguration { + static class OverlapConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java index 3cd3519485..8643fb6a97 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java @@ -224,7 +224,7 @@ class Neo4jDataAutoConfigurationTests { static class CustomSessionFactory { @Bean - public SessionFactory customSessionFactory() { + SessionFactory customSessionFactory() { return mock(SessionFactory.class); } @@ -234,7 +234,7 @@ class Neo4jDataAutoConfigurationTests { static class CustomConfiguration { @Bean - public org.neo4j.ogm.config.Configuration myConfiguration() { + org.neo4j.ogm.config.Configuration myConfiguration() { return new org.neo4j.ogm.config.Configuration.Builder().uri("http://localhost:12345").build(); } @@ -250,12 +250,12 @@ class Neo4jDataAutoConfigurationTests { static class EventListenerConfiguration { @Bean - public EventListener eventListenerOne() { + EventListener eventListenerOne() { return mock(EventListener.class); } @Bean - public EventListener eventListenerTwo() { + EventListener eventListenerTwo() { return mock(EventListener.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java index 3435946503..2624a80d84 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java @@ -171,7 +171,7 @@ class Neo4jPropertiesTests { } } - public Neo4jProperties load(boolean embeddedAvailable, String... environment) { + Neo4jProperties load(boolean embeddedAvailable, String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); if (!embeddedAvailable) { ctx.setClassLoader(new FilteredClassLoader(EmbeddedDriver.class)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationTests.java index f6b7ce21ae..c1539936da 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationTests.java @@ -92,20 +92,20 @@ class Neo4jRepositoriesAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) - protected static class TestConfiguration { + static class TestConfiguration { } @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) - protected static class EmptyConfiguration { + static class EmptyConfiguration { } @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(Neo4jRepositoriesAutoConfigurationTests.class) @EnableNeo4jRepositories(basePackageClasses = CityNeo4jRepository.class) - protected static class CustomizedConfiguration { + static class CustomizedConfiguration { } @@ -113,7 +113,7 @@ class Neo4jRepositoriesAutoConfigurationTests { // To not find any repositories @EnableNeo4jRepositories("foo.bar") @TestAutoConfigurationPackage(Neo4jRepositoriesAutoConfigurationTests.class) - protected static class SortOfInvalidCustomConfiguration { + static class SortOfInvalidCustomConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java index dcb4901001..566792170e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java @@ -85,13 +85,13 @@ class RedisRepositoriesAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) - protected static class TestConfiguration { + static class TestConfiguration { } @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) - protected static class EmptyConfiguration { + static class EmptyConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java index 297772a2f5..236f8b506d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java @@ -136,24 +136,24 @@ class RepositoryRestMvcAutoConfigurationTests { @ImportAutoConfiguration({ HibernateJpaAutoConfiguration.class, JpaRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, RepositoryRestMvcAutoConfiguration.class, JacksonAutoConfiguration.class }) - protected static class BaseConfiguration { + static class BaseConfiguration { } @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) @EnableWebMvc - protected static class TestConfiguration { + static class TestConfiguration { } @Import({ TestConfiguration.class, TestRepositoryRestConfigurer.class }) - protected static class TestConfigurationWithConfigurer { + static class TestConfigurationWithConfigurer { } @Import({ TestConfiguration.class, RepositoryRestMvcConfiguration.class }) - protected static class TestConfigurationWithRestMvcConfig { + static class TestConfigurationWithRestMvcConfig { } @@ -163,7 +163,7 @@ class RepositoryRestMvcAutoConfigurationTests { static class TestConfigurationWithObjectMapperBuilder { @Bean - public Jackson2ObjectMapperBuilder objectMapperBuilder() { + Jackson2ObjectMapperBuilder objectMapperBuilder() { Jackson2ObjectMapperBuilder objectMapperBuilder = new Jackson2ObjectMapperBuilder(); objectMapperBuilder.simpleDateFormat("yyyy-MM"); return objectMapperBuilder; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java index da4fe22a76..7f9b6216bd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java @@ -100,7 +100,7 @@ class SolrRepositoriesAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(SolrRepositoriesAutoConfigurationTests.class) @EnableSolrRepositories(basePackageClasses = CitySolrRepository.class) - protected static class CustomizedConfiguration { + static class CustomizedConfiguration { } @@ -108,7 +108,7 @@ class SolrRepositoriesAutoConfigurationTests { @TestAutoConfigurationPackage(SolrRepositoriesAutoConfigurationTests.class) // To not find any repositories @EnableSolrRepositories("foo.bar") - protected static class SortOfInvalidCustomConfiguration { + static class SortOfInvalidCustomConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java index 901ffe3503..d2c3928183 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.Repository; -/** - * @author Christoph Strobl - */ public interface CityRepository extends Repository { Page findByNameStartingWith(String name, Pageable page); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java index a23e4188c5..69c8180a6a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java @@ -231,57 +231,57 @@ class NoSuchBeanDefinitionFailureAnalyzerTests { @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(TestPropertyAutoConfiguration.class) @Import(StringHandler.class) - protected static class StringPropertyTypeConfiguration { + static class StringPropertyTypeConfiguration { } @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(TestPropertyAutoConfiguration.class) @Import(NumberHandler.class) - protected static class IntegerPropertyTypeConfiguration { + static class IntegerPropertyTypeConfiguration { } @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(TestTypeClassAutoConfiguration.class) @Import(StringHandler.class) - protected static class MissingClassOnAutoConfigurationConfiguration { + static class MissingClassOnAutoConfigurationConfiguration { } @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration({ TestPropertyAutoConfiguration.class, TestTypeClassAutoConfiguration.class }) @Import(StringHandler.class) - protected static class SeveralAutoConfigurationTypeConfiguration { + static class SeveralAutoConfigurationTypeConfiguration { } @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(TestMissingBeanAutoConfiguration.class) @Import(StringNameHandler.class) - protected static class StringMissingBeanNameConfiguration { + static class StringMissingBeanNameConfiguration { } @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(TestNullBeanConfiguration.class) @Import(StringHandler.class) - protected static class StringNullBeanConfiguration { + static class StringNullBeanConfiguration { } @Configuration(proxyBeanMethods = false) - public static class TestPropertyAutoConfiguration { + static class TestPropertyAutoConfiguration { @ConditionalOnProperty("spring.string.enabled") @Bean - public String string() { + String string() { return "Test"; } @ConditionalOnProperty("spring.integer.enabled") @Bean - public Integer integer() { + Integer integer() { return 42; } @@ -289,46 +289,46 @@ class NoSuchBeanDefinitionFailureAnalyzerTests { @Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "com.example.FooBar") - public static class TestTypeClassAutoConfiguration { + static class TestTypeClassAutoConfiguration { @Bean - public String string() { + String string() { return "Test"; } } @Configuration(proxyBeanMethods = false) - public static class TestMissingBeanAutoConfiguration { + static class TestMissingBeanAutoConfiguration { @ConditionalOnBean(Integer.class) @Bean(name = "test-string") - public String string() { + String string() { return "Test"; } } @Configuration(proxyBeanMethods = false) - public static class TestNullBeanConfiguration { + static class TestNullBeanConfiguration { @Bean - public String string() { + String string() { return null; } } @Configuration(proxyBeanMethods = false) - public static class QualifiedBeanConfiguration { + static class QualifiedBeanConfiguration { @Bean - public String consumer(@Qualifier("alpha") Thing thing) { + String consumer(@Qualifier("alpha") Thing thing) { return "consumer"; } @Bean - public Thing producer() { + Thing producer() { return new Thing(); } @@ -338,23 +338,23 @@ class NoSuchBeanDefinitionFailureAnalyzerTests { } - protected static class StringHandler { + static class StringHandler { - public StringHandler(String foo) { + StringHandler(String foo) { } } - protected static class NumberHandler { + static class NumberHandler { - public NumberHandler(Number foo) { + NumberHandler(Number foo) { } } - protected static class StringNameHandler { + static class StringNameHandler { - public StringNameHandler(BeanFactory beanFactory) { + StringNameHandler(BeanFactory beanFactory) { beanFactory.getBean("test-string"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java index b039fb93b6..7eaa365218 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java @@ -135,7 +135,7 @@ class JestAutoConfigurationTests { static class CustomJestClient { @Bean - public JestClient customJestClient() { + JestClient customJestClient() { return mock(JestClient.class); } @@ -145,7 +145,7 @@ class JestAutoConfigurationTests { static class CustomGson { @Bean - public Gson customGson() { + Gson customGson() { return new Gson(); } @@ -158,7 +158,7 @@ class JestAutoConfigurationTests { private final Gson gson = new Gson(); @Bean - public HttpClientConfigBuilderCustomizer customizer() { + HttpClientConfigBuilderCustomizer customizer() { return (builder) -> builder.gson(BuilderCustomizer.this.gson); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java index 6399e75b22..953f94b4b3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java @@ -122,7 +122,7 @@ class RestClientAutoConfigurationTests { static class CustomRestClientConfiguration { @Bean - public RestClient customRestClient() { + RestClient customRestClient() { return mock(RestClient.class); } @@ -132,7 +132,7 @@ class RestClientAutoConfigurationTests { static class BuilderCustomizerConfiguration { @Bean - public RestClientBuilderCustomizer myCustomizer() { + RestClientBuilderCustomizer myCustomizer() { return (builder) -> builder.setPathPrefix("/test"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java index 5e3ac8cf94..0485999e58 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java @@ -469,38 +469,38 @@ class FlywayAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class FlywayDataSourceConfiguration { + static class FlywayDataSourceConfiguration { @Bean @Primary - public DataSource normalDataSource() { + DataSource normalDataSource() { return DataSourceBuilder.create().url("jdbc:hsqldb:mem:normal").username("sa").build(); } @FlywayDataSource @Bean - public DataSource flywayDataSource() { + DataSource flywayDataSource() { return DataSourceBuilder.create().url("jdbc:hsqldb:mem:flywaytest").username("sa").build(); } } @Configuration(proxyBeanMethods = false) - protected static class ResourceLoaderConfiguration { + static class ResourceLoaderConfiguration { @Bean @Primary - public ResourceLoader customClassLoader() { + ResourceLoader customClassLoader() { return new DefaultResourceLoader(new CustomClassLoader(getClass().getClassLoader())); } } @Configuration(proxyBeanMethods = false) - protected static class CustomFlywayMigrationInitializer { + static class CustomFlywayMigrationInitializer { @Bean - public FlywayMigrationInitializer flywayMigrationInitializer(Flyway flyway) { + FlywayMigrationInitializer flywayMigrationInitializer(Flyway flyway) { FlywayMigrationInitializer initializer = new FlywayMigrationInitializer(flyway); initializer.setOrder(Ordered.HIGHEST_PRECEDENCE); return initializer; @@ -509,7 +509,7 @@ class FlywayAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class CustomFlywayWithJpaConfiguration { + static class CustomFlywayWithJpaConfiguration { private final DataSource dataSource; @@ -518,12 +518,12 @@ class FlywayAutoConfigurationTests { } @Bean - public Flyway flyway() { + Flyway flyway() { return new Flyway(); } @Bean - public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() { + LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() { Map properties = new HashMap<>(); properties.put("configured", "manually"); properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE); @@ -534,7 +534,7 @@ class FlywayAutoConfigurationTests { } @Component - protected static class MockFlywayMigrationStrategy implements FlywayMigrationStrategy { + static class MockFlywayMigrationStrategy implements FlywayMigrationStrategy { private boolean called = false; @@ -543,7 +543,7 @@ class FlywayAutoConfigurationTests { this.called = true; } - public void assertCalled() { + void assertCalled() { assertThat(this.called).isTrue(); } @@ -554,13 +554,13 @@ class FlywayAutoConfigurationTests { @Bean @Order(1) - public Callback callbackOne() { + Callback callbackOne() { return mockCallback(); } @Bean @Order(0) - public Callback callbackTwo() { + Callback callbackTwo() { return mockCallback(); } @@ -577,13 +577,13 @@ class FlywayAutoConfigurationTests { @Bean @Order(1) - public FlywayCallback legacyCallbackOne() { + FlywayCallback legacyCallbackOne() { return mock(FlywayCallback.class); } @Bean @Order(0) - public FlywayCallback legacyCallbackTwo() { + FlywayCallback legacyCallbackTwo() { return mock(FlywayCallback.class); } @@ -594,19 +594,19 @@ class FlywayAutoConfigurationTests { @Bean @Order(1) - public FlywayConfigurationCustomizer customizerOne() { + FlywayConfigurationCustomizer customizerOne() { return (configuration) -> configuration.connectRetries(5).ignorePendingMigrations(true); } @Bean @Order(0) - public FlywayConfigurationCustomizer customizerTwo() { + FlywayConfigurationCustomizer customizerTwo() { return (configuration) -> configuration.connectRetries(10).ignoreMissingMigrations(true); } } - private static final class CustomClassLoader extends ClassLoader { + static final class CustomClassLoader extends ClassLoader { private CustomClassLoader(ClassLoader parent) { super(parent); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java index a9b803ab7e..d9960b92e3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java @@ -221,7 +221,7 @@ class FreeMarkerAutoConfigurationServletIntegrationTests { static class FilterRegistrationResourceConfiguration { @Bean - public FilterRegistrationBean filterRegistration() { + FilterRegistrationBean filterRegistration() { FilterRegistrationBean bean = new FilterRegistrationBean<>( new ResourceUrlEncodingFilter()); bean.setDispatcherTypes(EnumSet.of(DispatcherType.INCLUDE)); @@ -235,7 +235,7 @@ class FreeMarkerAutoConfigurationServletIntegrationTests { static class FilterRegistrationOtherConfiguration { @Bean - public FilterRegistrationBean filterRegistration() { + FilterRegistrationBean filterRegistration() { return new FilterRegistrationBean<>(new OrderedCharacterEncodingFilter()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java index eb9b422d77..d4cc600b44 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java @@ -208,7 +208,7 @@ class GsonAutoConfigurationTests { static class GsonBuilderCustomizerConfig { @Bean - public GsonBuilderCustomizer customSerializationExclusionStrategy() { + GsonBuilderCustomizer customSerializationExclusionStrategy() { return (gsonBuilder) -> gsonBuilder.addSerializationExclusionStrategy(new ExclusionStrategy() { @Override public boolean shouldSkipField(FieldAttributes fieldAttributes) { @@ -228,7 +228,7 @@ class GsonAutoConfigurationTests { static class GsonBuilderConfig { @Bean - public GsonBuilder customGsonBuilder() { + GsonBuilder customGsonBuilder() { return new GsonBuilder().serializeNulls(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java index 46df326be9..b5c0ab64bc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java @@ -136,12 +136,12 @@ class HazelcastAutoConfigurationClientTests { static class HazelcastServerAndClientConfig { @Bean - public Config config() { + Config config() { return new Config(); } @Bean - public ClientConfig clientConfig() { + ClientConfig clientConfig() { return new ClientConfig(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java index 8cbe488194..8d7c184fdf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java @@ -163,7 +163,7 @@ public class HazelcastAutoConfigurationServerTests { static class HazelcastConfigWithName { @Bean - public Config myHazelcastConfig() { + Config myHazelcastConfig() { return new Config("my-test-instance"); } @@ -173,7 +173,7 @@ public class HazelcastAutoConfigurationServerTests { static class HazelcastConfigNoName { @Bean - public Config anotherHazelcastConfig() { + Config anotherHazelcastConfig() { Config config = new Config(); config.addQueueConfig(new QueueConfig("another-queue")); return config; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfigurationTests.java index 7dc4ea32ee..d3c75935a7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfigurationTests.java @@ -97,7 +97,7 @@ class HazelcastJpaDependencyAutoConfigurationTests { static class HazelcastConfiguration { @Bean - public HazelcastInstance hazelcastInstance() { + HazelcastInstance hazelcastInstance() { return mock(HazelcastInstance.class); } @@ -107,7 +107,7 @@ class HazelcastJpaDependencyAutoConfigurationTests { static class HazelcastCustomNameConfiguration { @Bean - public HazelcastInstance myHazelcastInstance() { + HazelcastInstance myHazelcastInstance() { return mock(HazelcastInstance.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java index a8ea6d7d6e..85af1e0b0e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java @@ -263,35 +263,35 @@ class HttpMessageConvertersAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class JacksonObjectMapperConfig { + static class JacksonObjectMapperConfig { @Bean - public ObjectMapper objectMapper() { + ObjectMapper objectMapper() { return new ObjectMapper(); } } @Configuration(proxyBeanMethods = false) - protected static class JacksonObjectMapperBuilderConfig { + static class JacksonObjectMapperBuilderConfig { @Bean - public ObjectMapper objectMapper() { + ObjectMapper objectMapper() { return new ObjectMapper(); } @Bean - public Jackson2ObjectMapperBuilder builder() { + Jackson2ObjectMapperBuilder builder() { return new Jackson2ObjectMapperBuilder(); } } @Configuration(proxyBeanMethods = false) - protected static class JacksonConverterConfig { + static class JacksonConverterConfig { @Bean - public MappingJackson2HttpMessageConverter customJacksonMessageConverter(ObjectMapper objectMapper) { + MappingJackson2HttpMessageConverter customJacksonMessageConverter(ObjectMapper objectMapper) { MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); converter.setObjectMapper(objectMapper); return converter; @@ -300,10 +300,10 @@ class HttpMessageConvertersAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class GsonConverterConfig { + static class GsonConverterConfig { @Bean - public GsonHttpMessageConverter customGsonMessageConverter(Gson gson) { + GsonHttpMessageConverter customGsonMessageConverter(Gson gson) { GsonHttpMessageConverter converter = new GsonHttpMessageConverter(); converter.setGson(gson); return converter; @@ -312,10 +312,10 @@ class HttpMessageConvertersAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class JsonbConverterConfig { + static class JsonbConverterConfig { @Bean - public JsonbHttpMessageConverter customJsonbMessageConverter(Jsonb jsonb) { + JsonbHttpMessageConverter customJsonbMessageConverter(Jsonb jsonb) { JsonbHttpMessageConverter converter = new JsonbHttpMessageConverter(); converter.setJsonb(jsonb); return converter; @@ -324,20 +324,20 @@ class HttpMessageConvertersAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class StringConverterConfig { + static class StringConverterConfig { @Bean - public StringHttpMessageConverter customStringMessageConverter() { + StringHttpMessageConverter customStringMessageConverter() { return new StringHttpMessageConverter(); } } @Configuration(proxyBeanMethods = false) - protected static class TypeConstrainedConverterConfiguration { + static class TypeConstrainedConverterConfiguration { @Bean - public TypeConstrainedMappingJackson2HttpMessageConverter typeConstrainedConverter() { + TypeConstrainedMappingJackson2HttpMessageConverter typeConstrainedConverter() { return new TypeConstrainedMappingJackson2HttpMessageConverter(RepresentationModel.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java index 07337d87fb..a3b22d8a5c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java @@ -87,7 +87,7 @@ class InfluxDbAutoConfigurationTests { static class CustomOkHttpClientBuilderProviderConfig { @Bean - public InfluxDbOkHttpClientBuilderProvider influxDbOkHttpClientBuilderProvider() { + InfluxDbOkHttpClientBuilderProvider influxDbOkHttpClientBuilderProvider() { return () -> new OkHttpClient.Builder().readTimeout(40, TimeUnit.SECONDS); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java index 2e1f7a74e3..d10f49e77e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java @@ -152,12 +152,12 @@ class ProjectInfoAutoConfigurationTests { static class CustomInfoPropertiesConfiguration { @Bean - public GitProperties customGitProperties() { + GitProperties customGitProperties() { return new GitProperties(new Properties()); } @Bean - public BuildProperties customBuildProperties() { + BuildProperties customBuildProperties() { return new BuildProperties(new Properties()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java index 2f88d96ca1..b006eb048f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java @@ -193,7 +193,7 @@ class IntegrationAutoConfigurationTests { @Bean @Primary - public MBeanExporter myMBeanExporter() { + MBeanExporter myMBeanExporter() { return mock(MBeanExporter.class); } @@ -206,7 +206,7 @@ class IntegrationAutoConfigurationTests { } @MessagingGateway - public interface TestGateway extends RequestReplyExchanger { + interface TestGateway extends RequestReplyExchanger { } @@ -214,7 +214,7 @@ class IntegrationAutoConfigurationTests { static class MessageSourceConfiguration { @Bean - public MessageSource myMessageSource() { + MessageSource myMessageSource() { return new MessageProcessorMessageSource(mock(MessageProcessor.class)); } 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 da460435f6..6a76c8bc2a 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 @@ -398,7 +398,7 @@ class JacksonAutoConfigurationTests { }); } - public static class MyDateFormat extends SimpleDateFormat { + static class MyDateFormat extends SimpleDateFormat { MyDateFormat() { super("yyyy-MM-dd HH:mm:ss"); @@ -407,11 +407,11 @@ class JacksonAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class MockObjectMapperConfig { + static class MockObjectMapperConfig { @Bean @Primary - public ObjectMapper objectMapper() { + ObjectMapper objectMapper() { return mock(ObjectMapper.class); } @@ -419,20 +419,20 @@ class JacksonAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @Import(BazSerializer.class) - protected static class ModuleConfig { + static class ModuleConfig { @Bean - public CustomModule jacksonModule() { + CustomModule jacksonModule() { return new CustomModule(); } } @Configuration - protected static class DoubleModulesConfig { + static class DoubleModulesConfig { @Bean - public Module jacksonModule() { + Module jacksonModule() { SimpleModule module = new SimpleModule(); module.addSerializer(Foo.class, new JsonSerializer() { @@ -448,7 +448,7 @@ class JacksonAutoConfigurationTests { @Bean @Primary - public ObjectMapper objectMapper() { + ObjectMapper objectMapper() { ObjectMapper mapper = new ObjectMapper(); mapper.registerModule(jacksonModule()); return mapper; @@ -457,20 +457,20 @@ class JacksonAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class ParameterNamesModuleConfig { + static class ParameterNamesModuleConfig { @Bean - public ParameterNamesModule parameterNamesModule() { + ParameterNamesModule parameterNamesModule() { return new ParameterNamesModule(JsonCreator.Mode.DELEGATING); } } @Configuration(proxyBeanMethods = false) - protected static class ObjectMapperBuilderCustomConfig { + static class ObjectMapperBuilderCustomConfig { @Bean - public Jackson2ObjectMapperBuilderCustomizer customDateFormat() { + Jackson2ObjectMapperBuilderCustomizer customDateFormat() { return (builder) -> builder.dateFormat(new MyDateFormat()); } @@ -497,22 +497,22 @@ class JacksonAutoConfigurationTests { } - protected static class Bar { + static class Bar { private String propertyName; - public String getPropertyName() { + String getPropertyName() { return this.propertyName; } - public void setPropertyName(String propertyName) { + void setPropertyName(String propertyName) { this.propertyName = propertyName; } } @JsonComponent - private static class BazSerializer extends JsonObjectSerializer { + static class BazSerializer extends JsonObjectSerializer { @Override protected void serializeObject(Baz value, JsonGenerator jgen, SerializerProvider provider) { @@ -520,11 +520,11 @@ class JacksonAutoConfigurationTests { } - private static class Baz { + static class Baz { } - private static class CustomModule extends SimpleModule { + static class CustomModule extends SimpleModule { private Set owners = new HashSet<>(); @@ -540,13 +540,13 @@ class JacksonAutoConfigurationTests { } @SuppressWarnings("unused") - private static class VisibilityBean { + static class VisibilityBean { private String property1; public String property2; - public String getProperty3() { + String getProperty3() { return null; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java index fba0594d89..109c05b296 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java @@ -213,7 +213,7 @@ class DataSourceAutoConfigurationTests { private BasicDataSource pool; @Bean - public DataSource dataSource() { + DataSource dataSource() { this.pool = new BasicDataSource(); this.pool.setDriverClassName("org.hsqldb.jdbcDriver"); this.pool.setUrl("jdbc:hsqldb:mem:overridedb"); @@ -229,7 +229,7 @@ class DataSourceAutoConfigurationTests { private boolean called; @Autowired - public void validateDataSourceIsInitialized(DataSource dataSource) { + void validateDataSourceIsInitialized(DataSource dataSource) { // Inject the datasource to validate it is initialized at the injection point JdbcTemplate template = new JdbcTemplate(dataSource); assertThat(template.queryForObject("SELECT COUNT(*) from BAR", Integer.class)).isEqualTo(1); @@ -278,7 +278,7 @@ class DataSourceAutoConfigurationTests { } - private static class DisableEmbeddedDatabaseClassLoader extends URLClassLoader { + static class DisableEmbeddedDatabaseClassLoader extends URLClassLoader { DisableEmbeddedDatabaseClassLoader() { super(new URL[0], DisableEmbeddedDatabaseClassLoader.class.getClassLoader()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerInvokerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerInvokerTests.java index aa6b992716..2323884123 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerInvokerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerInvokerTests.java @@ -243,20 +243,20 @@ class DataSourceInitializerInvokerTests { } @Configuration(proxyBeanMethods = false) - protected static class OneDataSource { + static class OneDataSource { @Bean - public DataSource oneDataSource() { + DataSource oneDataSource() { return new TestDataSource(); } } @Configuration(proxyBeanMethods = false) - protected static class TwoDataSources extends OneDataSource { + static class TwoDataSources extends OneDataSource { @Bean - public DataSource twoDataSource() { + DataSource twoDataSource() { return new TestDataSource(); } @@ -266,7 +266,7 @@ class DataSourceInitializerInvokerTests { * {@link ResourcePatternResolver} used to ensure consistently wrong resource * ordering. */ - private static class ReverseOrderResourceLoader implements ResourcePatternResolver { + static class ReverseOrderResourceLoader implements ResourcePatternResolver { private final ResourcePatternResolver resolver; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java index 6cc01c4f75..e63e230daf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java @@ -167,13 +167,13 @@ class DataSourceJmxConfigurationTests { static class DataSourceProxyConfiguration { @Bean - public static DataSourceBeanPostProcessor dataSourceBeanPostProcessor() { + static DataSourceBeanPostProcessor dataSourceBeanPostProcessor() { return new DataSourceBeanPostProcessor(); } } - private static class DataSourceBeanPostProcessor implements BeanPostProcessor { + static class DataSourceBeanPostProcessor implements BeanPostProcessor { @Override public Object postProcessAfterInitialization(Object bean, String beanName) { @@ -189,14 +189,12 @@ class DataSourceJmxConfigurationTests { static class DataSourceDelegateConfiguration { @Bean - public static DataSourceBeanPostProcessor dataSourceBeanPostProcessor() { + static DataSourceBeanPostProcessor dataSourceBeanPostProcessor() { return new DataSourceBeanPostProcessor() { @Override public Object postProcessAfterInitialization(Object bean, String beanName) { - if (bean instanceof javax.sql.DataSource) { - return new DelegatingDataSource((javax.sql.DataSource) bean); - } - return bean; + return (bean instanceof javax.sql.DataSource) + ? new DelegatingDataSource((javax.sql.DataSource) bean) : bean; } }; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java index cf01f66e21..84a1de85af 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java @@ -74,11 +74,11 @@ class DataSourceJsonSerializationTests { } @JsonSerialize(using = TomcatDataSourceSerializer.class) - protected interface DataSourceJson { + interface DataSourceJson { } - protected static class TomcatDataSourceSerializer extends JsonSerializer { + static class TomcatDataSourceSerializer extends JsonSerializer { private ConversionService conversionService = new DefaultConversionService(); @@ -97,7 +97,7 @@ class DataSourceJsonSerializationTests { } - protected static class GenericSerializerModifier extends BeanSerializerModifier { + static class GenericSerializerModifier extends BeanSerializerModifier { private ConversionService conversionService = new DefaultConversionService(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java index c29896bb96..0ac4f095d2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java @@ -110,10 +110,10 @@ class DataSourceTransactionManagerAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TransactionManagerConfiguration { + static class TransactionManagerConfiguration { @Bean - public PlatformTransactionManager myTransactionManager() { + PlatformTransactionManager myTransactionManager() { return mock(PlatformTransactionManager.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java index 3f5f4ad30e..2ac583fe1a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java @@ -201,12 +201,12 @@ class JdbcTemplateAutoConfigurationTests { static class CustomConfiguration { @Bean - public JdbcOperations customJdbcOperations(DataSource dataSource) { + JdbcOperations customJdbcOperations(DataSource dataSource) { return new JdbcTemplate(dataSource); } @Bean - public NamedParameterJdbcOperations customNamedParameterJdbcOperations(DataSource dataSource) { + NamedParameterJdbcOperations customNamedParameterJdbcOperations(DataSource dataSource) { return new NamedParameterJdbcTemplate(dataSource); } @@ -216,7 +216,7 @@ class JdbcTemplateAutoConfigurationTests { static class TestDataSourceConfiguration { @Bean - public DataSource customDataSource() { + DataSource customDataSource() { return new TestDataSource(); } @@ -226,12 +226,12 @@ class JdbcTemplateAutoConfigurationTests { static class MultiJdbcTemplateConfiguration { @Bean - public JdbcTemplate test1Template() { + JdbcTemplate test1Template() { return mock(JdbcTemplate.class); } @Bean - public JdbcTemplate test2Template() { + JdbcTemplate test2Template() { return mock(JdbcTemplate.class); } @@ -242,12 +242,12 @@ class JdbcTemplateAutoConfigurationTests { @Bean @Primary - public JdbcTemplate test1Template() { + JdbcTemplate test1Template() { return mock(JdbcTemplate.class); } @Bean - public JdbcTemplate test2Template() { + JdbcTemplate test2Template() { return mock(JdbcTemplate.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceConfiguration.java index 2b698c907d..eed6efcd52 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceConfiguration.java @@ -31,12 +31,12 @@ import org.springframework.context.annotation.Configuration; class MultiDataSourceConfiguration { @Bean - public DataSource test1DataSource() { + DataSource test1DataSource() { return new TestDataSource("test1"); } @Bean - public DataSource test2DataSource() { + DataSource test2DataSource() { return new TestDataSource("test2"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceUsingPrimaryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceUsingPrimaryConfiguration.java index d49b1395af..05b5f2c45e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceUsingPrimaryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceUsingPrimaryConfiguration.java @@ -33,12 +33,12 @@ class MultiDataSourceUsingPrimaryConfiguration { @Bean @Primary - public DataSource test1DataSource() { + DataSource test1DataSource() { return new TestDataSource("test1"); } @Bean - public DataSource test2DataSource() { + DataSource test2DataSource() { return new TestDataSource("test2"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java index 48bb34230b..5c0028b218 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java @@ -109,11 +109,11 @@ class TomcatDataSourceConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @EnableMBeanExport - protected static class TomcatDataSourceConfiguration { + static class TomcatDataSourceConfiguration { @Bean @ConfigurationProperties(prefix = "spring.datasource.tomcat") - public DataSource dataSource() { + DataSource dataSource() { return DataSourceBuilder.create().type(org.apache.tomcat.jdbc.pool.DataSource.class).build(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfigurationTests.java index 3732308467..91f0f78c16 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfigurationTests.java @@ -84,12 +84,12 @@ class XADataSourceAutoConfigurationTests { static class WrapExisting { @Bean - public MockXADataSourceWrapper wrapper() { + MockXADataSourceWrapper wrapper() { return new MockXADataSourceWrapper(); } @Bean - public XADataSource xaDataSource() { + XADataSource xaDataSource() { return mock(XADataSource.class); } @@ -99,13 +99,13 @@ class XADataSourceAutoConfigurationTests { static class FromProperties { @Bean - public MockXADataSourceWrapper wrapper() { + MockXADataSourceWrapper wrapper() { return new MockXADataSourceWrapper(); } } - private static class MockXADataSourceWrapper implements XADataSourceWrapper { + static class MockXADataSourceWrapper implements XADataSourceWrapper { private XADataSource dataSource; @@ -115,7 +115,7 @@ class XADataSourceAutoConfigurationTests { return mock(DataSource.class); } - public XADataSource getXaDataSource() { + XADataSource getXaDataSource() { return this.dataSource; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomApplicationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomApplicationTests.java index 7bef31309b..1ed329b43a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomApplicationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomApplicationTests.java @@ -58,7 +58,7 @@ class JerseyAutoConfigurationCustomApplicationTests { } @ApplicationPath("/test") - public static class TestApplication extends Application { + static class TestApplication extends Application { } 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 e5ed2a0a89..308be4f186 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 @@ -72,16 +72,16 @@ class JerseyAutoConfigurationCustomFilterContextPathTests { @Value("${message:World}") private String msg; + Application() { + register(Application.class); + } + @GET public String message() { return "Hello " + this.msg; } - Application() { - register(Application.class); - } - - public static void main(String[] args) { + static void main(String[] args) { SpringApplication.run(Application.class, args); } 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 3e5a624154..5ef1b34603 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 @@ -71,16 +71,16 @@ class JerseyAutoConfigurationCustomFilterPathTests { @Value("${message:World}") private String msg; + Application() { + register(Application.class); + } + @GET public String message() { return "Hello " + this.msg; } - Application() { - register(Application.class); - } - - public static void main(String[] args) { + static void main(String[] args) { SpringApplication.run(Application.class, args); } 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 1d8fdb3b06..97e61d7217 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 @@ -55,7 +55,7 @@ class JerseyAutoConfigurationCustomLoadOnStartupTests { } @MinimalWebConfiguration - public static class Application extends ResourceConfig { + static class Application extends ResourceConfig { 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 ff353d6655..a59fb99d3c 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 @@ -70,16 +70,16 @@ class JerseyAutoConfigurationCustomObjectMapperProviderTests { @Path("/message") public static class Application extends ResourceConfig { + Application() { + register(Application.class); + } + @GET public Message message() { return new Message("Jersey", null); } - Application() { - register(Application.class); - } - - public static void main(String[] args) { + static void main(String[] args) { SpringApplication.run(Application.class, args); } 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 6aebc92d44..6dc94af0cd 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 @@ -71,16 +71,16 @@ class JerseyAutoConfigurationCustomServletContextPathTests { @Value("${message:World}") private String msg; + Application() { + register(Application.class); + } + @GET public String message() { return "Hello " + this.msg; } - Application() { - register(Application.class); - } - - public static void main(String[] args) { + static void main(String[] args) { SpringApplication.run(Application.class, args); } 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 cd46ade247..d368cdbcd0 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 @@ -71,16 +71,16 @@ class JerseyAutoConfigurationCustomServletPathTests { @Value("${message:World}") private String msg; + Application() { + register(Application.class); + } + @GET public String message() { return "Hello " + this.msg; } - Application() { - register(Application.class); - } - - public static void main(String[] args) { + static void main(String[] args) { SpringApplication.run(Application.class, args); } 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 cb18b55a73..afe01f326a 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 @@ -69,16 +69,16 @@ class JerseyAutoConfigurationDefaultFilterPathTests { @Value("${message:World}") private String msg; + Application() { + register(Application.class); + } + @GET public String message() { return "Hello " + this.msg; } - Application() { - register(Application.class); - } - - public static void main(String[] args) { + static void main(String[] args) { SpringApplication.run(Application.class, args); } 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 f7e0d41e84..3d13841015 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 @@ -78,7 +78,7 @@ class JerseyAutoConfigurationDefaultServletPathTests { return "Hello " + this.msg; } - public static void main(String[] args) { + static void main(String[] args) { SpringApplication.run(Application.class, args); } 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 0b1861167c..3ac64538f4 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 @@ -72,16 +72,16 @@ class JerseyAutoConfigurationObjectMapperProviderTests { @Path("/message") public static class Application extends ResourceConfig { + Application() { + register(Application.class); + } + @GET public Message message() { return new Message("Jersey", null); } - Application() { - register(Application.class); - } - - public static void main(String[] args) { + static void main(String[] args) { SpringApplication.run(Application.class, args); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationServletContainerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationServletContainerTests.java index 1511345330..6ab834f8b4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationServletContainerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationServletContainerTests.java @@ -85,10 +85,10 @@ class JerseyAutoConfigurationServletContainerTests { } @Configuration(proxyBeanMethods = false) - public static class ContainerConfiguration { + static class ContainerConfiguration { @Bean - public TomcatServletWebServerFactory tomcat() { + TomcatServletWebServerFactory tomcat() { return new TomcatServletWebServerFactory() { @Override diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java index 0133587318..0edbf673cf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java @@ -104,7 +104,7 @@ class JerseyAutoConfigurationTests { static class ResourceConfigConfiguration { @Bean - public ResourceConfig resourceConfig() { + ResourceConfig resourceConfig() { return new ResourceConfig(); } @@ -114,7 +114,7 @@ class JerseyAutoConfigurationTests { static class RequestContextFilterConfiguration { @Bean - public RequestContextFilter requestContextFilter() { + RequestContextFilter requestContextFilter() { return new RequestContextFilter(); } @@ -124,7 +124,7 @@ class JerseyAutoConfigurationTests { static class RequestContextFilterRegistrationConfiguration { @Bean - public FilterRegistrationBean customRequestContextFilterRegistration() { + FilterRegistrationBean customRequestContextFilterRegistration() { return new FilterRegistrationBean<>(new RequestContextFilter()); } 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 2d73e2a931..b01cc2651b 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 @@ -69,16 +69,16 @@ class JerseyAutoConfigurationWithoutApplicationPathTests { @Value("${message:World}") private String msg; + Application() { + register(Application.class); + } + @GET public String message() { return "Hello " + this.msg; } - Application() { - register(Application.class); - } - - public static void main(String[] args) { + static void main(String[] args) { SpringApplication.run(Application.class, args); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java index 4957242b4d..64ed89fbfa 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java @@ -382,12 +382,12 @@ class JmsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration { + static class TestConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration2 { + static class TestConfiguration2 { @Bean ConnectionFactory connectionFactory() { @@ -401,7 +401,7 @@ class JmsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration3 { + static class TestConfiguration3 { @Bean JmsTemplate jmsTemplate(ConnectionFactory connectionFactory) { @@ -413,7 +413,7 @@ class JmsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration4 implements BeanPostProcessor { + static class TestConfiguration4 implements BeanPostProcessor { @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { @@ -432,7 +432,7 @@ class JmsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration5 { + static class TestConfiguration5 { @Bean JmsMessagingTemplate jmsMessagingTemplate(JmsTemplate jmsTemplate) { @@ -444,7 +444,7 @@ class JmsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration6 { + static class TestConfiguration6 { @Bean JmsListenerContainerFactory jmsListenerContainerFactory(ConnectionFactory connectionFactory) { @@ -456,7 +456,7 @@ class JmsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration7 { + static class TestConfiguration7 { @Bean JtaTransactionManager transactionManager() { @@ -466,7 +466,7 @@ class JmsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration8 { + static class TestConfiguration8 { @Bean DataSourceTransactionManager transactionManager() { @@ -476,39 +476,39 @@ class JmsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class MessageConvertersConfiguration { + static class MessageConvertersConfiguration { @Bean @Primary - public MessageConverter myMessageConverter() { + MessageConverter myMessageConverter() { return mock(MessageConverter.class); } @Bean - public MessageConverter anotherMessageConverter() { + MessageConverter anotherMessageConverter() { return mock(MessageConverter.class); } } @Configuration(proxyBeanMethods = false) - protected static class DestinationResolversConfiguration { + static class DestinationResolversConfiguration { @Bean @Primary - public DestinationResolver myDestinationResolver() { + DestinationResolver myDestinationResolver() { return mock(DestinationResolver.class); } @Bean - public DestinationResolver anotherDestinationResolver() { + DestinationResolver anotherDestinationResolver() { return mock(DestinationResolver.class); } } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration9 { + static class TestConfiguration9 { @Bean JmsListenerContainerFactory customListenerContainerFactory( @@ -523,15 +523,15 @@ class JmsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfiguration10 { + static class TestConfiguration10 { @Bean - public ConnectionFactory connectionFactory1() { + ConnectionFactory connectionFactory1() { return new ActiveMQConnectionFactory(); } @Bean - public ConnectionFactory connectionFactory2() { + ConnectionFactory connectionFactory2() { return new ActiveMQConnectionFactory(); } @@ -539,12 +539,12 @@ class JmsAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableJms - protected static class EnableJmsConfiguration { + static class EnableJmsConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class NoEnableJmsConfiguration { + static class NoEnableJmsConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java index 437f56dc99..81a013905d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java @@ -198,7 +198,7 @@ class ActiveMQAutoConfigurationTests { static class CustomConnectionFactoryConfiguration { @Bean - public ConnectionFactory connectionFactory() { + ConnectionFactory connectionFactory() { return mock(ConnectionFactory.class); } @@ -208,7 +208,7 @@ class ActiveMQAutoConfigurationTests { static class CustomizerConfiguration { @Bean - public ActiveMQConnectionFactoryCustomizer activeMQConnectionFactoryCustomizer() { + ActiveMQConnectionFactoryCustomizer activeMQConnectionFactoryCustomizer() { return (factory) -> { factory.setBrokerURL("vm://localhost?useJmx=false&broker.persistent=false"); factory.setUserName("foobar"); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java index 77c15dcf5d..f0923a3066 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java @@ -391,15 +391,15 @@ class ArtemisAutoConfigurationTests { this.destinationResolver = new DynamicDestinationResolver(); } - public void checkQueue(String name, boolean shouldExist) { + void checkQueue(String name, boolean shouldExist) { checkDestination(name, false, shouldExist); } - public void checkTopic(String name, boolean shouldExist) { + void checkTopic(String name, boolean shouldExist) { checkDestination(name, true, shouldExist); } - public void checkDestination(String name, final boolean pubSub, final boolean shouldExist) { + void checkDestination(String name, final boolean pubSub, final boolean shouldExist) { this.jmsTemplate.execute((SessionCallback) (session) -> { try { Destination destination = this.destinationResolver.resolveDestinationName(session, name, pubSub); @@ -421,12 +421,12 @@ class ArtemisAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class EmptyConfiguration { + static class EmptyConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class DestinationConfiguration { + static class DestinationConfiguration { @Bean JMSQueueConfiguration sampleQueueConfiguration() { @@ -449,10 +449,10 @@ class ArtemisAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class CustomJmsConfiguration { + static class CustomJmsConfiguration { @Bean - public JMSConfiguration myJmsConfiguration() { + JMSConfiguration myJmsConfiguration() { JMSConfiguration config = new JMSConfigurationImpl(); JMSQueueConfiguration jmsQueueConfiguration = new JMSQueueConfigurationImpl(); jmsQueueConfiguration.setName("custom"); @@ -464,10 +464,10 @@ class ArtemisAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class CustomArtemisConfiguration { + static class CustomArtemisConfiguration { @Bean - public ArtemisConfigurationCustomizer myArtemisCustomize() { + ArtemisConfigurationCustomizer myArtemisCustomize() { return (configuration) -> { configuration.setClusterPassword("Foobar"); configuration.setName("customFooBar"); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java index 38321cc174..5caddce419 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java @@ -144,33 +144,33 @@ class JmxAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableIntegrationMBeanExport(defaultDomain = "foo.my") - public static class CustomJmxDomainConfiguration { + static class CustomJmxDomainConfiguration { } @Configuration(proxyBeanMethods = false) - public static class TestConfiguration { + static class TestConfiguration { @Bean - public Counter counter() { + Counter counter() { return new Counter(); } - @ManagedResource - public static class Counter { + } - private int counter = 0; + @ManagedResource + public static class Counter { - @ManagedAttribute - public int get() { - return this.counter; - } + private int counter = 0; - @ManagedOperation - public void increment() { - this.counter++; - } + @ManagedAttribute + public int get() { + return this.counter; + } + @ManagedOperation + public void increment() { + this.counter++; } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java index fe87f72b31..806963a94a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,7 +88,7 @@ public class TestableInitialContextFactory implements InitialContextFactory { // available } - public void clearAll() { + void clearAll() { this.bindings.clear(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java index 871e04385e..f463ee7d1f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java @@ -140,7 +140,7 @@ class JooqAutoConfigurationTests { .isEqualTo(SQLDialect.POSTGRES)); } - private static class AssertFetch implements TransactionalRunnable { + static class AssertFetch implements TransactionalRunnable { private final DSLContext dsl; @@ -161,7 +161,7 @@ class JooqAutoConfigurationTests { } - private static class ExecuteSql implements TransactionalRunnable { + static class ExecuteSql implements TransactionalRunnable { private final DSLContext dsl; @@ -182,26 +182,26 @@ class JooqAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class JooqDataSourceConfiguration { + static class JooqDataSourceConfiguration { @Bean - public DataSource jooqDataSource() { + DataSource jooqDataSource() { return DataSourceBuilder.create().url("jdbc:hsqldb:mem:jooqtest").username("sa").build(); } } @Configuration(proxyBeanMethods = false) - protected static class TxManagerConfiguration { + static class TxManagerConfiguration { @Bean - public PlatformTransactionManager transactionManager(DataSource dataSource) { + PlatformTransactionManager transactionManager(DataSource dataSource) { return new DataSourceTransactionManager(dataSource); } } - protected static class TestRecordMapperProvider implements RecordMapperProvider { + static class TestRecordMapperProvider implements RecordMapperProvider { @Override public RecordMapper provide(RecordType recordType, Class aClass) { @@ -210,7 +210,7 @@ class JooqAutoConfigurationTests { } - protected static class TestRecordUnmapperProvider implements RecordUnmapperProvider { + static class TestRecordUnmapperProvider implements RecordUnmapperProvider { @Override public RecordUnmapper provide(Class aClass, RecordType recordType) { @@ -219,7 +219,7 @@ class JooqAutoConfigurationTests { } - protected static class TestRecordListenerProvider implements RecordListenerProvider { + static class TestRecordListenerProvider implements RecordListenerProvider { @Override public RecordListener provide() { @@ -229,7 +229,7 @@ class JooqAutoConfigurationTests { } @Order(100) - protected static class TestExecuteListenerProvider implements ExecuteListenerProvider { + static class TestExecuteListenerProvider implements ExecuteListenerProvider { @Override public ExecuteListener provide() { @@ -238,7 +238,7 @@ class JooqAutoConfigurationTests { } - protected static class TestVisitListenerProvider implements VisitListenerProvider { + static class TestVisitListenerProvider implements VisitListenerProvider { @Override public VisitListener provide() { @@ -247,7 +247,7 @@ class JooqAutoConfigurationTests { } - protected static class TestTransactionListenerProvider implements TransactionListenerProvider { + static class TestTransactionListenerProvider implements TransactionListenerProvider { @Override public TransactionListener provide() { @@ -256,7 +256,7 @@ class JooqAutoConfigurationTests { } - protected static class TestExecutorProvider implements ExecutorProvider { + static class TestExecutorProvider implements ExecutorProvider { @Override public Executor provide() { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java index 3cf11f3527..71c4d635e2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java @@ -109,12 +109,12 @@ class KafkaAutoConfigurationIntegrationTests { static class KafkaConfig { @Bean - public Listener listener() { + Listener listener() { return new Listener(); } @Bean - public NewTopic adminCreated() { + NewTopic adminCreated() { return TopicBuilder.name(ADMIN_CREATED_TOPIC).partitions(10).replicas(1).build(); } @@ -126,7 +126,7 @@ class KafkaAutoConfigurationIntegrationTests { } - public static class Listener { + static class Listener { private final CountDownLatch latch = new CountDownLatch(1); @@ -135,7 +135,7 @@ class KafkaAutoConfigurationIntegrationTests { private volatile String key; @KafkaListener(topics = TEST_TOPIC) - public void listen(String foo, @Header(KafkaHeaders.RECEIVED_MESSAGE_KEY) String key) { + void listen(String foo, @Header(KafkaHeaders.RECEIVED_MESSAGE_KEY) String key) { this.received = foo; this.key = key; this.latch.countDown(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java index 43251d9492..cc203ec4cb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java @@ -568,51 +568,51 @@ class KafkaAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class MessageConverterConfiguration { + static class MessageConverterConfiguration { @Bean - public RecordMessageConverter myMessageConverter() { + RecordMessageConverter myMessageConverter() { return mock(RecordMessageConverter.class); } } @Configuration(proxyBeanMethods = false) - protected static class BatchMessageConverterConfiguration { + static class BatchMessageConverterConfiguration { @Bean - public BatchMessageConverter myBatchMessageConverter() { + BatchMessageConverter myBatchMessageConverter() { return mock(BatchMessageConverter.class); } } @Configuration(proxyBeanMethods = false) - protected static class ErrorHandlerConfiguration { + static class ErrorHandlerConfiguration { @Bean - public SeekToCurrentErrorHandler errorHandler() { + SeekToCurrentErrorHandler errorHandler() { return new SeekToCurrentErrorHandler(); } } @Configuration(proxyBeanMethods = false) - protected static class BatchErrorHandlerConfiguration { + static class BatchErrorHandlerConfiguration { @Bean - public SeekToCurrentBatchErrorHandler batchErrorHandler() { + SeekToCurrentBatchErrorHandler batchErrorHandler() { return new SeekToCurrentBatchErrorHandler(); } } @Configuration(proxyBeanMethods = false) - protected static class TransactionManagerConfiguration { + static class TransactionManagerConfiguration { @Bean @Primary - public PlatformTransactionManager chainedTransactionManager( + PlatformTransactionManager chainedTransactionManager( KafkaTransactionManager kafkaTransactionManager) { return new ChainedKafkaTransactionManager(kafkaTransactionManager); } @@ -620,10 +620,10 @@ class KafkaAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class AfterRollbackProcessorConfiguration { + static class AfterRollbackProcessorConfiguration { @Bean - public AfterRollbackProcessor afterRollbackProcessor() { + AfterRollbackProcessor afterRollbackProcessor() { return (records, consumer, ex, recoverable) -> { // no-op }; @@ -632,20 +632,20 @@ class KafkaAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class RecordInterceptorConfiguration { + static class RecordInterceptorConfiguration { @Bean - public RecordInterceptor recordInterceptor() { + RecordInterceptor recordInterceptor() { return (record) -> record; } } @Configuration(proxyBeanMethods = false) - protected static class RebalanceListenerConfiguration { + static class RebalanceListenerConfiguration { @Bean - public ConsumerAwareRebalanceListener rebalanceListener() { + ConsumerAwareRebalanceListener rebalanceListener() { return mock(ConsumerAwareRebalanceListener.class); } @@ -653,15 +653,15 @@ class KafkaAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableKafkaStreams - protected static class EnableKafkaStreamsConfiguration { + static class EnableKafkaStreamsConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class TestKafkaStreamsConfiguration { + static class TestKafkaStreamsConfiguration { @Bean(name = KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME) - public KafkaStreamsConfiguration kafkaStreamsConfiguration() { + KafkaStreamsConfiguration kafkaStreamsConfiguration() { Map streamsProperties = new HashMap<>(); streamsProperties.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9094, localhost:9095"); streamsProperties.put(StreamsConfig.APPLICATION_ID_CONFIG, "test-id"); @@ -672,15 +672,15 @@ class KafkaAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestStreamsBuilderFactoryBeanConfiguration { + static class TestStreamsBuilderFactoryBeanConfiguration { @Bean - public StreamsBuilderFactoryBean firstStreamsBuilderFactoryBean() { + StreamsBuilderFactoryBean firstStreamsBuilderFactoryBean() { return mock(StreamsBuilderFactoryBean.class); } @Bean - public StreamsBuilderFactoryBean secondStreamsBuilderFactoryBean() { + StreamsBuilderFactoryBean secondStreamsBuilderFactoryBean() { return mock(StreamsBuilderFactoryBean.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java index d0d7559b14..636e725ba4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java @@ -107,7 +107,7 @@ class LdapAutoConfigurationTests { @Bean @Primary - public PooledContextSource pooledContextSource(LdapContextSource ldapContextSource) { + PooledContextSource pooledContextSource(LdapContextSource ldapContextSource) { PooledContextSource pooledContextSource = new PooledContextSource(new PoolConfig()); pooledContextSource.setContextSource(ldapContextSource); return pooledContextSource; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java index 12c272afc7..ec1040da30 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java @@ -150,7 +150,7 @@ class EmbeddedLdapAutoConfigurationTests { static class LdapClientConfiguration { @Bean - public LDAPConnection ldapConnection(@Value("${local.ldap.port}") int port) throws LDAPException { + LDAPConnection ldapConnection(@Value("${local.ldap.port}") int port) throws LDAPException { LDAPConnection con = new LDAPConnection(); con.connect("localhost", port); return con; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java index 628d0cb5b5..0f6f321b2a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java @@ -322,13 +322,13 @@ class LiquibaseAutoConfigurationTests { @Bean @Primary - public DataSource normalDataSource() { + DataSource normalDataSource() { return DataSourceBuilder.create().url("jdbc:hsqldb:mem:normal").username("sa").build(); } @LiquibaseDataSource @Bean - public DataSource liquibaseDataSource() { + DataSource liquibaseDataSource() { return DataSourceBuilder.create().url("jdbc:hsqldb:mem:liquibasetest").username("sa").build(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java index 27393e4796..3d55718feb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java @@ -172,7 +172,7 @@ class ConditionEvaluationReportLoggingListenerTests { static class ErrorConfig { @Bean - public String iBreak() { + String iBreak() { throw new RuntimeException(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java index 9d111732b0..4d64ff2a50 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java @@ -84,7 +84,7 @@ class MongoAutoConfigurationTests { static class OptionsConfig { @Bean - public MongoClientOptions mongoOptions() { + MongoClientOptions mongoOptions() { return MongoClientOptions.builder().socketTimeout(300).build(); } @@ -94,12 +94,12 @@ class MongoAutoConfigurationTests { static class SslOptionsConfig { @Bean - public MongoClientOptions mongoClientOptions(SocketFactory socketFactory) { + MongoClientOptions mongoClientOptions(SocketFactory socketFactory) { return MongoClientOptions.builder().sslEnabled(true).socketFactory(socketFactory).build(); } @Bean - public SocketFactory mySocketFactory() { + SocketFactory mySocketFactory() { return mock(SocketFactory.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java index e16f7b491b..ee7fd0c2f4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java @@ -120,7 +120,7 @@ class MongoReactiveAutoConfigurationTests { static class OptionsConfig { @Bean - public MongoClientSettings mongoClientSettings() { + MongoClientSettings mongoClientSettings() { return MongoClientSettings.builder().readPreference(ReadPreference.nearest()) .applyToSocketSettings((socket) -> socket.readTimeout(300, TimeUnit.SECONDS)).build(); } @@ -131,13 +131,13 @@ class MongoReactiveAutoConfigurationTests { static class SslOptionsConfig { @Bean - public MongoClientSettings mongoClientSettings(StreamFactoryFactory streamFactoryFactory) { + MongoClientSettings mongoClientSettings(StreamFactoryFactory streamFactoryFactory) { return MongoClientSettings.builder().applicationName("test-config") .streamFactoryFactory(streamFactoryFactory).build(); } @Bean - public StreamFactoryFactory myStreamFactoryFactory() { + StreamFactoryFactory myStreamFactoryFactory() { StreamFactoryFactory streamFactoryFactory = mock(StreamFactoryFactory.class); given(streamFactoryFactory.create(any(), any())).willReturn(mock(StreamFactory.class)); return streamFactoryFactory; @@ -152,7 +152,7 @@ class MongoReactiveAutoConfigurationTests { .build(); @Bean - public MongoClientSettingsBuilderCustomizer customizer() { + MongoClientSettingsBuilderCustomizer customizer() { return (clientSettingsBuilder) -> clientSettingsBuilder.applicationName("overridden-name") .streamFactoryFactory(streamFactoryFactory); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java index 0c993bad7a..fba6d90a7c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java @@ -232,7 +232,7 @@ class EmbeddedMongoAutoConfigurationTests { static class MongoClientConfiguration { @Bean - public MongoClient mongoClient(@Value("${local.mongo.port}") int port) { + MongoClient mongoClient(@Value("${local.mongo.port}") int port) { return new MongoClient("localhost", port); } @@ -242,7 +242,7 @@ class EmbeddedMongoAutoConfigurationTests { static class DownloadConfigBuilderCustomizerConfiguration { @Bean - public DownloadConfigBuilderCustomizer testDownloadConfigBuilderCustomizer() { + DownloadConfigBuilderCustomizer testDownloadConfigBuilderCustomizer() { return (downloadConfigBuilder) -> downloadConfigBuilder.userAgent("Test User Agent"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java index ca50273aeb..61b4091692 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java @@ -72,10 +72,10 @@ class MustacheAutoConfigurationReactiveIntegrationTests { @Import({ ReactiveWebServerFactoryAutoConfiguration.class, WebFluxAutoConfiguration.class, HttpHandlerAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) @Controller - public static class Application { + static class Application { @RequestMapping("/") - public String home(Model model) { + String home(Model model) { model.addAttribute("time", new Date()); model.addAttribute("message", "Hello World"); model.addAttribute("title", "Hello App"); @@ -83,7 +83,7 @@ class MustacheAutoConfigurationReactiveIntegrationTests { } @RequestMapping("/partial") - public String layout(Model model) { + String layout(Model model) { model.addAttribute("time", new Date()); model.addAttribute("message", "Hello World"); model.addAttribute("title", "Hello App"); @@ -91,7 +91,7 @@ class MustacheAutoConfigurationReactiveIntegrationTests { } @Bean - public MustacheViewResolver viewResolver() { + MustacheViewResolver viewResolver() { Mustache.Compiler compiler = Mustache.compiler() .withLoader(new MustacheResourceTemplateLoader("classpath:/mustache-templates/", ".html")); MustacheViewResolver resolver = new MustacheViewResolver(compiler); @@ -100,7 +100,7 @@ class MustacheAutoConfigurationReactiveIntegrationTests { return resolver; } - public static void main(String[] args) { + static void main(String[] args) { SpringApplication application = new SpringApplication(Application.class); application.setWebApplicationType(WebApplicationType.REACTIVE); application.run(args); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationServletIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationServletIntegrationTests.java index 52bf3e788a..4fc072b7e9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationServletIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationServletIntegrationTests.java @@ -94,10 +94,10 @@ class MustacheAutoConfigurationServletIntegrationTests { @Configuration(proxyBeanMethods = false) @MinimalWebConfiguration @Controller - public static class Application { + static class Application { @RequestMapping("/") - public String home(Map model) { + String home(Map model) { model.put("time", new Date()); model.put("message", "Hello World"); model.put("title", "Hello App"); @@ -105,7 +105,7 @@ class MustacheAutoConfigurationServletIntegrationTests { } @RequestMapping("/partial") - public String layout(Map model) { + String layout(Map model) { model.put("time", new Date()); model.put("message", "Hello World"); model.put("title", "Hello App"); @@ -113,7 +113,7 @@ class MustacheAutoConfigurationServletIntegrationTests { } @Bean - public MustacheViewResolver viewResolver() { + MustacheViewResolver viewResolver() { Mustache.Compiler compiler = Mustache.compiler() .withLoader(new MustacheResourceTemplateLoader("classpath:/mustache-templates/", ".html")); MustacheViewResolver resolver = new MustacheViewResolver(compiler); @@ -122,7 +122,7 @@ class MustacheAutoConfigurationServletIntegrationTests { return resolver; } - public static void main(String[] args) { + static void main(String[] args) { SpringApplication.run(Application.class, args); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationTests.java index 9cd478020b..095118fae1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationTests.java @@ -102,15 +102,15 @@ class MustacheAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @Import({ MustacheAutoConfiguration.class }) - protected static class BaseConfiguration { + static class BaseConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class CustomCompilerConfiguration { + static class CustomCompilerConfiguration { @Bean - public Mustache.Compiler compiler(Mustache.TemplateLoader mustacheTemplateLoader) { + Mustache.Compiler compiler(Mustache.TemplateLoader mustacheTemplateLoader) { return Mustache.compiler().standardsMode(true).withLoader(mustacheTemplateLoader); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java index 9046145c55..85bf79322e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java @@ -67,7 +67,7 @@ class MustacheStandaloneIntegrationTests { @Configuration(proxyBeanMethods = false) @Import({ MustacheAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static class Application { + static class Application { } 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 e14d4a59fe..24857bd289 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 @@ -228,15 +228,15 @@ abstract class AbstractJpaAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestTwoDataSourcesConfiguration { + static class TestTwoDataSourcesConfiguration { @Bean - public DataSource firstDataSource() { + DataSource firstDataSource() { return createRandomDataSource(); } @Bean - public DataSource secondDataSource() { + DataSource secondDataSource() { return createRandomDataSource(); } @@ -252,12 +252,12 @@ abstract class AbstractJpaAutoConfigurationTests { @Bean @Primary - public DataSource firstDataSource() { + DataSource firstDataSource() { return createRandomDataSource(); } @Bean - public DataSource secondDataSource() { + DataSource secondDataSource() { return createRandomDataSource(); } @@ -270,16 +270,16 @@ abstract class AbstractJpaAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) - protected static class TestConfiguration { + static class TestConfiguration { } @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) - protected static class TestFilterConfiguration { + static class TestFilterConfiguration { @Bean - public OpenEntityManagerInViewFilter openEntityManagerInViewFilter() { + OpenEntityManagerInViewFilter openEntityManagerInViewFilter() { return new OpenEntityManagerInViewFilter(); } @@ -287,10 +287,10 @@ abstract class AbstractJpaAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) - protected static class TestFilterRegistrationConfiguration { + static class TestFilterRegistrationConfiguration { @Bean - public FilterRegistrationBean OpenEntityManagerInViewFilterFilterRegistrationBean() { + FilterRegistrationBean OpenEntityManagerInViewFilterFilterRegistrationBean() { return new FilterRegistrationBean<>(); } @@ -298,25 +298,24 @@ abstract class AbstractJpaAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) - protected static class TestInterceptorManualConfiguration { + static class TestInterceptorManualConfiguration { @Bean - public OpenEntityManagerInViewInterceptor openEntityManagerInViewInterceptor() { + OpenEntityManagerInViewInterceptor openEntityManagerInViewInterceptor() { return new ManualOpenEntityManagerInViewInterceptor(); } - protected static class ManualOpenEntityManagerInViewInterceptor extends OpenEntityManagerInViewInterceptor { + static class ManualOpenEntityManagerInViewInterceptor extends OpenEntityManagerInViewInterceptor { } } @Configuration(proxyBeanMethods = false) - protected static class TestConfigurationWithLocalContainerEntityManagerFactoryBean extends TestConfiguration { + static class TestConfigurationWithLocalContainerEntityManagerFactoryBean extends TestConfiguration { @Bean - public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource, - JpaVendorAdapter adapter) { + LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource, JpaVendorAdapter adapter) { LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean(); factoryBean.setJpaVendorAdapter(adapter); factoryBean.setDataSource(dataSource); @@ -331,10 +330,10 @@ abstract class AbstractJpaAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestConfigurationWithEntityManagerFactory extends TestConfiguration { + static class TestConfigurationWithEntityManagerFactory extends TestConfiguration { @Bean - public EntityManagerFactory entityManagerFactory(DataSource dataSource, JpaVendorAdapter adapter) { + EntityManagerFactory entityManagerFactory(DataSource dataSource, JpaVendorAdapter adapter) { LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean(); factoryBean.setJpaVendorAdapter(adapter); factoryBean.setDataSource(dataSource); @@ -348,7 +347,7 @@ abstract class AbstractJpaAutoConfigurationTests { } @Bean - public PlatformTransactionManager transactionManager(EntityManagerFactory emf) { + PlatformTransactionManager transactionManager(EntityManagerFactory emf) { JpaTransactionManager transactionManager = new JpaTransactionManager(); transactionManager.setEntityManagerFactory(emf); return transactionManager; @@ -358,10 +357,10 @@ abstract class AbstractJpaAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) - protected static class TestConfigurationWithTransactionManager { + static class TestConfigurationWithTransactionManager { @Bean - public PlatformTransactionManager transactionManager() { + PlatformTransactionManager transactionManager() { return new CustomJpaTransactionManager(); } @@ -369,7 +368,7 @@ abstract class AbstractJpaAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(AbstractJpaAutoConfigurationTests.class) - public static class TestConfigurationWithCustomPersistenceUnitManager { + static class TestConfigurationWithCustomPersistenceUnitManager { private final DataSource dataSource; @@ -378,7 +377,7 @@ abstract class AbstractJpaAutoConfigurationTests { } @Bean - public PersistenceUnitManager persistenceUnitManager() { + PersistenceUnitManager persistenceUnitManager() { DefaultPersistenceUnitManager persistenceUnitManager = new DefaultPersistenceUnitManager(); persistenceUnitManager.setDefaultDataSource(this.dataSource); persistenceUnitManager.setPackagesToScan(City.class.getPackage().getName()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java index d9447e85d9..72d592f6a6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java @@ -106,15 +106,15 @@ class CustomHibernateJpaAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) - protected static class TestConfiguration { + static class TestConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class MockDataSourceConfiguration { + static class MockDataSourceConfiguration { @Bean - public DataSource dataSource() { + DataSource dataSource() { DataSource dataSource = mock(DataSource.class); try { given(dataSource.getConnection()).willReturn(mock(Connection.class)); @@ -136,12 +136,12 @@ class CustomHibernateJpaAutoConfigurationTests { static final PhysicalNamingStrategy physicalNamingStrategy = new PhysicalNamingStrategyStandardImpl(); @Bean - public ImplicitNamingStrategy implicitNamingStrategy() { + ImplicitNamingStrategy implicitNamingStrategy() { return implicitNamingStrategy; } @Bean - public PhysicalNamingStrategy physicalNamingStrategy() { + PhysicalNamingStrategy physicalNamingStrategy() { return physicalNamingStrategy; } @@ -152,13 +152,13 @@ class CustomHibernateJpaAutoConfigurationTests { @Bean @Order(2) - public HibernatePropertiesCustomizer sampleCustomizer() { + HibernatePropertiesCustomizer sampleCustomizer() { return ((hibernateProperties) -> hibernateProperties.put("test.counter", 2)); } @Bean @Order(1) - public HibernatePropertiesCustomizer anotherCustomizer() { + HibernatePropertiesCustomizer anotherCustomizer() { return ((hibernateProperties) -> hibernateProperties.put("test.counter", 1)); } 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 cab7ba8f85..ff62b09b27 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 @@ -409,7 +409,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes private boolean called; @Autowired - public void validateDataSourceIsInitialized(EntityManagerFactory entityManagerFactory) { + void validateDataSourceIsInitialized(EntityManagerFactory entityManagerFactory) { // Inject the entity manager to validate it is initialized at the injection // point EntityManager entityManager = entityManagerFactory.createEntityManager(); @@ -425,7 +425,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes static class TestImplicitNamingStrategyConfiguration { @Bean - public ImplicitNamingStrategy testImplicitNamingStrategy() { + ImplicitNamingStrategy testImplicitNamingStrategy() { return new SpringImplicitNamingStrategy(); } @@ -435,7 +435,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes static class TestPhysicalNamingStrategyConfiguration { @Bean - public PhysicalNamingStrategy testPhysicalNamingStrategy() { + PhysicalNamingStrategy testPhysicalNamingStrategy() { return new SpringPhysicalNamingStrategy(); } @@ -449,7 +449,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes private final ImplicitNamingStrategy implicitNamingStrategy = new SpringImplicitNamingStrategy(); @Bean - public HibernatePropertiesCustomizer testHibernatePropertiesCustomizer() { + HibernatePropertiesCustomizer testHibernatePropertiesCustomizer() { return (hibernateProperties) -> { hibernateProperties.put("hibernate.physical_naming_strategy", this.physicalNamingStrategy); hibernateProperties.put("hibernate.implicit_naming_strategy", this.implicitNamingStrategy); @@ -462,7 +462,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes static class DisableBeanContainerConfiguration { @Bean - public HibernatePropertiesCustomizer disableBeanContainerHibernatePropertiesCustomizer() { + HibernatePropertiesCustomizer disableBeanContainerHibernatePropertiesCustomizer() { return (hibernateProperties) -> hibernateProperties.remove(AvailableSettings.BEAN_CONTAINER); } @@ -502,7 +502,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes } - private static class HideDataScriptClassLoader extends URLClassLoader { + static class HideDataScriptClassLoader extends URLClassLoader { private static final List HIDDEN_RESOURCES = Arrays.asList("schema-all.sql", "schema.sql"); @@ -524,7 +524,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes static class JpaUsingApplicationListenerConfiguration { @Bean - public EventCapturingApplicationListener jpaUsingApplicationListener(EntityManagerFactory emf) { + EventCapturingApplicationListener jpaUsingApplicationListener(EntityManagerFactory emf) { return new EventCapturingApplicationListener(); } @@ -545,12 +545,12 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes static class AsyncBootstrappingConfiguration { @Bean - public ThreadPoolTaskExecutor ThreadPoolTaskExecutor() { + ThreadPoolTaskExecutor ThreadPoolTaskExecutor() { return new ThreadPoolTaskExecutor(); } @Bean - public EntityManagerFactoryBuilderCustomizer asyncBootstrappingCustomizer(ThreadPoolTaskExecutor executor) { + EntityManagerFactoryBuilderCustomizer asyncBootstrappingCustomizer(ThreadPoolTaskExecutor executor) { return (builder) -> builder.setBootstrapExecutor(executor); } 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 e66ebcfe16..3292ce7071 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 @@ -263,36 +263,36 @@ class QuartzAutoConfigurationTests { @Import(ComponentThatUsesScheduler.class) @Configuration(proxyBeanMethods = false) - protected static class BaseQuartzConfiguration { + static class BaseQuartzConfiguration { } @Configuration(proxyBeanMethods = false) - protected static class QuartzJobsConfiguration extends BaseQuartzConfiguration { + static class QuartzJobsConfiguration extends BaseQuartzConfiguration { @Bean - public JobDetail fooJob() { + JobDetail fooJob() { return JobBuilder.newJob().ofType(FooJob.class).withIdentity("fooJob").storeDurably().build(); } @Bean - public JobDetail barJob() { + JobDetail barJob() { return JobBuilder.newJob().ofType(FooJob.class).withIdentity("barJob").storeDurably().build(); } } @Configuration(proxyBeanMethods = false) - protected static class QuartzFullConfiguration extends BaseQuartzConfiguration { + static class QuartzFullConfiguration extends BaseQuartzConfiguration { @Bean - public JobDetail fooJob() { + JobDetail fooJob() { return JobBuilder.newJob().ofType(FooJob.class).withIdentity("fooJob") .usingJobData("jobDataKey", "jobDataValue").storeDurably().build(); } @Bean - public Trigger fooTrigger(JobDetail jobDetail) { + Trigger fooTrigger(JobDetail jobDetail) { SimpleScheduleBuilder scheduleBuilder = SimpleScheduleBuilder.simpleSchedule().withIntervalInSeconds(10) .repeatForever(); @@ -304,10 +304,10 @@ class QuartzAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @Import(QuartzFullConfiguration.class) - protected static class OverwriteTriggerConfiguration extends BaseQuartzConfiguration { + static class OverwriteTriggerConfiguration extends BaseQuartzConfiguration { @Bean - public Trigger anotherFooTrigger(JobDetail fooJob) { + Trigger anotherFooTrigger(JobDetail fooJob) { SimpleScheduleBuilder scheduleBuilder = SimpleScheduleBuilder.simpleSchedule().withIntervalInSeconds(30) .repeatForever(); @@ -318,62 +318,62 @@ class QuartzAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class QuartzCalendarsConfiguration extends BaseQuartzConfiguration { + static class QuartzCalendarsConfiguration extends BaseQuartzConfiguration { @Bean - public Calendar weekly() { + Calendar weekly() { return new WeeklyCalendar(); } @Bean - public Calendar monthly() { + Calendar monthly() { return new MonthlyCalendar(); } } @Configuration(proxyBeanMethods = false) - protected static class MockExecutorConfiguration extends BaseQuartzConfiguration { + static class MockExecutorConfiguration extends BaseQuartzConfiguration { @Bean - public Executor executor() { + Executor executor() { return mock(Executor.class); } } @Configuration(proxyBeanMethods = false) - protected static class QuartzCustomConfiguration extends BaseQuartzConfiguration { + static class QuartzCustomConfiguration extends BaseQuartzConfiguration { @Bean - public SchedulerFactoryBeanCustomizer customizer() { + SchedulerFactoryBeanCustomizer customizer() { return (schedulerFactoryBean) -> schedulerFactoryBean.setSchedulerName("fooScheduler"); } } @Configuration(proxyBeanMethods = false) - protected static class ManualSchedulerConfiguration { + static class ManualSchedulerConfiguration { @Bean - public SchedulerFactoryBean quartzScheduler() { + SchedulerFactoryBean quartzScheduler() { return new SchedulerFactoryBean(); } } @Configuration(proxyBeanMethods = false) - protected static class MultipleDataSourceConfiguration extends BaseQuartzConfiguration { + static class MultipleDataSourceConfiguration extends BaseQuartzConfiguration { @Bean @Primary - public DataSource applicationDataSource() throws Exception { + DataSource applicationDataSource() throws Exception { return createTestDataSource(); } @QuartzDataSource @Bean - public DataSource quartzDataSource() throws Exception { + DataSource quartzDataSource() throws Exception { return createTestDataSource(); } @@ -386,7 +386,7 @@ class QuartzAutoConfigurationTests { } - public static class ComponentThatUsesScheduler { + static class ComponentThatUsesScheduler { 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/quartz/QuartzDataSourceInitializerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializerTests.java index df1b07dd23..ca1e237ea9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializerTests.java @@ -64,7 +64,7 @@ class QuartzDataSourceInitializerTests { static class TestConfiguration { @Bean - public QuartzDataSourceInitializer initializer(DataSource dataSource, ResourceLoader resourceLoader, + QuartzDataSourceInitializer initializer(DataSource dataSource, ResourceLoader resourceLoader, QuartzProperties properties) { return new QuartzDataSourceInitializer(dataSource, resourceLoader, properties); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfigurationTests.java index 195550cd54..71d5ddab92 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfigurationTests.java @@ -70,7 +70,7 @@ class RSocketMessagingAutoConfigurationTests { static class BaseConfiguration { @Bean - public RSocketStrategies rSocketStrategies() { + RSocketStrategies rSocketStrategies() { return RSocketStrategies.builder().encoder(CharSequenceEncoder.textPlainOnly()) .decoder(StringDecoder.allMimeTypes()).build(); } @@ -81,7 +81,7 @@ class RSocketMessagingAutoConfigurationTests { static class CustomMessageHandler { @Bean - public RSocketMessageHandler customMessageHandler() { + RSocketMessageHandler customMessageHandler() { RSocketMessageHandler messageHandler = new RSocketMessageHandler(); RSocketStrategies strategies = RSocketStrategies.builder().encoder(CharSequenceEncoder.textPlainOnly()) .decoder(StringDecoder.allMimeTypes()).build(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketRequesterAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketRequesterAutoConfigurationTests.java index f6c420295a..edebbc3c00 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketRequesterAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketRequesterAutoConfigurationTests.java @@ -63,7 +63,7 @@ class RSocketRequesterAutoConfigurationTests { static class CustomRSocketRequesterBuilder { @Bean - public MyRSocketRequesterBuilder myRSocketRequesterBuilder() { + MyRSocketRequesterBuilder myRSocketRequesterBuilder() { return mock(MyRSocketRequesterBuilder.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java index 38f756ac56..5b1a9f30b1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java @@ -98,7 +98,7 @@ class RSocketServerAutoConfigurationTests { static class BaseConfiguration { @Bean - public RSocketMessageHandler messageHandler() { + RSocketMessageHandler messageHandler() { RSocketMessageHandler messageHandler = new RSocketMessageHandler(); messageHandler.setRSocketStrategies(RSocketStrategies.builder().encoder(CharSequenceEncoder.textPlainOnly()) .decoder(StringDecoder.allMimeTypes()).build()); @@ -111,7 +111,7 @@ class RSocketServerAutoConfigurationTests { static class CustomServerBootstrapConfig { @Bean - public RSocketServerBootstrap customServerBootstrap() { + RSocketServerBootstrap customServerBootstrap() { return mock(RSocketServerBootstrap.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfigurationTests.java index 2fee51a4a3..650459a81a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfigurationTests.java @@ -84,7 +84,7 @@ class RSocketStrategiesAutoConfigurationTests { static class UserStrategies { @Bean - public RSocketStrategies customRSocketStrategies() { + RSocketStrategies customRSocketStrategies() { return RSocketStrategies.builder().encoder(CharSequenceEncoder.textPlainOnly()) .decoder(StringDecoder.textPlainOnly()).build(); } @@ -95,7 +95,7 @@ class RSocketStrategiesAutoConfigurationTests { static class StrategiesCustomizer { @Bean - public RSocketStrategiesCustomizer myCustomizer() { + RSocketStrategiesCustomizer myCustomizer() { return (strategies) -> strategies.encoder(new ByteArrayEncoder()).decoder(new ByteArrayDecoder()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketWebSocketNettyRouteProviderTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketWebSocketNettyRouteProviderTests.java index 116416d460..c4c125be16 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketWebSocketNettyRouteProviderTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketWebSocketNettyRouteProviderTests.java @@ -93,12 +93,12 @@ class RSocketWebSocketNettyRouteProviderTests { static class WebConfiguration { @Bean - public WebController webController() { + WebController webController() { return new WebController(); } @Bean - public NettyReactiveWebServerFactory customServerFactory(RSocketWebSocketNettyRouteProvider routeProvider) { + NettyReactiveWebServerFactory customServerFactory(RSocketWebSocketNettyRouteProvider routeProvider) { NettyReactiveWebServerFactory serverFactory = new NettyReactiveWebServerFactory(0); serverFactory.addRouteProviders(routeProvider); return serverFactory; @@ -111,18 +111,18 @@ class RSocketWebSocketNettyRouteProviderTests { @GetMapping(path = "/protocol", produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody - public TestProtocol testWebEndpoint() { + TestProtocol testWebEndpoint() { return new TestProtocol("http"); } @MessageMapping("websocket") - public TestProtocol testRSocketEndpoint() { + TestProtocol testRSocketEndpoint() { return new TestProtocol("rsocket"); } } - static class TestProtocol { + public static class TestProtocol { private String name; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java index f38ad6c829..005ad1420d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java @@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.security.jpa; import org.junit.jupiter.api.Test; -import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; @@ -45,14 +44,10 @@ class JpaUserDetailsTests { void contextLoads() { } - public static void main(String[] args) { - SpringApplication.run(Main.class, args); - } - @Import({ EmbeddedDataSourceConfiguration.class, DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, SecurityAutoConfiguration.class }) - public static class Main { + static class Main { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java index ed7426bded..222a521d26 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java @@ -151,7 +151,7 @@ class ReactiveOAuth2ClientAutoConfigurationTests { static class ReactiveClientRepositoryConfiguration { @Bean - public ReactiveClientRegistrationRepository clientRegistrationRepository() { + ReactiveClientRegistrationRepository clientRegistrationRepository() { List registrations = new ArrayList<>(); registrations.add(getClientRegistration("first", "https://user-info-uri.com")); registrations.add(getClientRegistration("second", "https://other-user-info")); @@ -177,7 +177,7 @@ class ReactiveOAuth2ClientAutoConfigurationTests { static class ReactiveOAuth2AuthorizedClientServiceConfiguration { @Bean - public ReactiveOAuth2AuthorizedClientService testAuthorizedClientService( + ReactiveOAuth2AuthorizedClientService testAuthorizedClientService( ReactiveClientRegistrationRepository clientRegistrationRepository) { return new InMemoryReactiveOAuth2AuthorizedClientService(clientRegistrationRepository); } @@ -189,7 +189,7 @@ class ReactiveOAuth2ClientAutoConfigurationTests { static class ReactiveOAuth2AuthorizedClientRepositoryConfiguration { @Bean - public ServerOAuth2AuthorizedClientRepository testAuthorizedClientRepository( + ServerOAuth2AuthorizedClientRepository testAuthorizedClientRepository( ReactiveOAuth2AuthorizedClientService authorizedClientService) { return new AuthenticatedPrincipalServerOAuth2AuthorizedClientRepository(authorizedClientService); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java index 650b2a2fd1..3ebb0ebc94 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java @@ -170,10 +170,10 @@ class OAuth2WebSecurityConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableWebSecurity - protected static class TestConfig { + static class TestConfig { @Bean - public TomcatServletWebServerFactory tomcat() { + TomcatServletWebServerFactory tomcat() { return new TomcatServletWebServerFactory(0); } @@ -184,7 +184,7 @@ class OAuth2WebSecurityConfigurationTests { static class ClientRegistrationRepositoryConfiguration { @Bean - public ClientRegistrationRepository clientRegistrationRepository() { + ClientRegistrationRepository clientRegistrationRepository() { List registrations = new ArrayList<>(); registrations.add(getClientRegistration("first", "https://user-info-uri.com")); registrations.add(getClientRegistration("second", "https://other-user-info")); @@ -216,7 +216,7 @@ class OAuth2WebSecurityConfigurationTests { static class OAuth2AuthorizedClientServiceConfiguration { @Bean - public OAuth2AuthorizedClientService testAuthorizedClientService( + OAuth2AuthorizedClientService testAuthorizedClientService( ClientRegistrationRepository clientRegistrationRepository) { return new InMemoryOAuth2AuthorizedClientService(clientRegistrationRepository); } @@ -228,7 +228,7 @@ class OAuth2WebSecurityConfigurationTests { static class OAuth2AuthorizedClientRepositoryConfiguration { @Bean - public OAuth2AuthorizedClientRepository testAuthorizedClientRepository( + OAuth2AuthorizedClientRepository testAuthorizedClientRepository( OAuth2AuthorizedClientService authorizedClientService) { return new AuthenticatedPrincipalOAuth2AuthorizedClientRepository(authorizedClientService); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java index 250af5a4bc..c32f757da4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java @@ -345,7 +345,7 @@ class ReactiveOAuth2ResourceServerAutoConfigurationTests { static class TestConfig { @Bean - public MapReactiveUserDetailsService userDetailsService() { + MapReactiveUserDetailsService userDetailsService() { return mock(MapReactiveUserDetailsService.class); } @@ -355,7 +355,7 @@ class ReactiveOAuth2ResourceServerAutoConfigurationTests { static class JwtDecoderConfig { @Bean - public ReactiveJwtDecoder decoder() { + ReactiveJwtDecoder decoder() { return mock(ReactiveJwtDecoder.class); } @@ -365,7 +365,7 @@ class ReactiveOAuth2ResourceServerAutoConfigurationTests { static class OAuth2TokenIntrospectionClientConfig { @Bean - public ReactiveOAuth2TokenIntrospectionClient decoder() { + ReactiveOAuth2TokenIntrospectionClient decoder() { return mock(ReactiveOAuth2TokenIntrospectionClient.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java index 7f8a9c8cb9..aabbfb591d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java @@ -336,7 +336,7 @@ class OAuth2ResourceServerAutoConfigurationTests { static class JwtDecoderConfig { @Bean - public JwtDecoder decoder() { + JwtDecoder decoder() { return mock(JwtDecoder.class); } @@ -347,7 +347,7 @@ class OAuth2ResourceServerAutoConfigurationTests { static class OAuth2TokenIntrospectionClientConfig { @Bean - public OAuth2TokenIntrospectionClient decoder() { + OAuth2TokenIntrospectionClient decoder() { return mock(OAuth2TokenIntrospectionClient.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java index a3c002917c..61e1afef1d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java @@ -55,7 +55,7 @@ class ReactiveSecurityAutoConfigurationTests { static class WebFilterChainProxyConfiguration { @Bean - public WebFilterChainProxy webFilterChainProxy() { + WebFilterChainProxy webFilterChainProxy() { return mock(WebFilterChainProxy.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java index def96c3b16..3974462c32 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java @@ -112,7 +112,7 @@ class ReactiveUserDetailsServiceAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableWebFluxSecurity @EnableConfigurationProperties(SecurityProperties.class) - protected static class TestSecurityConfiguration { + static class TestSecurityConfiguration { } @@ -120,7 +120,7 @@ class ReactiveUserDetailsServiceAutoConfigurationTests { static class UserConfig { @Bean - public MapReactiveUserDetailsService userDetailsService() { + MapReactiveUserDetailsService userDetailsService() { UserDetails foo = User.withUsername("foo").password("foo").roles("USER").build(); UserDetails admin = User.withUsername("admin").password("admin").roles("USER", "ADMIN").build(); return new MapReactiveUserDetailsService(foo, admin); @@ -132,7 +132,7 @@ class ReactiveUserDetailsServiceAutoConfigurationTests { static class AuthenticationManagerConfig { @Bean - public ReactiveAuthenticationManager reactiveAuthenticationManager() { + ReactiveAuthenticationManager reactiveAuthenticationManager() { return (authentication) -> null; } @@ -140,10 +140,10 @@ class ReactiveUserDetailsServiceAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @Import(TestSecurityConfiguration.class) - protected static class TestConfigWithPasswordEncoder { + static class TestConfigWithPasswordEncoder { @Bean - public PasswordEncoder passwordEncoder() { + PasswordEncoder passwordEncoder() { return mock(PasswordEncoder.class); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/StaticResourceRequestTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/StaticResourceRequestTests.java index 6f6b954d86..7df939f947 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/StaticResourceRequestTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/StaticResourceRequestTests.java @@ -91,7 +91,7 @@ class StaticResourceRequestTests { return assertThat(new RequestMatcherAssert(context, matcher)); } - private static class RequestMatcherAssert implements AssertDelegateTarget { + static class RequestMatcherAssert implements AssertDelegateTarget { private final StaticApplicationContext context; @@ -136,7 +136,7 @@ class StaticResourceRequestTests { } - private static class TestHttpWebHandlerAdapter extends HttpWebHandlerAdapter { + static class TestHttpWebHandlerAdapter extends HttpWebHandlerAdapter { TestHttpWebHandlerAdapter(WebHandler delegate) { super(delegate); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/PathRequestTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/PathRequestTests.java index b4fd17b09f..65c7bd8288 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/PathRequestTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/PathRequestTests.java @@ -58,7 +58,7 @@ class PathRequestTests { return assertThat(new RequestMatcherAssert(context, matcher)); } - private static class RequestMatcherAssert implements AssertDelegateTarget { + static class RequestMatcherAssert implements AssertDelegateTarget { private final WebApplicationContext context; @@ -69,7 +69,7 @@ class PathRequestTests { this.matcher = matcher; } - public void matches(String path) { + void matches(String path) { matches(mockRequest(path)); } @@ -77,7 +77,7 @@ class PathRequestTests { assertThat(this.matcher.matches(request)).as("Matches " + getRequestPath(request)).isTrue(); } - public void doesNotMatch(String path) { + void doesNotMatch(String path) { doesNotMatch(mockRequest(path)); } 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 29d090a291..cb8510a526 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 @@ -166,7 +166,7 @@ class SecurityAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) - protected static class EntityConfiguration { + static class EntityConfiguration { } @@ -174,7 +174,7 @@ class SecurityAutoConfigurationTests { static class AuthenticationEventPublisherConfiguration { @Bean - public AuthenticationEventPublisher authenticationEventPublisher() { + AuthenticationEventPublisher authenticationEventPublisher() { return new TestAuthenticationEventPublisher(); } 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 42d2737f26..5618914b97 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 @@ -78,7 +78,7 @@ class SecurityFilterAutoConfigurationEarlyInitializationTests { static class Config { @Bean - public TomcatServletWebServerFactory webServerFactory() { + TomcatServletWebServerFactory webServerFactory() { TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(); factory.setPort(0); return factory; @@ -86,20 +86,20 @@ class SecurityFilterAutoConfigurationEarlyInitializationTests { } - public static class SourceType { + static class SourceType { public String foo; } - public static class DestinationType { + static class DestinationType { public String bar; } @Component - public static class JacksonModuleBean extends SimpleModule { + static class JacksonModuleBean extends SimpleModule { private static final long serialVersionUID = 1L; @@ -110,7 +110,7 @@ class SecurityFilterAutoConfigurationEarlyInitializationTests { } @Component - public static class DeserializerBean extends StdDeserializer { + static class DeserializerBean extends StdDeserializer { @Autowired ConversionService conversionService; @@ -127,20 +127,20 @@ class SecurityFilterAutoConfigurationEarlyInitializationTests { } @RestController - public static class ExampleController { + static class ExampleController { @Autowired private ConversionService conversionService; @RequestMapping("/") - public void convert() { + void convert() { this.conversionService.convert(new SourceType(), DestinationType.class); } } @Component - public static class ConverterBean implements Converter { + static class ConverterBean implements Converter { @Override public DestinationType convert(SourceType source) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java index 7d303d911b..de85df5f8f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java @@ -98,7 +98,7 @@ class SecurityRequestMatcherProviderAutoConfigurationTests { static class TestMvcConfiguration { @Bean - public HandlerMappingIntrospector introspector() { + HandlerMappingIntrospector introspector() { return new HandlerMappingIntrospector(); } @@ -108,7 +108,7 @@ class SecurityRequestMatcherProviderAutoConfigurationTests { static class TestJerseyConfiguration { @Bean - public JerseyApplicationPath jerseyApplicationPath() { + JerseyApplicationPath jerseyApplicationPath() { return () -> "/admin"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/StaticResourceRequestTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/StaticResourceRequestTests.java index f4f424528d..64c259e921 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/StaticResourceRequestTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/StaticResourceRequestTests.java @@ -100,7 +100,7 @@ class StaticResourceRequestTests { return assertThat(new RequestMatcherAssert(context, matcher)); } - private static class RequestMatcherAssert implements AssertDelegateTarget { + static class RequestMatcherAssert implements AssertDelegateTarget { private final WebApplicationContext context; @@ -111,11 +111,11 @@ class StaticResourceRequestTests { this.matcher = matcher; } - public void matches(String path) { + void matches(String path) { matches(mockRequest(path)); } - public void matches(String servletPath, String path) { + void matches(String servletPath, String path) { matches(mockRequest(servletPath, path)); } @@ -123,11 +123,11 @@ class StaticResourceRequestTests { assertThat(this.matcher.matches(request)).as("Matches " + getRequestPath(request)).isTrue(); } - public void doesNotMatch(String path) { + void doesNotMatch(String path) { doesNotMatch(mockRequest(path)); } - public void doesNotMatch(String servletPath, String path) { + void doesNotMatch(String servletPath, String path) { doesNotMatch(mockRequest(servletPath, path)); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java index cbc3fbe52c..b8883c0c36 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java @@ -147,12 +147,12 @@ class UserDetailsServiceAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestAuthenticationManagerConfiguration { + static class TestAuthenticationManagerConfiguration { private AuthenticationManager authenticationManager; @Bean - public AuthenticationManager myAuthenticationManager() { + AuthenticationManager myAuthenticationManager() { AuthenticationProvider authenticationProvider = new TestingAuthenticationProvider(); this.authenticationManager = new ProviderManager(Collections.singletonList(authenticationProvider)); return this.authenticationManager; @@ -161,20 +161,20 @@ class UserDetailsServiceAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class TestUserDetailsServiceConfiguration { + static class TestUserDetailsServiceConfiguration { @Bean - public InMemoryUserDetailsManager myUserDetailsManager() { + InMemoryUserDetailsManager myUserDetailsManager() { return new InMemoryUserDetailsManager(User.withUsername("foo").password("bar").roles("USER").build()); } } @Configuration(proxyBeanMethods = false) - protected static class TestAuthenticationProviderConfiguration { + static class TestAuthenticationProviderConfiguration { @Bean - public AuthenticationProvider myAuthenticationProvider() { + AuthenticationProvider myAuthenticationProvider() { return new TestingAuthenticationProvider(); } @@ -183,16 +183,16 @@ class UserDetailsServiceAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @EnableWebSecurity @EnableConfigurationProperties(SecurityProperties.class) - protected static class TestSecurityConfiguration { + static class TestSecurityConfiguration { } @Configuration(proxyBeanMethods = false) @Import(TestSecurityConfiguration.class) - protected static class TestConfigWithPasswordEncoder { + static class TestConfigWithPasswordEncoder { @Bean - public PasswordEncoder passwordEncoder() { + PasswordEncoder passwordEncoder() { return mock(PasswordEncoder.class); } @@ -200,10 +200,10 @@ class UserDetailsServiceAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @Import(TestSecurityConfiguration.class) - protected static class TestConfigWithClientRegistrationRepository { + static class TestConfigWithClientRegistrationRepository { @Bean - public ClientRegistrationRepository clientRegistrationRepository() { + ClientRegistrationRepository clientRegistrationRepository() { return mock(ClientRegistrationRepository.class); } @@ -211,10 +211,10 @@ class UserDetailsServiceAutoConfigurationTests { @Configuration(proxyBeanMethods = false) @Import(TestSecurityConfiguration.class) - protected static class TestConfigWithAuthenticationManagerBuilder { + static class TestConfigWithAuthenticationManagerBuilder { @Bean - public WebSecurityConfigurerAdapter webSecurityConfigurerAdapter() { + WebSecurityConfigurerAdapter webSecurityConfigurerAdapter() { return new WebSecurityConfigurerAdapter() { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/user/UserRepository.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/user/UserRepository.java index a6bbeea6ff..cae2d408eb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/user/UserRepository.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/user/UserRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ package org.springframework.boot.autoconfigure.security.user; import org.springframework.data.jpa.repository.JpaRepository; -public interface UserRepository extends JpaRepository { +interface UserRepository extends JpaRepository { User findByEmail(String email); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java index 47fceaf1a6..510beb70c1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java @@ -61,7 +61,7 @@ public abstract class AbstractSessionAutoConfigurationTests { static class SessionRepositoryConfiguration { @Bean - public MapSessionRepository mySessionRepository() { + MapSessionRepository mySessionRepository() { return new MapSessionRepository(Collections.emptyMap()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java index ad2b091322..edad126edc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java @@ -93,7 +93,7 @@ class SessionAutoConfigurationHazelcastTests extends AbstractSessionAutoConfigur @Bean @SuppressWarnings("unchecked") - public HazelcastInstance hazelcastInstance() { + HazelcastInstance hazelcastInstance() { IMap map = mock(IMap.class); HazelcastInstance mock = mock(HazelcastInstance.class); given(mock.getMap("spring:session:sessions")).willReturn(map); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java index 58cbe08006..ef0c30f2e9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java @@ -80,7 +80,7 @@ class SessionAutoConfigurationIntegrationTests extends AbstractSessionAutoConfig @Bean @SuppressWarnings("unchecked") - public HazelcastInstance hazelcastInstance() { + HazelcastInstance hazelcastInstance() { IMap map = mock(IMap.class); HazelcastInstance mock = mock(HazelcastInstance.class); given(mock.getMap("spring:session:sessions")).willReturn(map); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java index ddf54c8c37..10735e3961 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java @@ -213,7 +213,7 @@ class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurationTest static class SessionRepositoryConfiguration { @Bean - public MapSessionRepository mySessionRepository() { + MapSessionRepository mySessionRepository() { return new MapSessionRepository(Collections.emptyMap()); } @@ -229,7 +229,7 @@ class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurationTest static class UserProvidedCookieSerializerConfiguration extends SessionRepositoryConfiguration { @Bean - public DefaultCookieSerializer myCookieSerializer() { + DefaultCookieSerializer myCookieSerializer() { return new DefaultCookieSerializer(); } @@ -240,7 +240,7 @@ class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurationTest static class UserProvidedCookieHttpSessionStrategyConfiguration extends SessionRepositoryConfiguration { @Bean - public CookieHttpSessionIdResolver httpSessionStrategy() { + CookieHttpSessionIdResolver httpSessionStrategy() { return new CookieHttpSessionIdResolver(); } @@ -251,7 +251,7 @@ class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurationTest static class UserProvidedHeaderHttpSessionStrategyConfiguration extends SessionRepositoryConfiguration { @Bean - public HeaderHttpSessionIdResolver httpSessionStrategy() { + HeaderHttpSessionIdResolver httpSessionStrategy() { return HeaderHttpSessionIdResolver.xAuthToken(); } @@ -262,7 +262,7 @@ class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurationTest static class UserProvidedCustomHttpSessionStrategyConfiguration extends SessionRepositoryConfiguration { @Bean - public HttpSessionIdResolver httpSessionStrategy() { + HttpSessionIdResolver httpSessionStrategy() { return mock(HttpSessionIdResolver.class); } @@ -273,7 +273,7 @@ class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurationTest static class SpringSessionRememberMeServicesConfiguration extends SessionRepositoryConfiguration { @Bean - public SpringSessionRememberMeServices rememberMeServices() { + SpringSessionRememberMeServices rememberMeServices() { return new SpringSessionRememberMeServices(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java index ef25b48f8f..d861858186 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java @@ -163,7 +163,7 @@ class TaskExecutionAutoConfigurationTests { private final TaskExecutorBuilder taskExecutorBuilder = new TaskExecutorBuilder(); @Bean - public TaskExecutorBuilder customTaskExecutorBuilder() { + TaskExecutorBuilder customTaskExecutorBuilder() { return this.taskExecutorBuilder; } @@ -173,7 +173,7 @@ class TaskExecutionAutoConfigurationTests { static class TaskExecutorCustomizerConfig { @Bean - public TaskExecutorCustomizer mockTaskExecutorCustomizer() { + TaskExecutorCustomizer mockTaskExecutorCustomizer() { return mock(TaskExecutorCustomizer.class); } @@ -183,7 +183,7 @@ class TaskExecutionAutoConfigurationTests { static class TaskDecoratorConfig { @Bean - public TaskDecorator mockTaskDecorator() { + TaskDecorator mockTaskDecorator() { return mock(TaskDecorator.class); } @@ -193,7 +193,7 @@ class TaskExecutionAutoConfigurationTests { static class CustomTaskExecutorConfig { @Bean - public Executor customTaskExecutor() { + Executor customTaskExecutor() { return new SyncTaskExecutor(); } @@ -214,7 +214,7 @@ class TaskExecutionAutoConfigurationTests { static class TestBean { @Async - public Future echo(String text) { + Future echo(String text) { return new AsyncResult<>(Thread.currentThread().getName() + " " + text); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java index ccb8994d3a..3dd530e16c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java @@ -131,7 +131,7 @@ class TaskSchedulingAutoConfigurationTests { static class TaskSchedulerConfiguration { @Bean - public TaskScheduler customTaskScheduler() { + TaskScheduler customTaskScheduler() { return new TestTaskScheduler(); } @@ -141,7 +141,7 @@ class TaskSchedulingAutoConfigurationTests { static class ScheduledExecutorServiceConfiguration { @Bean - public ScheduledExecutorService customScheduledExecutorService() { + ScheduledExecutorService customScheduledExecutorService() { return Executors.newScheduledThreadPool(2); } @@ -151,7 +151,7 @@ class TaskSchedulingAutoConfigurationTests { static class TaskSchedulerCustomizerConfiguration { @Bean - public TaskSchedulerCustomizer testTaskSchedulerCustomizer() { + TaskSchedulerCustomizer testTaskSchedulerCustomizer() { return ((taskScheduler) -> taskScheduler.setThreadNamePrefix("customized-scheduler-")); } @@ -173,7 +173,7 @@ class TaskSchedulingAutoConfigurationTests { static class TestConfiguration { @Bean - public TestBean testBean() { + TestBean testBean() { return new TestBean(); } @@ -186,7 +186,7 @@ class TaskSchedulingAutoConfigurationTests { private final CountDownLatch latch = new CountDownLatch(1); @Scheduled(fixedRate = 60000) - public void accumulate() { + void accumulate() { this.threadNames.add(Thread.currentThread().getName()); this.latch.countDown(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/template/ViewResolverPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/template/ViewResolverPropertiesTests.java index 41f9b66ef6..8e800ad1ff 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/template/ViewResolverPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/template/ViewResolverPropertiesTests.java @@ -66,7 +66,7 @@ class ViewResolverPropertiesTests { assertThat(properties.getContentType()).hasToString("text/plain;charset=UTF-16;foo=bar"); } - private static class ViewResolverProperties extends AbstractViewResolverProperties { + static class ViewResolverProperties extends AbstractViewResolverProperties { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java index 7f656a5f67..866b1894fe 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java @@ -226,7 +226,7 @@ class ThymeleafReactiveAutoConfigurationTests { static class LayoutDialectConfiguration { @Bean - public LayoutDialect layoutDialect() { + LayoutDialect layoutDialect() { return new LayoutDialect(new GroupingRespectLayoutTitleStrategy()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java index ed9445860a..8a05d0ad3a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java @@ -319,7 +319,7 @@ class ThymeleafServletAutoConfigurationTests { static class LayoutDialectConfiguration { @Bean - public LayoutDialect layoutDialect() { + LayoutDialect layoutDialect() { return new LayoutDialect(new GroupingRespectLayoutTitleStrategy()); } @@ -329,7 +329,7 @@ class ThymeleafServletAutoConfigurationTests { static class FilterRegistrationResourceConfiguration { @Bean - public FilterRegistrationBean filterRegistration() { + FilterRegistrationBean filterRegistration() { FilterRegistrationBean bean = new FilterRegistrationBean<>( new ResourceUrlEncodingFilter()); bean.setDispatcherTypes(EnumSet.of(DispatcherType.INCLUDE)); @@ -342,7 +342,7 @@ class ThymeleafServletAutoConfigurationTests { static class FilterRegistrationOtherConfiguration { @Bean - public FilterRegistrationBean filterRegistration() { + FilterRegistrationBean filterRegistration() { return new FilterRegistrationBean<>(new OrderedCharacterEncodingFilter()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java index c1e4443ace..ebec8d7b52 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java @@ -149,12 +149,12 @@ class TransactionAutoConfigurationTests { static class SeveralTransactionManagersConfiguration { @Bean - public PlatformTransactionManager transactionManagerOne() { + PlatformTransactionManager transactionManagerOne() { return mock(PlatformTransactionManager.class); } @Bean - public PlatformTransactionManager transactionManagerTwo() { + PlatformTransactionManager transactionManagerTwo() { return mock(PlatformTransactionManager.class); } @@ -164,12 +164,12 @@ class TransactionAutoConfigurationTests { static class CustomTransactionManagerConfiguration { @Bean - public TransactionTemplate transactionTemplateFoo(PlatformTransactionManager transactionManager) { + TransactionTemplate transactionTemplateFoo(PlatformTransactionManager transactionManager) { return new TransactionTemplate(transactionManager); } @Bean - public PlatformTransactionManager transactionManagerFoo() { + PlatformTransactionManager transactionManagerFoo() { return mock(PlatformTransactionManager.class); } @@ -179,12 +179,12 @@ class TransactionAutoConfigurationTests { static class BaseConfiguration { @Bean - public TransactionalService transactionalService() { + TransactionalService transactionalService() { return new TransactionalServiceImpl(); } @Bean - public AnotherServiceImpl anotherService() { + AnotherServiceImpl anotherService() { return new AnotherServiceImpl(); } @@ -195,12 +195,12 @@ class TransactionAutoConfigurationTests { static class TransactionManagersConfiguration { @Bean - public DataSourceTransactionManager transactionManager(DataSource dataSource) { + DataSourceTransactionManager transactionManager(DataSource dataSource) { return new DataSourceTransactionManager(dataSource); } @Bean - public DataSource dataSource() { + DataSource dataSource() { return DataSourceBuilder.create().driverClassName("org.hsqldb.jdbc.JDBCDriver").url("jdbc:hsqldb:mem:tx") .username("sa").build(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizersTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizersTests.java index 32f9c7fac0..97cefc6796 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizersTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizersTests.java @@ -51,7 +51,7 @@ class TransactionManagerCustomizersTests { assertThat(list.get(1).getCount()).isEqualTo(1); } - private static class TestCustomizer + static class TestCustomizer implements PlatformTransactionManagerCustomizer { private int count; @@ -61,13 +61,13 @@ class TransactionManagerCustomizersTests { this.count++; } - public int getCount() { + int getCount() { return this.count; } } - private static class TestJtaCustomizer extends TestCustomizer { + static class TestJtaCustomizer extends TestCustomizer { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java index fb14907c57..06573d1407 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java @@ -231,20 +231,20 @@ class JtaAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - public static class CustomTransactionManagerConfig { + static class CustomTransactionManagerConfig { @Bean - public PlatformTransactionManager transactionManager() { + PlatformTransactionManager transactionManager() { return mock(PlatformTransactionManager.class); } } @Configuration(proxyBeanMethods = false) - public static class PoolConfiguration { + static class PoolConfiguration { @Bean - public ConnectionFactory pooledConnectionFactory(XAConnectionFactoryWrapper wrapper) throws Exception { + ConnectionFactory pooledConnectionFactory(XAConnectionFactoryWrapper wrapper) throws Exception { XAConnectionFactory connectionFactory = mock(XAConnectionFactory.class); XAConnection connection = mock(XAConnection.class); XASession session = mock(XASession.class); @@ -258,7 +258,7 @@ class JtaAutoConfigurationTests { } @Bean - public DataSource pooledDataSource(XADataSourceWrapper wrapper) throws Exception { + DataSource pooledDataSource(XADataSourceWrapper wrapper) throws Exception { XADataSource dataSource = mock(XADataSource.class); return wrapper.wrapDataSource(dataSource); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java index 27d1fbb0f3..fcc05056b4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java @@ -220,7 +220,7 @@ class ValidationAutoConfigurationTests { static class UserDefinedValidatorConfig { @Bean - public OptionalValidatorFactoryBean customValidator() { + OptionalValidatorFactoryBean customValidator() { return new OptionalValidatorFactoryBean(); } @@ -230,7 +230,7 @@ class ValidationAutoConfigurationTests { static class UserDefinedDefaultValidatorConfig { @Bean - public OptionalValidatorFactoryBean defaultValidator() { + OptionalValidatorFactoryBean defaultValidator() { return new OptionalValidatorFactoryBean(); } @@ -240,7 +240,7 @@ class ValidationAutoConfigurationTests { static class UserDefinedJsrValidatorConfig { @Bean - public Validator customValidator() { + Validator customValidator() { return mock(Validator.class); } @@ -250,12 +250,12 @@ class ValidationAutoConfigurationTests { static class UserDefinedSpringValidatorConfig { @Bean - public org.springframework.validation.Validator customValidator() { + org.springframework.validation.Validator customValidator() { return mock(org.springframework.validation.Validator.class); } @Bean - public org.springframework.validation.Validator anotherCustomValidator() { + org.springframework.validation.Validator anotherCustomValidator() { return mock(org.springframework.validation.Validator.class); } @@ -265,13 +265,13 @@ class ValidationAutoConfigurationTests { static class UserDefinedPrimarySpringValidatorConfig { @Bean - public org.springframework.validation.Validator customValidator() { + org.springframework.validation.Validator customValidator() { return mock(org.springframework.validation.Validator.class); } @Bean @Primary - public org.springframework.validation.Validator anotherCustomValidator() { + org.springframework.validation.Validator anotherCustomValidator() { return mock(org.springframework.validation.Validator.class); } @@ -280,8 +280,7 @@ class ValidationAutoConfigurationTests { @Validated static class SampleService { - public void doSomething(@Size(min = 3, max = 10) String name) { - + void doSomething(@Size(min = 3, max = 10) String name) { } } @@ -297,7 +296,6 @@ class ValidationAutoConfigurationTests { @Override public void doSomething(Integer counter) { - } } @@ -306,7 +304,7 @@ class ValidationAutoConfigurationTests { static class AnotherSampleServiceConfiguration { @Bean - public AnotherSampleService anotherSampleService() { + AnotherSampleService anotherSampleService() { return new DefaultAnotherSampleService(); } @@ -316,7 +314,7 @@ class ValidationAutoConfigurationTests { static class SampleConfiguration { @Bean - public MethodValidationPostProcessor testMethodValidationPostProcessor() { + MethodValidationPostProcessor testMethodValidationPostProcessor() { return new MethodValidationPostProcessor(); } @@ -343,7 +341,7 @@ class ValidationAutoConfigurationTests { static class SomeServiceConfiguration { @Bean - public SomeService someService() { + SomeService someService() { return new SomeService(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java index 46df5bd7a8..25db635734 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java @@ -98,12 +98,12 @@ class ValidatorAdapterTests { static class LocalValidatorFactoryBeanConfig { @Bean - public LocalValidatorFactoryBean validator() { + LocalValidatorFactoryBean validator() { return new LocalValidatorFactoryBean(); } @Bean - public ValidatorAdapter wrapper(LocalValidatorFactoryBean validator) { + ValidatorAdapter wrapper(LocalValidatorFactoryBean validator) { return new ValidatorAdapter(validator, true); } @@ -115,7 +115,7 @@ class ValidatorAdapterTests { private final LocalValidatorFactoryBean validator = mock(LocalValidatorFactoryBean.class); @Bean - public ValidatorAdapter wrapper() { + ValidatorAdapter wrapper() { return new ValidatorAdapter(this.validator, false); } @@ -127,7 +127,7 @@ class ValidatorAdapterTests { private final LocalValidatorFactoryBean validator = mock(LocalValidatorFactoryBean.class); @Bean - public ValidatorAdapter wrapper() { + ValidatorAdapter wrapper() { return new ValidatorAdapter(this.validator, true); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChainTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChainTests.java index ef9dc7e859..e056962f8a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChainTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChainTests.java @@ -81,7 +81,7 @@ class ConditionalOnEnabledResourceChainTests { @Bean @ConditionalOnEnabledResourceChain - public String foo() { + String foo() { return "foo"; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java index 2d6420b356..995f39d56c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java @@ -154,7 +154,7 @@ class RestTemplateAutoConfigurationTests { static class RestTemplateConfig { @Bean - public RestTemplate restTemplate(RestTemplateBuilder builder) { + RestTemplate restTemplate(RestTemplateBuilder builder) { return builder.build(); } @@ -164,7 +164,7 @@ class RestTemplateAutoConfigurationTests { static class DirtyRestTemplateConfig { @Bean - public RestTemplate restTemplateOne(RestTemplateBuilder builder) { + RestTemplate restTemplateOne(RestTemplateBuilder builder) { try { return builder.build(); } @@ -174,7 +174,7 @@ class RestTemplateAutoConfigurationTests { } @Bean - public RestTemplate restTemplateTwo(RestTemplateBuilder builder) { + RestTemplate restTemplateTwo(RestTemplateBuilder builder) { try { return builder.build(); } @@ -195,7 +195,7 @@ class RestTemplateAutoConfigurationTests { static class CustomRestTemplateBuilderConfig { @Bean - public RestTemplateBuilder restTemplateBuilder() { + RestTemplateBuilder restTemplateBuilder() { return new RestTemplateBuilder().messageConverters(new CustomHttpMessageConverter()); } @@ -205,7 +205,7 @@ class RestTemplateAutoConfigurationTests { static class RestTemplateCustomizerConfig { @Bean - public RestTemplateCustomizer restTemplateCustomizer() { + RestTemplateCustomizer restTemplateCustomizer() { return mock(RestTemplateCustomizer.class); } @@ -215,7 +215,7 @@ class RestTemplateAutoConfigurationTests { static class RestTemplateRequestCustomizerConfig { @Bean - public RestTemplateRequestCustomizer restTemplateRequestCustomizer() { + RestTemplateRequestCustomizer restTemplateRequestCustomizer() { return (request) -> request.getHeaders().add("spring", "boot"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java index 71b23b7d34..a3f97f777a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java @@ -57,15 +57,15 @@ class HttpHandlerAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class CustomHttpHandler { + static class CustomHttpHandler { @Bean - public HttpHandler customHttpHandler() { + HttpHandler customHttpHandler() { return (serverHttpRequest, serverHttpResponse) -> null; } @Bean - public RouterFunction routerFunction() { + RouterFunction routerFunction() { return route(GET("/test"), (serverRequest) -> null); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/MockReactiveWebServerFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/MockReactiveWebServerFactory.java index 7d3f916d46..027b1f2e71 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/MockReactiveWebServerFactory.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/MockReactiveWebServerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ public class MockReactiveWebServerFactory extends AbstractReactiveWebServerFacto return this.webServer; } - public static class MockReactiveWebServer implements WebServer { + static class MockReactiveWebServer implements WebServer { private final int port; @@ -53,21 +53,21 @@ public class MockReactiveWebServerFactory extends AbstractReactiveWebServerFacto private Map httpHandlerMap; - public MockReactiveWebServer(HttpHandler httpHandler, int port) { + MockReactiveWebServer(HttpHandler httpHandler, int port) { this.httpHandler = httpHandler; this.port = port; } - public MockReactiveWebServer(Map httpHandlerMap, int port) { + MockReactiveWebServer(Map httpHandlerMap, int port) { this.httpHandlerMap = httpHandlerMap; this.port = port; } - public HttpHandler getHttpHandler() { + HttpHandler getHttpHandler() { return this.httpHandler; } - public Map getHttpHandlerMap() { + Map getHttpHandlerMap() { return this.httpHandlerMap; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java index e6624746d7..aa33d05b38 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java @@ -271,40 +271,40 @@ class ReactiveWebServerFactoryAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class HttpHandlerConfiguration { + static class HttpHandlerConfiguration { @Bean - public HttpHandler httpHandler() { + HttpHandler httpHandler() { return Mockito.mock(HttpHandler.class); } } @Configuration(proxyBeanMethods = false) - protected static class TooManyHttpHandlers { + static class TooManyHttpHandlers { @Bean - public HttpHandler additionalHttpHandler() { + HttpHandler additionalHttpHandler() { return Mockito.mock(HttpHandler.class); } } @Configuration(proxyBeanMethods = false) - protected static class ReactiveWebServerCustomization { + static class ReactiveWebServerCustomization { @Bean - public WebServerFactoryCustomizer reactiveWebServerCustomizer() { + WebServerFactoryCustomizer reactiveWebServerCustomizer() { return (factory) -> factory.setPort(9000); } } @Configuration(proxyBeanMethods = false) - public static class MockWebServerConfiguration { + static class MockWebServerConfiguration { @Bean - public MockReactiveWebServerFactory mockReactiveWebServerFactory() { + MockReactiveWebServerFactory mockReactiveWebServerFactory() { return new MockReactiveWebServerFactory(); } @@ -314,7 +314,7 @@ class ReactiveWebServerFactoryAutoConfigurationTests { static class TomcatConnectorCustomizerConfiguration { @Bean - public TomcatConnectorCustomizer connectorCustomizer() { + TomcatConnectorCustomizer connectorCustomizer() { return mock(TomcatConnectorCustomizer.class); } @@ -326,12 +326,12 @@ class ReactiveWebServerFactoryAutoConfigurationTests { private final TomcatConnectorCustomizer customizer = mock(TomcatConnectorCustomizer.class); @Bean - public TomcatConnectorCustomizer connectorCustomizer() { + TomcatConnectorCustomizer connectorCustomizer() { return this.customizer; } @Bean - public WebServerFactoryCustomizer tomcatCustomizer() { + WebServerFactoryCustomizer tomcatCustomizer() { return (tomcat) -> tomcat.addConnectorCustomizers(this.customizer); } @@ -341,7 +341,7 @@ class ReactiveWebServerFactoryAutoConfigurationTests { static class TomcatContextCustomizerConfiguration { @Bean - public TomcatContextCustomizer contextCustomizer() { + TomcatContextCustomizer contextCustomizer() { return mock(TomcatContextCustomizer.class); } @@ -353,12 +353,12 @@ class ReactiveWebServerFactoryAutoConfigurationTests { private final TomcatContextCustomizer customizer = mock(TomcatContextCustomizer.class); @Bean - public TomcatContextCustomizer contextCustomizer() { + TomcatContextCustomizer contextCustomizer() { return this.customizer; } @Bean - public WebServerFactoryCustomizer tomcatCustomizer() { + WebServerFactoryCustomizer tomcatCustomizer() { return (tomcat) -> tomcat.addContextCustomizers(this.customizer); } @@ -368,7 +368,7 @@ class ReactiveWebServerFactoryAutoConfigurationTests { static class TomcatProtocolHandlerCustomizerConfiguration { @Bean - public TomcatProtocolHandlerCustomizer protocolHandlerCustomizer() { + TomcatProtocolHandlerCustomizer protocolHandlerCustomizer() { return mock(TomcatProtocolHandlerCustomizer.class); } @@ -380,12 +380,12 @@ class ReactiveWebServerFactoryAutoConfigurationTests { private final TomcatProtocolHandlerCustomizer customizer = mock(TomcatProtocolHandlerCustomizer.class); @Bean - public TomcatProtocolHandlerCustomizer protocolHandlerCustomizer() { + TomcatProtocolHandlerCustomizer protocolHandlerCustomizer() { return this.customizer; } @Bean - public WebServerFactoryCustomizer tomcatCustomizer() { + WebServerFactoryCustomizer tomcatCustomizer() { return (tomcat) -> tomcat.addProtocolHandlerCustomizers(this.customizer); } @@ -395,9 +395,8 @@ class ReactiveWebServerFactoryAutoConfigurationTests { static class JettyServerCustomizerConfiguration { @Bean - public JettyServerCustomizer serverCustomizer() { + JettyServerCustomizer serverCustomizer() { return (server) -> { - }; } @@ -407,9 +406,8 @@ class ReactiveWebServerFactoryAutoConfigurationTests { static class UndertowBuilderCustomizerConfiguration { @Bean - public UndertowBuilderCustomizer builderCustomizer() { + UndertowBuilderCustomizer builderCustomizer() { return (builder) -> { - }; } @@ -419,9 +417,8 @@ class ReactiveWebServerFactoryAutoConfigurationTests { static class UndertowDeploymentInfoCustomizerConfiguration { @Bean - public UndertowDeploymentInfoCustomizer deploymentInfoCustomizer() { + UndertowDeploymentInfoCustomizer deploymentInfoCustomizer() { return (deploymentInfo) -> { - }; } @@ -431,7 +428,7 @@ class ReactiveWebServerFactoryAutoConfigurationTests { static class ForwardedHeaderTransformerConfiguration { @Bean - public ForwardedHeaderTransformer testForwardedHeaderTransformer() { + ForwardedHeaderTransformer testForwardedHeaderTransformer() { return new ForwardedHeaderTransformer(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java index 3a67b94630..22f1bbe010 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java @@ -396,68 +396,68 @@ class WebFluxAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class CustomArgumentResolvers { + static class CustomArgumentResolvers { @Bean - public HandlerMethodArgumentResolver firstResolver() { + HandlerMethodArgumentResolver firstResolver() { return mock(HandlerMethodArgumentResolver.class); } @Bean - public HandlerMethodArgumentResolver secondResolver() { + HandlerMethodArgumentResolver secondResolver() { return mock(HandlerMethodArgumentResolver.class); } } @Configuration(proxyBeanMethods = false) - protected static class CustomCodecCustomizers { + static class CustomCodecCustomizers { @Bean - public CodecCustomizer firstCodecCustomizer() { + CodecCustomizer firstCodecCustomizer() { return mock(CodecCustomizer.class); } } @Configuration(proxyBeanMethods = false) - protected static class ViewResolvers { + static class ViewResolvers { @Bean @Order(Ordered.HIGHEST_PRECEDENCE) - public ViewResolver aViewResolver() { + ViewResolver aViewResolver() { return mock(ViewResolver.class); } @Bean - public ViewResolver anotherViewResolver() { + ViewResolver anotherViewResolver() { return mock(ViewResolver.class); } } @Configuration(proxyBeanMethods = false) - protected static class Config { + static class Config { @Bean - public MockReactiveWebServerFactory mockReactiveWebServerFactory() { + MockReactiveWebServerFactory mockReactiveWebServerFactory() { return mockReactiveWebServerFactory; } } @Configuration(proxyBeanMethods = false) - protected static class CustomHttpHandler { + static class CustomHttpHandler { @Bean - public HttpHandler httpHandler() { + HttpHandler httpHandler() { return (serverHttpRequest, serverHttpResponse) -> null; } } @Configuration(proxyBeanMethods = false) - protected static class ValidatorWebFluxConfigurer implements WebFluxConfigurer { + static class ValidatorWebFluxConfigurer implements WebFluxConfigurer { private final Validator validator = mock(Validator.class); @@ -469,7 +469,7 @@ class WebFluxAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) - protected static class ValidatorJsr303WebFluxConfigurer implements WebFluxConfigurer { + static class ValidatorJsr303WebFluxConfigurer implements WebFluxConfigurer { private final LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); @@ -484,7 +484,7 @@ class WebFluxAutoConfigurationTests { static class CustomJsr303Validator { @Bean - public javax.validation.Validator customValidator() { + javax.validation.Validator customValidator() { return mock(javax.validation.Validator.class); } @@ -494,7 +494,7 @@ class WebFluxAutoConfigurationTests { static class CustomSpringValidator { @Bean - public Validator customValidator() { + Validator customValidator() { return mock(Validator.class); } @@ -504,7 +504,7 @@ class WebFluxAutoConfigurationTests { static class CustomHiddenHttpMethodFilter { @Bean - public HiddenHttpMethodFilter customHiddenHttpMethodFilter() { + HiddenHttpMethodFilter customHiddenHttpMethodFilter() { return mock(HiddenHttpMethodFilter.class); } @@ -514,7 +514,7 @@ class WebFluxAutoConfigurationTests { static class CustomRequestMappingHandlerAdapter { @Bean - public WebFluxRegistrations webFluxRegistrationsHandlerAdapter() { + WebFluxRegistrations webFluxRegistrationsHandlerAdapter() { return new WebFluxRegistrations() { @Override @@ -527,7 +527,7 @@ class WebFluxAutoConfigurationTests { } - private static class MyRequestMappingHandlerAdapter extends RequestMappingHandlerAdapter { + static class MyRequestMappingHandlerAdapter extends RequestMappingHandlerAdapter { } @@ -542,7 +542,7 @@ class WebFluxAutoConfigurationTests { static class CustomRequestMappingHandlerMapping { @Bean - public WebFluxRegistrations webFluxRegistrationsHandlerMapping() { + WebFluxRegistrations webFluxRegistrationsHandlerMapping() { return new WebFluxRegistrations() { @Override @@ -555,7 +555,7 @@ class WebFluxAutoConfigurationTests { } - private static class MyRequestMappingHandlerMapping extends RequestMappingHandlerMapping { + static class MyRequestMappingHandlerMapping extends RequestMappingHandlerMapping { } @@ -563,7 +563,7 @@ class WebFluxAutoConfigurationTests { static class PrinterConfiguration { @Bean - public Printer examplePrinter() { + Printer examplePrinter() { return new ExamplePrinter(); } @@ -573,7 +573,7 @@ class WebFluxAutoConfigurationTests { static class ParserConfiguration { @Bean - public Parser exampleParser() { + Parser exampleParser() { return new ExampleParser(); } @@ -587,13 +587,13 @@ class WebFluxAutoConfigurationTests { this.name = name; } - public String getName() { + String getName() { return this.name; } } - private static class ExamplePrinter implements Printer { + static class ExamplePrinter implements Printer { @Override public String print(Example example, Locale locale) { @@ -602,7 +602,7 @@ class WebFluxAutoConfigurationTests { } - private static class ExampleParser implements Parser { + static class ExampleParser implements Parser { @Override public Example parse(String source, Locale locale) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java index c58187397a..81a41b27ac 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java @@ -289,35 +289,35 @@ class DefaultErrorWebExceptionHandlerIntegrationTests { } @Configuration(proxyBeanMethods = false) - public static class Application { + static class Application { @RestController - protected static class ErrorController { + static class ErrorController { @GetMapping("/") - public String home() { + String home() { throw new IllegalStateException("Expected!"); } @GetMapping("/badRequest") - public Mono badRequest() { + Mono badRequest() { return Mono.error(new ResponseStatusException(HttpStatus.BAD_REQUEST)); } @GetMapping("/commit") - public Mono commit(ServerWebExchange exchange) { + Mono commit(ServerWebExchange exchange) { return exchange.getResponse().setComplete() .then(Mono.error(new IllegalStateException("already committed!"))); } @GetMapping("/html") - public String htmlEscape() { + String htmlEscape() { throw new IllegalStateException("