From be884d4e339abcc51d05442366aadcc8a23e8436 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 29 Jun 2016 10:57:43 -0700 Subject: [PATCH] Polish --- .../java/org/springframework/boot/test/TestRestTemplate.java | 3 --- .../org/springframework/boot/bind/RelaxedPropertyResolver.java | 1 + .../boot/bind/RelaxedPropertyResolverTests.java | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/TestRestTemplate.java b/spring-boot-test/src/main/java/org/springframework/boot/test/TestRestTemplate.java index a51087bdfca..d3730809a01 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/TestRestTemplate.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/TestRestTemplate.java @@ -18,7 +18,6 @@ package org.springframework.boot.test; import java.io.IOException; import java.net.URI; -import java.nio.charset.Charset; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -55,8 +54,6 @@ import org.springframework.web.client.RestTemplate; @Deprecated public class TestRestTemplate extends RestTemplate { - private static final Charset UTF_8 = Charset.forName("UTF-8"); - /** * Create a new {@link TestRestTemplate} instance. * @param httpClientOptions client options to use if the Apache HTTP Client is used diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedPropertyResolver.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedPropertyResolver.java index f738cc6c23e..80ff09f91ee 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedPropertyResolver.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedPropertyResolver.java @@ -87,6 +87,7 @@ public class RelaxedPropertyResolver implements PropertyResolver { } @Override + @Deprecated public Class getPropertyAsClass(String key, Class targetType) { RelaxedNames prefixes = new RelaxedNames(this.prefix); RelaxedNames keys = new RelaxedNames(key); diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java index c361add35db..5b2079ac31f 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java @@ -119,6 +119,7 @@ public class RelaxedPropertyResolverTests { } @Test + @Deprecated public void getPropertyAsClass() throws Exception { assertThat(this.resolver.getPropertyAsClass("my-class", String.class)) .isEqualTo(String.class);