From 5dad7182dbe6aed13fde9d8af6ce06a5b9ac291b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 7 Apr 2017 12:01:01 +0100 Subject: [PATCH] Address deprecation warnings --- .../boot/actuate/autoconfigure/ShellProperties.java | 6 +++--- .../actuate/metrics/statsd/StatsdMetricWriter.java | 4 ++-- .../condition/ConditionalOnMissingBeanTests.java | 4 ++-- .../boot/bind/PropertiesConfigurationFactory.java | 6 +++--- .../boot/bind/YamlConfigurationFactory.java | 4 ++-- .../tomcat/TomcatEmbeddedServletContainerFactory.java | 10 ++++++++-- .../boot/context/embedded/CompressionTests.java | 4 ++-- 7 files changed, 22 insertions(+), 16 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java index d18bf1917f..ee04f3316d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * 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. @@ -118,7 +118,7 @@ public class ShellProperties { } public void setDisabledCommands(String[] disabledCommands) { - Assert.notEmpty(disabledCommands); + Assert.notEmpty(disabledCommands, "disabledCommands must not be empty"); this.disabledCommands = disabledCommands; } @@ -127,7 +127,7 @@ public class ShellProperties { } public void setDisabledPlugins(String[] disabledPlugins) { - Assert.notEmpty(disabledPlugins); + Assert.notEmpty(disabledPlugins, "disabledPlugins must not be empty"); this.disabledPlugins = disabledPlugins; } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriter.java index 292dd46b5b..a92dd2eae4 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * 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. @@ -72,7 +72,7 @@ public class StatsdMetricWriter implements MetricWriter, Closeable { * @param client StatsD client to write metrics with */ public StatsdMetricWriter(StatsDClient client) { - Assert.notNull(client); + Assert.notNull(client, "client must not be null"); this.client = client; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java index eab16b80b0..18ce7a56a7 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java @@ -606,7 +606,7 @@ public class ConditionalOnMissingBeanTests { public static class ExampleFactoryBean implements FactoryBean { public ExampleFactoryBean(String value) { - Assert.state(!value.contains("$")); + Assert.state(!value.contains("$"), "value must not contain $"); } @Override @@ -629,7 +629,7 @@ public class ConditionalOnMissingBeanTests { public static class NonspecificFactoryBean implements FactoryBean { public NonspecificFactoryBean(String value) { - Assert.state(!value.contains("$")); + Assert.state(!value.contains("$"), "value must not contain $"); } @Override diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java index 3f1ec1ea84..352b05d013 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * 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. @@ -94,7 +94,7 @@ public class PropertiesConfigurationFactory * @see #PropertiesConfigurationFactory(Class) */ public PropertiesConfigurationFactory(T target) { - Assert.notNull(target); + Assert.notNull(target, "target must not be null"); this.target = target; } @@ -105,7 +105,7 @@ public class PropertiesConfigurationFactory */ @SuppressWarnings("unchecked") public PropertiesConfigurationFactory(Class type) { - Assert.notNull(type); + Assert.notNull(type, "type must not be null"); this.target = (T) BeanUtils.instantiate(type); } diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java index 6ab2e551ea..4728118573 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * 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. @@ -76,7 +76,7 @@ public class YamlConfigurationFactory * @param type the root type */ public YamlConfigurationFactory(Class type) { - Assert.notNull(type); + Assert.notNull(type, "type must not be null"); this.type = type; } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java index 347aa7c24e..17d4c7b08b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java @@ -352,8 +352,7 @@ public class TomcatEmbeddedServletContainerFactory Compression compression = getCompression(); protocol.setCompression("on"); protocol.setCompressionMinSize(compression.getMinResponseSize()); - protocol.setCompressableMimeType( - StringUtils.arrayToCommaDelimitedString(compression.getMimeTypes())); + configureCompressibleMimeTypes(protocol, compression); if (getCompression().getExcludedUserAgents() != null) { protocol.setNoCompressionUserAgents( StringUtils.arrayToCommaDelimitedString( @@ -362,6 +361,13 @@ public class TomcatEmbeddedServletContainerFactory } } + @SuppressWarnings("deprecation") + private void configureCompressibleMimeTypes(AbstractHttp11Protocol protocol, + Compression compression) { + protocol.setCompressableMimeType( + StringUtils.arrayToCommaDelimitedString(compression.getMimeTypes())); + } + /** * Configure Tomcat's {@link AbstractHttp11JsseProtocol} for SSL. * @param protocol the protocol diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/CompressionTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/CompressionTests.java index ac5a35fc75..d608454e51 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/CompressionTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/CompressionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * 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. @@ -36,7 +36,7 @@ public class CompressionTests { private String[] getTomcatDefaultCompressableMimeTypes() { Http11NioProtocol protocol = new Http11NioProtocol(); - return protocol.getCompressableMimeTypes(); + return protocol.getCompressibleMimeTypes(); } }