Fixup warnings

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

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

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

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

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

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