Browse Source

Suppress deprecation warnings caused by micrometer backwards compatability

pull/30078/head
Moritz Halbritter 4 years ago
parent
commit
0072cc807c
  1. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java
  2. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java
  3. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java
  4. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java
  5. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyConfigurations.java
  6. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.java
  7. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoConfigurations.java
  8. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfiguration.java
  9. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java
  10. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java
  11. 5
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java
  12. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java
  13. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java
  14. 3
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java
  15. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfigurationTests.java
  16. 3
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java
  17. 1
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java

@ -39,6 +39,7 @@ import org.springframework.context.annotation.Bean; @@ -39,6 +39,7 @@ import org.springframework.context.annotation.Bean;
@AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
@ConditionalOnClass(MeterRegistry.class)
@ConditionalOnBean(MeterRegistry.class)
@SuppressWarnings("deprecation")
public class JvmMetricsAutoConfiguration {
@Bean

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java

@ -44,6 +44,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @@ -44,6 +44,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
name = "org.apache.logging.log4j.core.LoggerContext")
@ConditionalOnBean(MeterRegistry.class)
@Conditional(Log4JCoreLoggerContextCondition.class)
@SuppressWarnings("deprecation")
public class Log4J2MetricsAutoConfiguration {
@Bean

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java

@ -46,6 +46,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @@ -46,6 +46,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
@ConditionalOnClass({ MeterRegistry.class, LoggerContext.class, LoggerFactory.class })
@ConditionalOnBean(MeterRegistry.class)
@Conditional(LogbackLoggingCondition.class)
@SuppressWarnings("deprecation")
public class LogbackMetricsAutoConfiguration {
@Bean

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java

@ -45,6 +45,7 @@ import org.springframework.context.annotation.Bean; @@ -45,6 +45,7 @@ import org.springframework.context.annotation.Bean;
@ConditionalOnClass(MeterRegistry.class)
@ConditionalOnBean(MeterRegistry.class)
@EnableConfigurationProperties(MetricsProperties.class)
@SuppressWarnings("deprecation")
public class SystemMetricsAutoConfiguration {
@Bean

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyConfigurations.java

@ -27,6 +27,7 @@ import org.springframework.context.annotation.Bean; @@ -27,6 +27,7 @@ import org.springframework.context.annotation.Bean;
*
* @author Moritz Halbritter
*/
@SuppressWarnings("deprecation")
abstract class JerseyConfigurations {
static class JerseyTagsProviderConfiguration {

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.java

@ -58,6 +58,7 @@ import org.springframework.core.annotation.Order; @@ -58,6 +58,7 @@ import org.springframework.core.annotation.Order;
@ConditionalOnBean({ MeterRegistry.class, ResourceConfig.class })
@EnableConfigurationProperties(MetricsProperties.class)
@Import(JerseyTagsProviderConfiguration.class)
@SuppressWarnings("deprecation")
public class JerseyServerMetricsAutoConfiguration {
private final MetricsProperties properties;

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoConfigurations.java

@ -33,6 +33,7 @@ import org.springframework.context.annotation.Import; @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Import;
*
* @author Moritz Halbritter
*/
@SuppressWarnings("deprecation")
abstract class MongoConfigurations {
@Configuration(proxyBeanMethods = false)

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfiguration.java

@ -48,6 +48,7 @@ import org.springframework.context.annotation.Import; @@ -48,6 +48,7 @@ import org.springframework.context.annotation.Import;
after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
@ConditionalOnClass(MongoClientSettings.class)
@ConditionalOnBean(MeterRegistry.class)
@SuppressWarnings("deprecation")
public class MongoMetricsAutoConfiguration {
@Configuration(proxyBeanMethods = false)

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java

@ -46,6 +46,7 @@ import org.springframework.context.annotation.Bean; @@ -46,6 +46,7 @@ import org.springframework.context.annotation.Bean;
@ConditionalOnWebApplication
@ConditionalOnClass({ JettyServerThreadPoolMetrics.class, Server.class })
@ConditionalOnBean(MeterRegistry.class)
@SuppressWarnings("deprecation")
public class JettyMetricsAutoConfiguration {
@Bean

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java

@ -39,6 +39,7 @@ import org.springframework.context.annotation.Bean; @@ -39,6 +39,7 @@ import org.springframework.context.annotation.Bean;
@AutoConfiguration(after = CompositeMeterRegistryAutoConfiguration.class)
@ConditionalOnWebApplication
@ConditionalOnClass({ TomcatMetrics.class, Manager.class })
@SuppressWarnings("deprecation")
public class TomcatMetricsAutoConfiguration {
@Bean

5
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java

@ -164,6 +164,7 @@ class JvmMetricsAutoConfigurationTests { @@ -164,6 +164,7 @@ class JvmMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomJvmGcMetricsBackwardsCompatibleConfiguration {
@Bean
@ -184,6 +185,7 @@ class JvmMetricsAutoConfigurationTests { @@ -184,6 +185,7 @@ class JvmMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomJvmHeapPressureMetricsBackwardsCompatibleConfiguration {
@Bean
@ -204,6 +206,7 @@ class JvmMetricsAutoConfigurationTests { @@ -204,6 +206,7 @@ class JvmMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomJvmMemoryMetricsBackwardsCompatibleConfiguration {
@Bean
@ -224,6 +227,7 @@ class JvmMetricsAutoConfigurationTests { @@ -224,6 +227,7 @@ class JvmMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomJvmThreadMetricsBackwardsCompatibleConfiguration {
@Bean
@ -244,6 +248,7 @@ class JvmMetricsAutoConfigurationTests { @@ -244,6 +248,7 @@ class JvmMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomClassLoaderMetricsBackwardsCompatibleConfiguration {
@Bean

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java

@ -77,6 +77,7 @@ class Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests { @@ -77,6 +77,7 @@ class Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomLog4J2MetricsConfigurationBackwardsCompatible {
@Bean

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java

@ -69,6 +69,7 @@ class LogbackMetricsAutoConfigurationTests { @@ -69,6 +69,7 @@ class LogbackMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomLogbackMetricsConfigurationBackwardsCompatible {
@Bean

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java

@ -153,6 +153,7 @@ class SystemMetricsAutoConfigurationTests { @@ -153,6 +153,7 @@ class SystemMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomUptimeMetricsConfigurationBackwardsCompatible {
@Bean
@ -173,6 +174,7 @@ class SystemMetricsAutoConfigurationTests { @@ -173,6 +174,7 @@ class SystemMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomProcessorMetricsConfigurationBackwardsCompatible {
@Bean
@ -193,6 +195,7 @@ class SystemMetricsAutoConfigurationTests { @@ -193,6 +195,7 @@ class SystemMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomFileDescriptorMetricsConfigurationBackwardsCompatible {
@Bean

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfigurationTests.java

@ -156,6 +156,7 @@ class JerseyServerMetricsAutoConfigurationTests { @@ -156,6 +156,7 @@ class JerseyServerMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomJerseyTagsProviderBackwardsCompatibleConfiguration {
@Bean
@ -179,6 +180,7 @@ class JerseyServerMetricsAutoConfigurationTests { @@ -179,6 +180,7 @@ class JerseyServerMetricsAutoConfigurationTests {
}
@SuppressWarnings("deprecation")
static class CustomJerseyTagsProviderBackwardsCompatible
implements io.micrometer.core.instrument.binder.jersey.server.JerseyTagsProvider {

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java

@ -334,6 +334,7 @@ class JettyMetricsAutoConfigurationTests { @@ -334,6 +334,7 @@ class JettyMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomJettyServerThreadPoolMetricsBackwardsCompatible {
@Bean
@ -365,6 +366,7 @@ class JettyMetricsAutoConfigurationTests { @@ -365,6 +366,7 @@ class JettyMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomJettyConnectionMetricsBackwardsCompatible {
@Bean
@ -396,6 +398,7 @@ class JettyMetricsAutoConfigurationTests { @@ -396,6 +398,7 @@ class JettyMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomJettySslHandshakeMetricsBackwardsCompatible {
@Bean

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java

@ -175,6 +175,7 @@ class TomcatMetricsAutoConfigurationTests { @@ -175,6 +175,7 @@ class TomcatMetricsAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("deprecation")
static class CustomTomcatMetricsBackwardsCompatible {
@Bean

Loading…
Cancel
Save