Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Start building against Micrometer snapshots for 1.1.0

Browse Source 
See gh-14890
This commit is contained in:
Andy Wilkinson
2018-10-19 17:24:22 +01:00
parent efbc0fc2ca
commit 4d9714a0cb
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapter.java
View File

@@ -33,14 +33,17 @@ class AppOpticsPropertiesConfigAdapter
super(properties);
}
@Override
public String uri() {
return get(AppOpticsProperties::getUri, AppOpticsConfig.super::uri);
}
public String token() {
return get(AppOpticsProperties::getApiToken, AppOpticsConfig.super::token);
@Override
public String apiToken() {
return get(AppOpticsProperties::getApiToken, AppOpticsConfig.super::apiToken);
}
@Override
public String hostTag() {
return get(AppOpticsProperties::getHostTag, AppOpticsConfig.super::hostTag);
}

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapterTests.java
View File

@@ -53,7 +53,7 @@ public class AppOpticsPropertiesConfigAdapterTests extends
public void whenPropertiesApiTokenIsSetAdapterApiTokenReturnsIt() {
AppOpticsProperties properties = createProperties();
properties.setApiToken("ABC123");
assertThat(createConfigAdapter(properties).token()).isEqualTo("ABC123");
assertThat(createConfigAdapter(properties).apiToken()).isEqualTo("ABC123");
}
@Test

2
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@@ -130,7 +130,7 @@
<logback.version>1.2.3</logback.version>
<lombok.version>1.18.2</lombok.version>
<mariadb.version>2.3.0</mariadb.version>
<micrometer.version>1.1.0-rc.1</micrometer.version>
<micrometer.version>1.1.0-SNAPSHOT</micrometer.version>
<mockito.version>2.23.0</mockito.version>
<mongo-driver-reactivestreams.version>1.9.2</mongo-driver-reactivestreams.version>
<mongodb.version>3.8.2</mongodb.version>