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

Whitespace polishing: leading spaces->tabs; updated eclipse configuration to default to leading tabs for all bundles

Browse Source
This commit is contained in:
Chris Beams
2008-12-18 14:50:25 +00:00
parent 0f521c3bfb
commit 579280d7bf
87 changed files with 4294 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
View File

@@ -1311,7 +1311,7 @@ public class BeanWrapperTests extends TestCase {
}
public void testSetNumberProperties() {
NumberPropertyBean bean = new NumberPropertyBean();
NumberPropertyBean bean = new NumberPropertyBean();
BeanWrapper bw = new BeanWrapperImpl(bean);
String byteValue = " " + Byte.MAX_VALUE + " ";

6
org.springframework.beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@@ -1973,7 +1973,7 @@ public class DefaultListableBeanFactoryTests {
}
@SuppressWarnings("unchecked")
private void doTestFieldSettingWithInstantiationAwarePostProcessor(final boolean skipPropertyPopulation) {
private void doTestFieldSettingWithInstantiationAwarePostProcessor(final boolean skipPropertyPopulation) {
DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
int ageSetByPropertyValue = 27;
@@ -2008,7 +2008,7 @@ public class DefaultListableBeanFactoryTests {
}
@SuppressWarnings("unchecked")
@Test
@Test
public void testInitSecurityAwarePrototypeBean() {
final DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
RootBeanDefinition bd = new RootBeanDefinition(TestSecuredBean.class);
@@ -2267,7 +2267,7 @@ public class DefaultListableBeanFactoryTests {
}
@SuppressWarnings("unchecked")
public Object convertIfNecessary(Object value, Class requiredType) {
public Object convertIfNecessary(Object value, Class requiredType) {
return convertIfNecessary(value, requiredType, null);
}

4
org.springframework.beans/src/test/java/org/springframework/beans/factory/PackageLevelVisibleBean.java
View File

@@ -24,5 +24,5 @@ package org.springframework.beans.factory;
*/
class PackageLevelVisibleBean {
public static final String CONSTANT = "Wuby";
}
public static final String CONSTANT = "Wuby";
}

134
org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
View File

@@ -53,9 +53,9 @@ import org.springframework.core.io.Resource;
* @author Chris Beams
*/
public class PropertyResourceConfigurerTests {
private DefaultListableBeanFactory factory;
@Before
public void setUp() {
factory = new DefaultListableBeanFactory();
@@ -67,15 +67,15 @@ public class PropertyResourceConfigurerTests {
.genericBeanDefinition(TestBean.class)
.getBeanDefinition();
factory.registerBeanDefinition("tb1", def1);
BeanDefinition def2 = BeanDefinitionBuilder
.genericBeanDefinition(TestBean.class)
.getBeanDefinition();
factory.registerBeanDefinition("tb2", def2);
PropertyOverrideConfigurer poc1;
PropertyOverrideConfigurer poc2;
{
poc1 = new PropertyOverrideConfigurer();
Properties props = new Properties();
@@ -83,7 +83,7 @@ public class PropertyResourceConfigurerTests {
props.setProperty("tb2.name", "test");
poc1.setProperties(props);
}
{
poc2 = new PropertyOverrideConfigurer();
Properties props = new Properties();
@@ -91,14 +91,14 @@ public class PropertyResourceConfigurerTests {
props.setProperty("tb2.name", "test2");
poc2.setProperties(props);
}
// emulate what happens when BFPPs are added to an application context: It's LIFO-based
poc2.postProcessBeanFactory(factory);
poc1.postProcessBeanFactory(factory);
TestBean tb1 = (TestBean) factory.getBean("tb1");
TestBean tb2 = (TestBean) factory.getBean("tb2");
assertEquals(99, tb1.getAge());
assertEquals(99, tb2.getAge());
assertEquals(null, tb1.getName());
@@ -111,7 +111,7 @@ public class PropertyResourceConfigurerTests {
.genericBeanDefinition(IndexedTestBean.class)
.getBeanDefinition();
factory.registerBeanDefinition("tb", def);
PropertyOverrideConfigurer poc;
poc = new PropertyOverrideConfigurer();
Properties props = new Properties();
@@ -119,7 +119,7 @@ public class PropertyResourceConfigurerTests {
props.setProperty("tb.list[1].name", "test");
poc.setProperties(props);
poc.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("tb");
assertEquals(99, tb.getArray()[0].getAge());
assertEquals("test", ((TestBean) tb.getList().get(1)).getName());
@@ -131,7 +131,7 @@ public class PropertyResourceConfigurerTests {
.genericBeanDefinition(IndexedTestBean.class)
.getBeanDefinition();
factory.registerBeanDefinition("my.tb", def);
PropertyOverrideConfigurer poc;
poc = new PropertyOverrideConfigurer();
Properties props = new Properties();
@@ -140,7 +140,7 @@ public class PropertyResourceConfigurerTests {
poc.setProperties(props);
poc.setBeanNameSeparator("_");
poc.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("my.tb");
assertEquals(99, tb.getArray()[0].getAge());
assertEquals("test", ((TestBean) tb.getList().get(1)).getName());
@@ -152,7 +152,7 @@ public class PropertyResourceConfigurerTests {
.genericBeanDefinition(IndexedTestBean.class)
.getBeanDefinition();
factory.registerBeanDefinition("tb", def);
PropertyOverrideConfigurer poc;
poc = new PropertyOverrideConfigurer();
Properties props = new Properties();
@@ -160,40 +160,40 @@ public class PropertyResourceConfigurerTests {
props.setProperty("tb.map[key2.ext]", "test");
poc.setProperties(props);
poc.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("tb");
assertEquals("99", tb.getMap().get("key1"));
assertEquals("test", tb.getMap().get("key2.ext"));
}
@Test
public void testPropertyOverrideConfigurerWithHeldProperties() {
BeanDefinition def = BeanDefinitionBuilder
.genericBeanDefinition(PropertiesHolder.class)
.getBeanDefinition();
factory.registerBeanDefinition("tb", def);
PropertyOverrideConfigurer poc;
poc = new PropertyOverrideConfigurer();
Properties props = new Properties();
props.setProperty("tb.heldProperties[mail.smtp.auth]", "true");
poc.setProperties(props);
poc.postProcessBeanFactory(factory);
PropertiesHolder tb = (PropertiesHolder) factory.getBean("tb");
assertEquals("true", tb.getHeldProperties().getProperty("mail.smtp.auth"));
}
static class PropertiesHolder {
private Properties props = new Properties();
private Properties props = new Properties();
public Properties getHeldProperties() {
return props;
}
public Properties getHeldProperties() {
return props;
}
public void setHeldProperties(Properties props) {
this.props = props;
}
public void setHeldProperties(Properties props) {
this.props = props;
}
}
@Test
@@ -202,11 +202,11 @@ public class PropertyResourceConfigurerTests {
.genericBeanDefinition(IndexedTestBean.class)
.getBeanDefinition();
factory.registerBeanDefinition("tb", def);
PropertyOverrideConfigurer poc = new PropertyOverrideConfigurer();
poc.setLocation(new ClassPathResource("org/springframework/beans/factory/config/test.properties"));
poc.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("tb");
assertEquals(99, tb.getArray()[0].getAge());
assertEquals("test", ((TestBean) tb.getList().get(1)).getName());
@@ -218,7 +218,7 @@ public class PropertyResourceConfigurerTests {
.genericBeanDefinition(IndexedTestBean.class)
.getBeanDefinition();
factory.registerBeanDefinition("tb", def);
PropertyOverrideConfigurer poc = new PropertyOverrideConfigurer();
poc.setLocations(new Resource[] {
new ClassPathResource("org/springframework/beans/factory/config/test.properties"),
@@ -227,7 +227,7 @@ public class PropertyResourceConfigurerTests {
);
poc.setIgnoreResourceNotFound(true);
poc.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("tb");
assertEquals(99, tb.getArray()[0].getAge());
assertEquals("test", ((TestBean) tb.getList().get(1)).getName());
@@ -239,11 +239,11 @@ public class PropertyResourceConfigurerTests {
.genericBeanDefinition(IndexedTestBean.class)
.getBeanDefinition();
factory.registerBeanDefinition("tb", def);
PropertyOverrideConfigurer poc = new PropertyOverrideConfigurer();
poc.setLocation(new ClassPathResource("org/springframework/beans/factory/config/test-properties.xml"));
poc.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("tb");
assertEquals(99, tb.getArray()[0].getAge());
assertEquals("test", ((TestBean) tb.getList().get(1)).getName());
@@ -255,14 +255,14 @@ public class PropertyResourceConfigurerTests {
.genericBeanDefinition(IndexedTestBean.class)
.getBeanDefinition();
factory.registerBeanDefinition("tb", def);
ConvertingOverrideConfigurer bfpp = new ConvertingOverrideConfigurer();
Properties props = new Properties();
props.setProperty("tb.array[0].name", "99");
props.setProperty("tb.list[1].name", "test");
bfpp.setProperties(props);
bfpp.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("tb");
assertEquals("X99", tb.getArray()[0].getName());
assertEquals("Xtest", ((TestBean) tb.getList().get(1)).getName());
@@ -272,7 +272,7 @@ public class PropertyResourceConfigurerTests {
public void testPropertyOverrideConfigurerWithInvalidKey() {
factory.registerBeanDefinition("tb1", genericBeanDefinition(TestBean.class).getBeanDefinition());
factory.registerBeanDefinition("tb2", genericBeanDefinition(TestBean.class).getBeanDefinition());
{
PropertyOverrideConfigurer poc = new PropertyOverrideConfigurer();
poc.setIgnoreInvalidKeys(true);
@@ -303,7 +303,7 @@ public class PropertyResourceConfigurerTests {
public void testPropertyOverrideConfigurerWithIgnoreInvalidKeys() {
factory.registerBeanDefinition("tb1", genericBeanDefinition(TestBean.class).getBeanDefinition());
factory.registerBeanDefinition("tb2", genericBeanDefinition(TestBean.class).getBeanDefinition());
{
PropertyOverrideConfigurer poc = new PropertyOverrideConfigurer();
Properties props = new Properties();
@@ -323,7 +323,7 @@ public class PropertyResourceConfigurerTests {
poc.setProperties(props);
poc.postProcessBeanFactory(factory);
}
TestBean tb1 = (TestBean) factory.getBean("tb1");
TestBean tb2 = (TestBean) factory.getBean("tb2");
assertEquals(99, tb1.getAge());
@@ -440,7 +440,7 @@ public class PropertyResourceConfigurerTests {
factory.registerBeanDefinition("tb",
genericBeanDefinition(TestBean.class)
.addPropertyValue("touchy", "${os.name}").getBeanDefinition());
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
ppc.postProcessBeanFactory(factory);
@@ -453,13 +453,13 @@ public class PropertyResourceConfigurerTests {
factory.registerBeanDefinition("tb",
genericBeanDefinition(TestBean.class)
.addPropertyValue("touchy", "${os.name}").getBeanDefinition());
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
Properties props = new Properties();
props.setProperty("os.name", "myos");
ppc.setProperties(props);
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("myos", tb.getTouchy());
}
@@ -469,14 +469,14 @@ public class PropertyResourceConfigurerTests {
factory.registerBeanDefinition("tb",
genericBeanDefinition(TestBean.class)
.addPropertyValue("touchy", "${os.name}").getBeanDefinition());
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
Properties props = new Properties();
props.put("os.name", "myos");
ppc.setProperties(props);
ppc.setSystemPropertiesMode(PropertyPlaceholderConfigurer.SYSTEM_PROPERTIES_MODE_OVERRIDE);
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals(System.getProperty("os.name"), tb.getTouchy());
}
@@ -486,10 +486,10 @@ public class PropertyResourceConfigurerTests {
factory.registerBeanDefinition("tb",
genericBeanDefinition(TestBean.class)
.addPropertyValue("touchy", "${user.dir}").getBeanDefinition());
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
ppc.setSystemPropertiesMode(PropertyPlaceholderConfigurer.SYSTEM_PROPERTIES_MODE_NEVER);
try {
ppc.postProcessBeanFactory(factory);
fail("Should have thrown BeanDefinitionStoreException");
@@ -505,9 +505,9 @@ public class PropertyResourceConfigurerTests {
factory.registerBeanDefinition("tb",
genericBeanDefinition(TestBean.class)
.addPropertyValue("name", "${ref}").getBeanDefinition());
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
try {
ppc.postProcessBeanFactory(factory);
fail("Should have thrown BeanDefinitionStoreException");
@@ -523,11 +523,11 @@ public class PropertyResourceConfigurerTests {
factory.registerBeanDefinition("tb",
genericBeanDefinition(TestBean.class)
.addPropertyValue("name", "${ref}").getBeanDefinition());
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
ppc.setIgnoreUnresolvablePlaceholders(true);
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("${ref}", tb.getName());
}
@@ -537,11 +537,11 @@ public class PropertyResourceConfigurerTests {
factory.registerBeanDefinition("tb",
genericBeanDefinition(TestBean.class)
.addPropertyValue("name", "").getBeanDefinition());
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
ppc.setNullValue("");
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertNull(tb.getName());
}
@@ -551,14 +551,14 @@ public class PropertyResourceConfigurerTests {
factory.registerBeanDefinition("tb",
genericBeanDefinition(TestBean.class)
.addPropertyValue("name", "${ref}").getBeanDefinition());
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
ppc.setNullValue("");
Properties props = new Properties();
props.put("ref", "");
ppc.setProperties(props);
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertNull(tb.getName());
}
@@ -568,18 +568,18 @@ public class PropertyResourceConfigurerTests {
factory.registerBeanDefinition("tb",
genericBeanDefinition(TestBean.class)
.addPropertyValue("name", "${my${key}key}").getBeanDefinition());
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
Properties props = new Properties();
props.put("key", "new");
props.put("mynewkey", "myname");
ppc.setProperties(props);
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("myname", tb.getName());
}
@Test
public void testPropertyPlaceholderConfigurerWithCircularReference() {
factory.registerBeanDefinition("tb",
@@ -587,14 +587,14 @@ public class PropertyResourceConfigurerTests {
.addPropertyValue("age", "${age}")
.addPropertyValue("name", "name${var}")
.getBeanDefinition());
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
Properties props = new Properties();
props.setProperty("age", "99");
props.setProperty("var", "${m}");
props.setProperty("m", "${var}");
ppc.setProperties(props);
try {
ppc.postProcessBeanFactory(factory);
fail("Should have thrown BeanDefinitionStoreException");
@@ -609,13 +609,13 @@ public class PropertyResourceConfigurerTests {
factory.registerBeanDefinition("tb",
genericBeanDefinition(TestBean.class)
.addPropertyValue("touchy", "${test}").getBeanDefinition());
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
Properties props = new Properties();
props.put("test", "mytest");
ppc.setProperties(props);
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("mytest", tb.getTouchy());
}
@@ -648,10 +648,10 @@ public class PropertyResourceConfigurerTests {
factory.registerBeanDefinition("tb",
genericBeanDefinition(TestBean.class)
.addPropertyValue("touchy", "${test}").getBeanDefinition());
factory.registerAlias("tb", "${myAlias}");
factory.registerAlias("${myTarget}", "alias2");
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
Properties props = new Properties();
props.put("test", "mytest");
@@ -659,7 +659,7 @@ public class PropertyResourceConfigurerTests {
props.put("myTarget", "tb");
ppc.setProperties(props);
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("mytest", tb.getTouchy());
tb = (TestBean) factory.getBean("alias");
@@ -676,7 +676,7 @@ public class PropertyResourceConfigurerTests {
.addPropertyValue("age", "${myAge}")
.addPropertyValue("touchy", "${myTouchy}")
.getBeanDefinition());
PreferencesPlaceholderConfigurer ppc = new PreferencesPlaceholderConfigurer();
Properties props = new Properties();
props.put("myAge", "99");
@@ -704,7 +704,7 @@ public class PropertyResourceConfigurerTests {
.addPropertyValue("age", "${myAge}")
.addPropertyValue("touchy", "${myTouchy}")
.getBeanDefinition());
PreferencesPlaceholderConfigurer ppc = new PreferencesPlaceholderConfigurer();
Properties props = new Properties();
props.put("myAge", "99");
@@ -716,7 +716,7 @@ public class PropertyResourceConfigurerTests {
Preferences.userRoot().node("myUserPath").put("myTouchy", "myOtherTouchyValue");
ppc.afterPropertiesSet();
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("myNameValue", tb.getName());
assertEquals(99, tb.getAge());
@@ -734,7 +734,7 @@ public class PropertyResourceConfigurerTests {
.addPropertyValue("age", "${myAge}")
.addPropertyValue("touchy", "${myotherpath/myTouchy}")
.getBeanDefinition());
PreferencesPlaceholderConfigurer ppc = new PreferencesPlaceholderConfigurer();
Properties props = new Properties();
props.put("myAge", "99");
@@ -746,7 +746,7 @@ public class PropertyResourceConfigurerTests {
Preferences.userRoot().node("myUserPath/myotherpath").put("myTouchy", "myOtherTouchyValue");
ppc.afterPropertiesSet();
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("myNameValue", tb.getName());
assertEquals(99, tb.getAge());

28
org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
View File

@@ -337,26 +337,26 @@ public class FactoryMethodTests {
assertEquals("someuser", session.getProperty("mail.smtp.user"));
assertEquals("somepw", session.getProperty("mail.smtp.password"));
}
}
class MailSession {
private Properties props;
private MailSession() {
private MailSession() {
}
public void setProperties(Properties props) {
this.props = props;
this.props = props;
}
public static MailSession getDefaultInstance(Properties props) {
MailSession session = new MailSession();
session.setProperties(props);
return session;
}
public Object getProperty(String key) {
return props.get(key);
}
public static MailSession getDefaultInstance(Properties props) {
MailSession session = new MailSession();
session.setProperties(props);
return session;
}
public Object getProperty(String key) {
return props.get(key);
}
}

12
org.springframework.beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
View File

@@ -31,7 +31,7 @@ import org.springframework.util.comparator.CompoundComparator;
*/
public class PropertyComparatorTests {
@Test
@Test
public void testPropertyComparator() {
Dog dog = new Dog();
dog.setNickName("mace");
@@ -45,7 +45,7 @@ public class PropertyComparatorTests {
assertTrue(c.compare(dog2, dog) < 0);
}
@Test
@Test
public void testPropertyComparatorNulls() {
Dog dog = new Dog();
Dog dog2 = new Dog();
@@ -53,8 +53,8 @@ public class PropertyComparatorTests {
assertTrue(c.compare(dog, dog2) == 0);
}
@SuppressWarnings("unchecked")
@Test
@SuppressWarnings("unchecked")
@Test
public void testCompoundComparator() {
CompoundComparator<Dog> c = new CompoundComparator<Dog>();
c.addComparator(new PropertyComparator("lastName", false, true));
@@ -76,8 +76,8 @@ public class PropertyComparatorTests {
assertTrue(c.compare(dog2, dog1) > 0);
}
@SuppressWarnings("unchecked")
@Test
@SuppressWarnings("unchecked")
@Test
public void testCompoundComparatorInvert() {
CompoundComparator<Dog> c = new CompoundComparator<Dog>();
c.addComparator(new PropertyComparator("lastName", false, true));