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

Fixup warnings

This commit is contained in:
Phillip Webb 2016-04-28 16:50:03 -07:00
parent 08ef5f4b1f
commit 590bd5c084
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporterTests.java
View File

@ -60,15 +60,20 @@ public class MetricCopyExporterTests {
} }
@Test @Test
public void counterWithGaugeWriter() { public void counterWithGaugeWriter() throws Exception {
SimpleGaugeWriter writer = new SimpleGaugeWriter(); SimpleGaugeWriter writer = new SimpleGaugeWriter();
MetricCopyExporter exporter = new MetricCopyExporter(this.reader, writer); MetricCopyExporter exporter = new MetricCopyExporter(this.reader, writer);
this.reader.increment(new Delta<Number>("counter.foo", 2)); try {
exporter.export(); this.reader.increment(new Delta<Number>("counter.foo", 2));
this.reader.increment(new Delta<Number>("counter.foo", 3)); exporter.export();
exporter.export(); this.reader.increment(new Delta<Number>("counter.foo", 3));
exporter.flush(); exporter.export();
assertThat(writer.getValue().getValue()).isEqualTo(5L); exporter.flush();
assertThat(writer.getValue().getValue()).isEqualTo(5L);
}
finally {
exporter.close();
}
} }
@Test @Test

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java
View File

@ -101,7 +101,7 @@ public abstract class AbstractViewResolverProperties {
} }
public MimeType getContentType() { public MimeType getContentType() {
if (this.contentType.getCharSet() == null) { if (this.contentType.getCharset() == null) {
Map<String, String> parameters = new LinkedHashMap<String, String>(); Map<String, String> parameters = new LinkedHashMap<String, String>();
parameters.put("charset", this.charset.name()); parameters.put("charset", this.charset.name());
parameters.putAll(this.contentType.getParameters()); parameters.putAll(this.contentType.getParameters());

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
View File

@ -253,7 +253,7 @@ public class ThymeleafAutoConfiguration {
} }
private String appendCharset(MimeType type, String charset) { private String appendCharset(MimeType type, String charset) {
if (type.getCharSet() != null) { if (type.getCharset() != null) {
return type.toString(); return type.toString();
} }
LinkedHashMap<String, String> parameters = new LinkedHashMap<String, String>(); LinkedHashMap<String, String> parameters = new LinkedHashMap<String, String>();