root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.2.x' 

Closes gh-20845
This commit is contained in:
Stephane Nicoll 2020-04-05 15:14:44 +02:00
parent 72f2afe1f3 1960c90d5f
commit a23700f323
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryProperties.java
View File

@ -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.
@ -92,10 +92,12 @@ public abstract class PushRegistryProperties {
this.readTimeout = readTimeout;
}
@Deprecated
public Integer getNumThreads() {
return this.numThreads;
}
@Deprecated
public void setNumThreads(Integer numThreads) {
this.numThreads = numThreads;
}

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesConfigAdapter.java
View File

@ -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.
@ -57,6 +57,7 @@ public abstract class PushRegistryPropertiesConfigAdapter<T extends PushRegistry
}
@Override
@SuppressWarnings("deprecation")
public int numThreads() {
return get(T::getNumThreads, PushRegistryConfig.super::numThreads);
}