From 2815e6ee2d8a9a8f4cf521453635b980287233a1 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 2 Apr 2020 11:34:44 +0200 Subject: [PATCH] Remove deprecated Humio's repository property Closes gh-20808 --- .../metrics/export/humio/HumioProperties.java | 19 +------------------ .../humio/HumioPropertiesConfigAdapter.java | 8 +------- ...itional-spring-configuration-metadata.json | 6 ++++++ .../HumioPropertiesConfigAdapterTests.java | 10 +--------- .../export/humio/HumioPropertiesTests.java | 4 +--- 5 files changed, 10 insertions(+), 37 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioProperties.java index a14df5a84e6..78eaaf57155 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -22,7 +22,6 @@ import java.util.Map; import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryProperties; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.DeprecatedConfigurationProperty; /** * {@link ConfigurationProperties @ConfigurationProperties} for configuring Humio metrics @@ -44,11 +43,6 @@ public class HumioProperties extends StepRegistryProperties { */ private Duration connectTimeout = Duration.ofSeconds(5); - /** - * Name of the repository to publish metrics to. - */ - private String repository = ""; - /** * Humio tags describing the data source in which metrics will be stored. Humio tags * are a distinct concept from Micrometer's tags. Micrometer's tags are used to divide @@ -80,17 +74,6 @@ public class HumioProperties extends StepRegistryProperties { this.connectTimeout = connectTimeout; } - @Deprecated - @DeprecatedConfigurationProperty(reason = "No longer used as repository is resolved from the api token.") - public String getRepository() { - return this.repository; - } - - @Deprecated - public void setRepository(String repository) { - this.repository = repository; - } - public Map getTags() { return this.tags; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesConfigAdapter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesConfigAdapter.java index 830c3ae9dde..2be663bcf68 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesConfigAdapter.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesConfigAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -43,12 +43,6 @@ class HumioPropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter tags() { return get(HumioProperties::getTags, HumioConfig.super::tags); 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 4ba0d95641f..78e641908db 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 @@ -253,6 +253,12 @@ "name": "management.metrics.export.influx.consistency", "defaultValue": "one" }, + { + "name": "management.metrics.export.humio.repository", + "deprecation": { + "level": "error" + } + }, { "name": "management.metrics.export.prometheus.enabled", "type": "java.lang.Boolean", diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesConfigAdapterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesConfigAdapterTests.java index 5f8fdcc176d..dffce7e8eb3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesConfigAdapterTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesConfigAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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,14 +36,6 @@ class HumioPropertiesConfigAdapterTests { assertThat(new HumioPropertiesConfigAdapter(properties).apiToken()).isEqualTo("ABC123"); } - @Test - @Deprecated - void whenPropertiesRepositoryIsSetAdapterRepositoryReturnsIt() { - HumioProperties properties = new HumioProperties(); - properties.setRepository("test"); - assertThat(new HumioPropertiesConfigAdapter(properties).repository()).isEqualTo("test"); - } - @Test void whenPropertiesTagsIsSetAdapterTagsReturnsIt() { HumioProperties properties = new HumioProperties(); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesTests.java index cc141cdc1a7..d5c44e1a5d0 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioPropertiesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -31,13 +31,11 @@ import static org.assertj.core.api.Assertions.assertThat; class HumioPropertiesTests extends StepRegistryPropertiesTests { @Test - @SuppressWarnings("deprecation") void defaultValuesAreConsistent() { HumioProperties properties = new HumioProperties(); HumioConfig config = (key) -> null; assertStepRegistryDefaultValues(properties, config); assertThat(properties.getApiToken()).isEqualTo(config.apiToken()); - assertThat(properties.getRepository()).isEqualTo(config.repository()); assertThat(properties.getTags()).isEmpty(); assertThat(config.tags()).isNull(); assertThat(properties.getUri()).isEqualTo(config.uri());