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

Merge pull request #3109 from izeye/patch-14 

* patch-14:
  Remove duplicate in MetricExportProperties
This commit is contained in:
Stephane Nicoll 2015-06-04 14:37:32 +02:00
parent 6c653038f6 5096a5d242
commit 0d1235ee2a
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java
View File

@ -35,12 +35,8 @@ import org.springframework.util.StringUtils;
@ConfigurationProperties("spring.metrics.export")
public class MetricExportProperties extends TriggerProperties {
/**
* Flag to disable all metric exports (assuming any MetricWriters are available).
*/
private boolean enabled = true;
private Map<String, SpecificTriggerProperties> triggers = new LinkedHashMap<String, SpecificTriggerProperties>();
private Map<String, SpecificTriggerProperties> triggers
= new LinkedHashMap<String, SpecificTriggerProperties>();
private Redis redis = new Redis();
@ -70,16 +66,6 @@ public class MetricExportProperties extends TriggerProperties {
}
}
@Override
public boolean isEnabled() {
return this.enabled;
}
@Override
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
/**
* Configuration for triggers on individual named writers. Each value can individually
* specify a name pattern explicitly, or else the map key will be used if the name is