Polish "Fix PropertiesConfigAdapter delegation logic"

Closes gh-11135

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/PropertiesConfigAdapter.java

@@ -26,6 +26,7 @@ import org.springframework.util.Assert;
  *
  * @param <T> The properties type
  * @author Phillip Webb
+ * @author Nikolay Rybak
  * @since 2.0.0
  */
 public class PropertiesConfigAdapter<T> {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaPropertiesConfigAdapter.java

@@ -60,17 +60,20 @@ class GangliaPropertiesConfigAdapter
 
 	@Override
 	public TimeUnit durationUnits() {
-		return get(GangliaProperties::getDurationUnits, GangliaConfig.super::durationUnits);
+		return get(GangliaProperties::getDurationUnits,
+				GangliaConfig.super::durationUnits);
 	}
 
 	@Override
 	public String protocolVersion() {
-		return get(GangliaProperties::getProtocolVersion, GangliaConfig.super::protocolVersion);
+		return get(GangliaProperties::getProtocolVersion,
+				GangliaConfig.super::protocolVersion);
 	}
 
 	@Override
 	public GMetric.UDPAddressingMode addressingMode() {
-		return get(GangliaProperties::getAddressingMode, GangliaConfig.super::addressingMode);
+		return get(GangliaProperties::getAddressingMode,
+				GangliaConfig.super::addressingMode);
 	}
 
 	@Override

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphitePropertiesConfigAdapter.java

@@ -60,7 +60,8 @@ class GraphitePropertiesConfigAdapter
 
 	@Override
 	public TimeUnit durationUnits() {
-		return get(GraphiteProperties::getDurationUnits, GraphiteConfig.super::durationUnits);
+		return get(GraphiteProperties::getDurationUnits,
+				GraphiteConfig.super::durationUnits);
 	}
 
 	@Override

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxPropertiesConfigAdapter.java

@@ -57,7 +57,8 @@ class InfluxPropertiesConfigAdapter
 
 	@Override
 	public String retentionPolicy() {
-		return get(InfluxProperties::getRetentionPolicy, InfluxConfig.super::retentionPolicy);
+		return get(InfluxProperties::getRetentionPolicy,
+				InfluxConfig.super::retentionPolicy);
 	}
 
 	@Override

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusPropertiesConfigAdapter.java

@@ -43,7 +43,8 @@ class PrometheusPropertiesConfigAdapter
 
 	@Override
 	public boolean descriptions() {
-		return get(PrometheusProperties::getDescriptions, PrometheusConfig.super::descriptions);
+		return get(PrometheusProperties::getDescriptions,
+				PrometheusConfig.super::descriptions);
 	}
 
 	@Override

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdPropertiesConfigAdapter.java

@@ -63,12 +63,14 @@ public class StatsdPropertiesConfigAdapter extends
 
 	@Override
 	public int maxPacketLength() {
-		return get(StatsdProperties::getMaxPacketLength, StatsdConfig.super::maxPacketLength);
+		return get(StatsdProperties::getMaxPacketLength,
+				StatsdConfig.super::maxPacketLength);
 	}
 
 	@Override
 	public Duration pollingFrequency() {
-		return get(StatsdProperties::getPollingFrequency, StatsdConfig.super::pollingFrequency);
+		return get(StatsdProperties::getPollingFrequency,
+				StatsdConfig.super::pollingFrequency);
 	}
 
 	@Override

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogExportConfigurationTests.java

@@ -1,64 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.actuate.autoconfigure.metrics.export.datadog;
-
-import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
-import io.micrometer.datadog.DatadogMeterRegistry;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for {@link DatadogExportConfiguration}.
- *
- * @author Nikolay Rybak
- */
-@RunWith(SpringRunner.class)
-public class DatadogExportConfigurationTests {
-
-	/**
-	 * Validated that {@link DatadogMeterRegistry} can be started by only specifying Datadog API key.
-	 */
-	@Test
-	public void datadogMeterRegistryIsConfiguredWithApiKeyOnly() {
-		new ApplicationContextRunner()
-				.withPropertyValues("spring.metrics.export.atlas.enabled=false",
-						"spring.metrics.export.datadog.enabled=true",
-						"spring.metrics.export.ganglia.enabled=false",
-						"spring.metrics.export.graphite.enabled=false",
-						"spring.metrics.export.influx.enabled=false",
-						"spring.metrics.export.jmx.enabled=false",
-						"spring.metrics.export.prometheus.enabled=false",
-						"spring.metrics.export.statsd.enabled=false",
-						"spring.metrics.export.datadog.api-key=APIKEY")
-				.withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class))
-				.run((context) -> {
-					CompositeMeterRegistry meterRegistry = context
-							.getBean(CompositeMeterRegistry.class);
-					assertThat(meterRegistry.getRegistries()).hasSize(1);
-					assertThat(meterRegistry.getRegistries())
-							.hasOnlyElementsOfType(DatadogMeterRegistry.class);
-				});
-	}
-
-}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogPropertiesConfigAdapterTests.java

@@ -0,0 +1,47 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.autoconfigure.metrics.export.datadog;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link DatadogPropertiesConfigAdapter}.
+ *
+ * @author Stephane Nicoll
+ */
+public class DatadogPropertiesConfigAdapterTests {
+
+	@Test
+	public void apiKeyInferUri() {
+		DatadogProperties properties = new DatadogProperties();
+		properties.setApiKey("my-key");
+		assertThat(new DatadogPropertiesConfigAdapter(properties).uri())
+				.contains("?api_key=my-key");
+	}
+
+	@Test
+	public void uriCanBeSet() {
+		DatadogProperties properties = new DatadogProperties();
+		properties.setUri("https://app.example.com/api/v1/series");
+		properties.setApiKey("my-key");
+		assertThat(new DatadogPropertiesConfigAdapter(properties).uri())
+				.isEqualTo("https://app.example.com/api/v1/series");
+	}
+
+}