Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deprecated getPropertyAsClass and refined PropertySourcesPropertyResolver's logging

Browse Source 
Issue: SPR-14370
This commit is contained in:
Juergen Hoeller
2016-06-29 10:51:06 +02:00
parent 37e42e68e8
commit 1d42009c0a
6 changed files with 60 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-core/src/test/java/org/springframework/core/env/DummyEnvironment.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2016 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.
@@ -44,6 +44,7 @@ public class DummyEnvironment implements Environment {
}
@Override
@Deprecated
public <T> Class<T> getPropertyAsClass(String key, Class<T> targetType) {
return null;
}
@@ -54,8 +55,7 @@ public class DummyEnvironment implements Environment {
}
@Override
public <T> T getRequiredProperty(String key, Class<T> targetType)
throws IllegalStateException {
public <T> T getRequiredProperty(String key, Class<T> targetType) throws IllegalStateException {
return null;
}
@@ -65,8 +65,7 @@ public class DummyEnvironment implements Environment {
}
@Override
public String resolveRequiredPlaceholders(String text)
throws IllegalArgumentException {
public String resolveRequiredPlaceholders(String text) throws IllegalArgumentException {
return null;
}

13
spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java vendored
View File

@@ -24,6 +24,7 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.core.convert.ConversionException;
import org.springframework.core.convert.ConverterNotFoundException;
import org.springframework.mock.env.MockPropertySource;
import static org.hamcrest.Matchers.*;
@@ -114,9 +115,9 @@ public class PropertySourcesPropertyResolverTests {
try {
propertyResolver.getProperty("foo", TestType.class);
fail("Expected IllegalArgumentException due to non-convertible types");
fail("Expected ConverterNotFoundException due to non-convertible types");
}
catch (IllegalArgumentException ex) {
catch (ConverterNotFoundException ex) {
// expected
}
}
@@ -272,7 +273,7 @@ public class PropertySourcesPropertyResolverTests {
assertTrue(resolver.getPropertyAsClass("some.class", SomeType.class).equals(SomeType.class));
}
@Test(expected=ConversionException.class)
@Test(expected = ConversionException.class)
public void getPropertyAsClass_withMismatchedTypeForValue() {
MutablePropertySources propertySources = new MutablePropertySources();
propertySources.addFirst(new MockPropertySource().withProperty("some.class", "java.lang.String"));
@@ -280,7 +281,7 @@ public class PropertySourcesPropertyResolverTests {
resolver.getPropertyAsClass("some.class", SomeType.class);
}
@Test(expected=ConversionException.class)
@Test(expected = ConversionException.class)
public void getPropertyAsClass_withNonExistentClassForValue() {
MutablePropertySources propertySources = new MutablePropertySources();
propertySources.addFirst(new MockPropertySource().withProperty("some.class", "some.bogus.Class"));
@@ -296,7 +297,7 @@ public class PropertySourcesPropertyResolverTests {
assertTrue(resolver.getPropertyAsClass("some.class", SomeType.class).equals(SpecificType.class));
}
@Test(expected=ConversionException.class)
@Test(expected = ConversionException.class)
public void getPropertyAsClass_withMismatchedObjectForValue() {
MutablePropertySources propertySources = new MutablePropertySources();
propertySources.addFirst(new MockPropertySource().withProperty("some.class", new Integer(42)));
@@ -312,7 +313,7 @@ public class PropertySourcesPropertyResolverTests {
assertTrue(resolver.getPropertyAsClass("some.class", SomeType.class).equals(SpecificType.class));
}
@Test(expected=ConversionException.class)
@Test(expected = ConversionException.class)
public void getPropertyAsClass_withMismatchedRealClassForValue() {
MutablePropertySources propertySources = new MutablePropertySources();
propertySources.addFirst(new MockPropertySource().withProperty("some.class", Integer.class));