From c826310fd1bb69dcc7df151a1992f39219565276 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 9 May 2018 08:44:15 +0100 Subject: [PATCH 1/2] Polish --- ...onfigurationWithLog4j2AndLogbackTests.java | 5 ++- .../HazelcastCacheMeterBinderProvider.java | 5 +-- .../orm/jpa/HibernateJpaConfiguration.java | 9 ++--- .../HibernateJpaAutoConfigurationTests.java | 34 +++++++++++-------- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationWithLog4j2AndLogbackTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationWithLog4j2AndLogbackTests.java index f73061fc49c..4c385063af5 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationWithLog4j2AndLogbackTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationWithLog4j2AndLogbackTests.java @@ -43,9 +43,8 @@ public class MetricsAutoConfigurationWithLog4j2AndLogbackTests { @Test public void doesNotConfigureLogbackMetrics() { - this.contextRunner.run((context) -> { - assertThat(context).doesNotHaveBean(LogbackMetrics.class); - }); + this.contextRunner.run( + (context) -> assertThat(context).doesNotHaveBean(LogbackMetrics.class)); } } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/cache/HazelcastCacheMeterBinderProvider.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/cache/HazelcastCacheMeterBinderProvider.java index a3aa5560041..809478d2488 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/cache/HazelcastCacheMeterBinderProvider.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/cache/HazelcastCacheMeterBinderProvider.java @@ -16,7 +16,6 @@ package org.springframework.boot.actuate.metrics.cache; -import com.hazelcast.core.IMap; import com.hazelcast.spring.cache.HazelcastCache; import io.micrometer.core.instrument.Tag; import io.micrometer.core.instrument.binder.MeterBinder; @@ -32,10 +31,8 @@ public class HazelcastCacheMeterBinderProvider implements CacheMeterBinderProvider { @Override - @SuppressWarnings("unchecked") public MeterBinder getMeterBinder(HazelcastCache cache, Iterable tags) { - return new HazelcastCacheMetrics((IMap) cache.getNativeCache(), - tags); + return new HazelcastCacheMetrics(cache.getNativeCache(), tags); } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java index d234631853d..6273a398322 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java @@ -112,7 +112,8 @@ class HibernateJpaConfiguration extends JpaBaseConfiguration { ImplicitNamingStrategy implicitNamingStrategy, List hibernatePropertiesCustomizers) { if (physicalNamingStrategy != null || implicitNamingStrategy != null) { - LinkedList customizers = new LinkedList<>(hibernatePropertiesCustomizers); + LinkedList customizers = new LinkedList<>( + hibernatePropertiesCustomizers); customizers.addFirst(new NamingStrategiesHibernatePropertiesCustomizer( physicalNamingStrategy, implicitNamingStrategy)); return customizers; @@ -129,9 +130,9 @@ class HibernateJpaConfiguration extends JpaBaseConfiguration { protected Map getVendorProperties() { Supplier defaultDdlMode = () -> this.defaultDdlAutoProvider .getDefaultDdlAuto(getDataSource()); - return new LinkedHashMap<>(getProperties() - .getHibernateProperties(new HibernateSettings().ddlAuto(defaultDdlMode) - .hibernatePropertiesCustomizers( + return new LinkedHashMap<>( + getProperties().getHibernateProperties(new HibernateSettings() + .ddlAuto(defaultDdlMode).hibernatePropertiesCustomizers( this.hibernatePropertiesCustomizers))); } 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 97943718f4f..27034bfaafa 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 @@ -278,10 +278,11 @@ public class HibernateJpaAutoConfigurationTests contextRunner() .withUserConfiguration(TestPhysicalNamingStrategyConfiguration.class) .run((context) -> { - Map hibernateProperties = context.getBean( - HibernateJpaConfiguration.class).getVendorProperties(); - assertThat(hibernateProperties).contains( - entry("hibernate.physical_naming_strategy", + Map hibernateProperties = context + .getBean(HibernateJpaConfiguration.class) + .getVendorProperties(); + assertThat(hibernateProperties) + .contains(entry("hibernate.physical_naming_strategy", context.getBean("testPhysicalNamingStrategy"))); assertThat(hibernateProperties) .doesNotContainKeys("hibernate.ejb.naming_strategy"); @@ -293,10 +294,11 @@ public class HibernateJpaAutoConfigurationTests contextRunner() .withUserConfiguration(TestImplicitNamingStrategyConfiguration.class) .run((context) -> { - Map hibernateProperties = context.getBean( - HibernateJpaConfiguration.class).getVendorProperties(); - assertThat(hibernateProperties).contains( - entry("hibernate.implicit_naming_strategy", + Map hibernateProperties = context + .getBean(HibernateJpaConfiguration.class) + .getVendorProperties(); + assertThat(hibernateProperties) + .contains(entry("hibernate.implicit_naming_strategy", context.getBean("testImplicitNamingStrategy"))); assertThat(hibernateProperties) .doesNotContainKeys("hibernate.ejb.naming_strategy"); @@ -312,8 +314,9 @@ public class HibernateJpaAutoConfigurationTests "spring.jpa.hibernate.naming.physical-strategy:com.example.Physical", "spring.jpa.hibernate.naming.implicit-strategy:com.example.Implicit") .run((context) -> { - Map hibernateProperties = context.getBean( - HibernateJpaConfiguration.class).getVendorProperties(); + Map hibernateProperties = context + .getBean(HibernateJpaConfiguration.class) + .getVendorProperties(); assertThat(hibernateProperties).contains( entry("hibernate.physical_naming_strategy", context.getBean("testPhysicalNamingStrategy")), @@ -335,10 +338,12 @@ public class HibernateJpaAutoConfigurationTests "spring.jpa.hibernate.naming.physical-strategy:com.example.Physical", "spring.jpa.hibernate.naming.implicit-strategy:com.example.Implicit") .run((context) -> { - Map hibernateProperties = context.getBean( - HibernateJpaConfiguration.class).getVendorProperties(); - TestHibernatePropertiesCustomizerConfiguration configuration = context.getBean( - TestHibernatePropertiesCustomizerConfiguration.class); + Map hibernateProperties = context + .getBean(HibernateJpaConfiguration.class) + .getVendorProperties(); + TestHibernatePropertiesCustomizerConfiguration configuration = context + .getBean( + TestHibernatePropertiesCustomizerConfiguration.class); assertThat(hibernateProperties).contains( entry("hibernate.physical_naming_strategy", configuration.physicalNamingStrategy), @@ -349,7 +354,6 @@ public class HibernateJpaAutoConfigurationTests }); } - @Configuration @TestAutoConfigurationPackage(City.class) static class TestInitializedJpaConfiguration { From e14a2e33abbd97880f93a6e00344213afe87fe75 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 9 May 2018 09:12:19 +0100 Subject: [PATCH 2/2] Deprecate queue size property for StatsD metrics export Closes gh-13108 --- .../metrics/export/statsd/StatsdProperties.java | 4 ++++ .../metrics/export/statsd/StatsdPropertiesConfigAdapter.java | 1 + .../META-INF/additional-spring-configuration-metadata.json | 5 ++++- .../metrics/export/statsd/StatsdPropertiesTests.java | 1 - 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdProperties.java index f9b3cd9a2b7..3169348aa9b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdProperties.java @@ -21,6 +21,7 @@ import java.time.Duration; import io.micrometer.statsd.StatsdFlavor; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.DeprecatedConfigurationProperty; /** * {@link ConfigurationProperties} for configuring StatsD metrics export. @@ -122,10 +123,13 @@ public class StatsdProperties { this.pollingFrequency = pollingFrequency; } + @Deprecated + @DeprecatedConfigurationProperty(reason = "No longer configurable and an unbounded queue will always be used") public Integer getQueueSize() { return this.queueSize; } + @Deprecated public void setQueueSize(Integer queueSize) { this.queueSize = queueSize; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdPropertiesConfigAdapter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdPropertiesConfigAdapter.java index e6875d06e28..c62b2c9b84c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdPropertiesConfigAdapter.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdPropertiesConfigAdapter.java @@ -74,6 +74,7 @@ public class StatsdPropertiesConfigAdapter } @Override + @Deprecated public int queueSize() { return get(StatsdProperties::getQueueSize, StatsdConfig.super::queueSize); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 659b89f13c3..915d0ba40ee 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -280,7 +280,10 @@ }, { "name": "management.metrics.export.statsd.queue-size", - "defaultValue": 2147483647 + "defaultValue": 2147483647, + "deprecation": { + "level": "error" + } }, { "name": "management.trace.http.enabled", diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdPropertiesTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdPropertiesTests.java index 69fea27db5d..9f1675c66f4 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdPropertiesTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdPropertiesTests.java @@ -38,7 +38,6 @@ public class StatsdPropertiesTests { assertThat(properties.getPort()).isEqualTo(config.port()); assertThat(properties.getMaxPacketLength()).isEqualTo(config.maxPacketLength()); assertThat(properties.getPollingFrequency()).isEqualTo(config.pollingFrequency()); - assertThat(properties.getQueueSize()).isEqualTo(config.queueSize()); assertThat(properties.isPublishUnchangedMeters()) .isEqualTo(config.publishUnchangedMeters()); }