Commit 8ee47758 authored by Andy Wilkinson's avatar Andy Wilkinson

Polish

parent 2af8a961
...@@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier; import java.util.function.Supplier;
import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.Meter.Id;
import io.micrometer.core.instrument.config.MeterFilter; import io.micrometer.core.instrument.config.MeterFilter;
import io.micrometer.core.instrument.config.MeterFilterReply; import io.micrometer.core.instrument.config.MeterFilterReply;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -28,7 +29,8 @@ import org.slf4j.LoggerFactory; ...@@ -28,7 +29,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
* {@link MeterFilter} to log only once a warning message and deny {@link Meter.Id}. * {@link MeterFilter} to log only once a warning message and deny a {@link Meter}
* {@link Id}.
* *
* @author Jon Schneider * @author Jon Schneider
* @author Dmytro Nosan * @author Dmytro Nosan
...@@ -49,7 +51,7 @@ public final class OnlyOnceLoggingDenyMeterFilter implements MeterFilter { ...@@ -49,7 +51,7 @@ public final class OnlyOnceLoggingDenyMeterFilter implements MeterFilter {
} }
@Override @Override
public MeterFilterReply accept(Meter.Id id) { public MeterFilterReply accept(Id id) {
if (this.logger.isWarnEnabled() if (this.logger.isWarnEnabled()
&& this.alreadyWarned.compareAndSet(false, true)) { && this.alreadyWarned.compareAndSet(false, true)) {
this.logger.warn(this.message.get()); this.logger.warn(this.message.get());
......
...@@ -167,13 +167,6 @@ public class CloudFoundryWebFluxEndpointIntegrationTests { ...@@ -167,13 +167,6 @@ public class CloudFoundryWebFluxEndpointIntegrationTests {
.jsonPath("_links.test-part").doesNotExist())); .jsonPath("_links.test-part").doesNotExist()));
} }
private AnnotationConfigReactiveWebServerApplicationContext createApplicationContext(
Class<?>... config) {
AnnotationConfigReactiveWebServerApplicationContext context = new AnnotationConfigReactiveWebServerApplicationContext();
context.register(config);
return context;
}
private ContextConsumer<AssertableReactiveWebApplicationContext> withWebTestClient( private ContextConsumer<AssertableReactiveWebApplicationContext> withWebTestClient(
Consumer<WebTestClient> clientConsumer) { Consumer<WebTestClient> clientConsumer) {
return (context) -> { return (context) -> {
......
...@@ -93,6 +93,7 @@ public final class MetricsRun { ...@@ -93,6 +93,7 @@ public final class MetricsRun {
return (contextRunner) -> apply(contextRunner, exportAutoConfigurations); return (contextRunner) -> apply(contextRunner, exportAutoConfigurations);
} }
@SuppressWarnings("unchecked")
private static <T extends AbstractApplicationContextRunner<?, ?, ?>> T apply( private static <T extends AbstractApplicationContextRunner<?, ?, ?>> T apply(
T contextRunner, Class<?>[] exportAutoConfigurations) { T contextRunner, Class<?>[] exportAutoConfigurations) {
for (Class<?> configuration : exportAutoConfigurations) { for (Class<?> configuration : exportAutoConfigurations) {
......
...@@ -20,7 +20,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; ...@@ -20,7 +20,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.data.repository.query.spi.EvaluationContextExtensionSupport;
import org.springframework.security.data.repository.query.SecurityEvaluationContextExtension; import org.springframework.security.data.repository.query.SecurityEvaluationContextExtension;
/** /**
...@@ -30,8 +29,7 @@ import org.springframework.security.data.repository.query.SecurityEvaluationCont ...@@ -30,8 +29,7 @@ import org.springframework.security.data.repository.query.SecurityEvaluationCont
* @since 1.3 * @since 1.3
*/ */
@Configuration @Configuration
@ConditionalOnClass({ SecurityEvaluationContextExtension.class, @ConditionalOnClass(SecurityEvaluationContextExtension.class)
EvaluationContextExtensionSupport.class })
public class SecurityDataConfiguration { public class SecurityDataConfiguration {
@Bean @Bean
......
...@@ -63,7 +63,7 @@ public class ClientsConfiguredCondition extends SpringBootCondition { ...@@ -63,7 +63,7 @@ public class ClientsConfiguredCondition extends SpringBootCondition {
private Map<String, OAuth2ClientProperties.BaseClientRegistration> getRegistrations( private Map<String, OAuth2ClientProperties.BaseClientRegistration> getRegistrations(
Environment environment) { Environment environment) {
Map<String, OAuth2ClientProperties.BaseClientRegistration> registrations = new HashMap(); Map<String, OAuth2ClientProperties.BaseClientRegistration> registrations = new HashMap<>();
Map<String, OAuth2ClientProperties.LoginClientRegistration> loginClientRegistrations = Binder Map<String, OAuth2ClientProperties.LoginClientRegistration> loginClientRegistrations = Binder
.get(environment).bind("spring.security.oauth2.client.registration.login", .get(environment).bind("spring.security.oauth2.client.registration.login",
STRING_LOGIN_REGISTRATION_MAP) STRING_LOGIN_REGISTRATION_MAP)
......
...@@ -159,8 +159,8 @@ public class RedisAutoConfigurationTests { ...@@ -159,8 +159,8 @@ public class RedisAutoConfigurationTests {
LettuceConnectionFactory cf = context LettuceConnectionFactory cf = context
.getBean(LettuceConnectionFactory.class); .getBean(LettuceConnectionFactory.class);
assertThat(cf.getHostName()).isEqualTo("foo"); assertThat(cf.getHostName()).isEqualTo("foo");
GenericObjectPoolConfig poolConfig = getPoolingClientConfiguration(cf) GenericObjectPoolConfig<?> poolConfig = getPoolingClientConfiguration(
.getPoolConfig(); cf).getPoolConfig();
assertThat(poolConfig.getMinIdle()).isEqualTo(1); assertThat(poolConfig.getMinIdle()).isEqualTo(1);
assertThat(poolConfig.getMaxIdle()).isEqualTo(4); assertThat(poolConfig.getMaxIdle()).isEqualTo(4);
assertThat(poolConfig.getMaxTotal()).isEqualTo(16); assertThat(poolConfig.getMaxTotal()).isEqualTo(16);
......
...@@ -166,6 +166,7 @@ public class TomcatWebServerFactoryCustomizerTests { ...@@ -166,6 +166,7 @@ public class TomcatWebServerFactoryCustomizerTests {
assertThat(remoteIpValve.getInternalProxies()).isEqualTo("192.168.0.1"); assertThat(remoteIpValve.getInternalProxies()).isEqualTo("192.168.0.1");
} }
@SuppressWarnings("unchecked")
@Test @Test
public void customStaticResourceAllowCaching() { public void customStaticResourceAllowCaching() {
bind("server.tomcat.resource.allow-caching=false"); bind("server.tomcat.resource.allow-caching=false");
......
...@@ -42,7 +42,7 @@ public class KafkaStreamsBeanExample { ...@@ -42,7 +42,7 @@ public class KafkaStreamsBeanExample {
@Bean @Bean
public KStream<Integer, String> kStream(StreamsBuilder streamsBuilder) { public KStream<Integer, String> kStream(StreamsBuilder streamsBuilder) {
KStream<Integer, String> stream = streamsBuilder.stream("ks1In"); KStream<Integer, String> stream = streamsBuilder.stream("ks1In");
stream.map((k, v) -> new KeyValue(k, v.toUpperCase())).to("ks1Out", stream.map((k, v) -> new KeyValue<>(k, v.toUpperCase())).to("ks1Out",
Produced.with(Serdes.Integer(), new JsonSerde<>())); Produced.with(Serdes.Integer(), new JsonSerde<>()));
return stream; return stream;
} }
......
...@@ -126,6 +126,7 @@ class WebMvcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { ...@@ -126,6 +126,7 @@ class WebMvcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter {
} }
@Override @Override
@SuppressWarnings("deprecation")
protected Set<Class<?>> getDefaultIncludes() { protected Set<Class<?>> getDefaultIncludes() {
if (this.annotation.secure()) { if (this.annotation.secure()) {
if (ObjectUtils.isEmpty(this.annotation.controllers())) { if (ObjectUtils.isEmpty(this.annotation.controllers())) {
......
...@@ -56,7 +56,7 @@ public class SpringBootMockMvcBuilderCustomizerTests { ...@@ -56,7 +56,7 @@ public class SpringBootMockMvcBuilderCustomizerTests {
DefaultMockMvcBuilder builder = MockMvcBuilders.webAppContextSetup(context); DefaultMockMvcBuilder builder = MockMvcBuilders.webAppContextSetup(context);
this.customizer = new SpringBootMockMvcBuilderCustomizer(context); this.customizer = new SpringBootMockMvcBuilderCustomizer(context);
this.customizer.customize(builder); this.customizer.customize(builder);
FilterRegistrationBean registrationBean = (FilterRegistrationBean) context FilterRegistrationBean<?> registrationBean = (FilterRegistrationBean<?>) context
.getBean("filterRegistrationBean"); .getBean("filterRegistrationBean");
Filter testFilter = (Filter) context.getBean("testFilter"); Filter testFilter = (Filter) context.getBean("testFilter");
Filter otherTestFilter = registrationBean.getFilter(); Filter otherTestFilter = registrationBean.getFilter();
......
...@@ -33,6 +33,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; ...@@ -33,6 +33,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
@ConfigurationProperties(prefix = "accesslevel.overwrite.default") @ConfigurationProperties(prefix = "accesslevel.overwrite.default")
public class LombokAccessLevelOverwriteDefaultProperties { public class LombokAccessLevelOverwriteDefaultProperties {
@SuppressWarnings("unused")
private String name0; private String name0;
@Getter(AccessLevel.PUBLIC) @Getter(AccessLevel.PUBLIC)
......
...@@ -21,9 +21,6 @@ import java.util.LinkedHashMap; ...@@ -21,9 +21,6 @@ import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.json.JsonParser; import org.springframework.boot.json.JsonParser;
import org.springframework.boot.json.JsonParserFactory; import org.springframework.boot.json.JsonParserFactory;
...@@ -74,9 +71,6 @@ public class SpringApplicationJsonEnvironmentPostProcessor ...@@ -74,9 +71,6 @@ public class SpringApplicationJsonEnvironmentPostProcessor
*/ */
public static final int DEFAULT_ORDER = Ordered.HIGHEST_PRECEDENCE + 5; public static final int DEFAULT_ORDER = Ordered.HIGHEST_PRECEDENCE + 5;
private static final Log logger = LogFactory
.getLog(SpringApplicationJsonEnvironmentPostProcessor.class);
private int order = DEFAULT_ORDER; private int order = DEFAULT_ORDER;
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment