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

Context namespace exposes null-value attribute for property-placeholder element

Browse Source 
Issue: SPR-13461
This commit is contained in:
Juergen Hoeller
2015-09-21 20:47:03 +02:00
parent b23c23279b
commit fbce18418a
6 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-context/src/test/java/org/springframework/context/config/ContextNamespaceHandlerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2011 the original author or authors.
* Copyright 2002-2015 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.
@@ -47,6 +47,7 @@ public class ContextNamespaceHandlerTests {
System.getProperties().remove("foo");
}
@Test
public void propertyPlaceholder() throws Exception {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
@@ -55,7 +56,8 @@ public class ContextNamespaceHandlerTests {
.getBeansOfType(PlaceholderConfigurerSupport.class);
assertFalse("No PropertyPlaceholderConfigurer found", beans.isEmpty());
String s = (String) applicationContext.getBean("string");
assertEquals("No properties replaced", "bar", s);
assertEquals("bar", s);
assertEquals("null", applicationContext.getBean("nullString"));
}
@Test
@@ -68,8 +70,9 @@ public class ContextNamespaceHandlerTests {
.getBeansOfType(PropertyPlaceholderConfigurer.class);
assertFalse("No PropertyPlaceholderConfigurer found", beans.isEmpty());
String s = (String) applicationContext.getBean("string");
assertEquals("No properties replaced", "spam", s);
} finally {
assertEquals("spam", s);
}
finally {
if (value!=null) {
System.setProperty("foo", value);
}
@@ -87,7 +90,7 @@ public class ContextNamespaceHandlerTests {
.getBeansOfType(PlaceholderConfigurerSupport.class);
assertFalse("No PropertyPlaceholderConfigurer found", beans.isEmpty());
String s = (String) applicationContext.getBean("string");
assertEquals("No properties replaced", "spam", s);
assertEquals("spam", s);
}
@Test
@@ -98,11 +101,11 @@ public class ContextNamespaceHandlerTests {
.getBeansOfType(PropertyPlaceholderConfigurer.class);
assertFalse("No PropertyPlaceholderConfigurer found", beans.isEmpty());
String s = (String) applicationContext.getBean("foo");
assertEquals("No properties replaced", "bar", s);
assertEquals("bar", s);
s = (String) applicationContext.getBean("bar");
assertEquals("No properties replaced", "foo", s);
assertEquals("foo", s);
s = (String) applicationContext.getBean("spam");
assertEquals("No properties replaced", "maps", s);
assertEquals("maps", s);
}
@Test
@@ -113,7 +116,8 @@ public class ContextNamespaceHandlerTests {
.getBeansOfType(PlaceholderConfigurerSupport.class);
assertFalse("No PropertyPlaceholderConfigurer found", beans.isEmpty());
String s = (String) applicationContext.getBean("string");
assertEquals("Properties replaced", "${bar}", s);
assertEquals("${bar}", s);
assertEquals("null", applicationContext.getBean("nullString"));
}
@Test
@@ -126,6 +130,7 @@ public class ContextNamespaceHandlerTests {
Date date = (Date) applicationContext.getBean("date");
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
assertEquals("No properties overriden", 42, calendar.get(Calendar.MINUTE));
assertEquals(42, calendar.get(Calendar.MINUTE));
}
}

14
spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace-ignore.xml
View File

@@ -1,18 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<util:properties id="placeholderProps">
<prop key="foo">bar</prop>
<prop key="baz"></prop>
</util:properties>
<context:property-placeholder properties-ref="placeholderProps" ignore-unresolvable="true"/>
<context:property-placeholder properties-ref="placeholderProps" ignore-unresolvable="true" null-value=""/>
<bean id="string" class="java.lang.String">
<constructor-arg value="${bar}"/>
</bean>
<bean id="nullString" class="java.lang.String" factory-method="valueOf">
<constructor-arg type="java.lang.Object" value="${baz}"/>
</bean>
</beans>

14
spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-replace.xml
View File

@@ -1,17 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd">
<util:properties id="placeholderProps">
<prop key="foo">bar</prop>
<prop key="bar">MYNULL</prop>
</util:properties>
<util:properties id="emptyProps"/>
<context:property-placeholder properties-ref="placeholderProps" order="2"/>
<context:property-placeholder properties-ref="placeholderProps" order="2" null-value="MYNULL"/>
<context:property-placeholder properties-ref="emptyProps" order="1" ignore-unresolvable="true"/>
@@ -21,4 +23,8 @@
<constructor-arg value="${foo}"/>
</bean>
<bean id="nullString" class="java.lang.String" factory-method="valueOf">
<constructor-arg type="java.lang.Object" value="${bar}"/>
</bean>
</beans>