Initial cut at migrating JavaConfig essentials into Core. test.basic.BasicTests successfully excercises the simplest possible @Configuration class (contains a single @Bean method). 39 classes were pulled in from from JavaConfig to support this use case.

org.springframework.config.java/src/test/java/test/basic/BasicTests.java

@@ -0,0 +1,110 @@
+package test.basic;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*;
+
+import org.junit.Test;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.config.java.annotation.Bean;
+import org.springframework.config.java.annotation.Configuration;
+import org.springframework.config.java.process.ConfigurationPostProcessor;
+import org.springframework.config.java.util.DefaultScopes;
+
+import test.beans.ITestBean;
+import test.beans.TestBean;
+
+public class BasicTests {
+	@Test
+	public void test() {
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerBeanDefinition("config", rootBeanDefinition(Config.class).getBeanDefinition());
+		
+		Config config = factory.getBean("config", Config.class);
+		assertThat(config, notNullValue());
+	}
+	
+	@Test
+	public void test2() {
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerBeanDefinition("config", rootBeanDefinition(Config.class).getBeanDefinition());
+		
+		BeanFactoryPostProcessor bfpp = new MyPostProcessor();
+		
+		bfpp.postProcessBeanFactory(factory);
+		
+		OtherConfig config = factory.getBean("config", OtherConfig.class);
+		assertThat(config, notNullValue());
+	}
+	
+	@Test
+	public void test3() {
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerBeanDefinition("config", rootBeanDefinition(Config.class).getBeanDefinition());
+		
+		new ConfigurationPostProcessor().postProcessBeanFactory(factory);
+		
+		String stringBean = factory.getBean("stringBean", String.class);
+		
+		assertThat(stringBean, equalTo("foo"));
+	}
+	
+	@Test
+	public void test4() {
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerBeanDefinition("config", rootBeanDefinition(Config2.class).getBeanDefinition());
+		
+		new ConfigurationPostProcessor().postProcessBeanFactory(factory);
+		
+		TestBean foo = factory.getBean("foo", TestBean.class);
+		ITestBean bar = factory.getBean("bar", ITestBean.class);
+		ITestBean baz = factory.getBean("baz", ITestBean.class);
+		
+		assertThat(foo.getSpouse(), sameInstance(bar));
+		assertThat(bar.getSpouse(), not(sameInstance(baz)));
+	}
+}
+
+class MyPostProcessor implements BeanFactoryPostProcessor {
+
+	public void postProcessBeanFactory(
+			ConfigurableListableBeanFactory beanFactory) throws BeansException {
+		BeanDefinition beanDefinition = beanFactory.getBeanDefinition("config");
+		beanDefinition.setBeanClassName(OtherConfig.class.getName());
+	}
+	
+}
+
+@Configuration
+class Config {
+	public @Bean String stringBean() {
+		return "foo";
+	}
+}
+
+@Configuration
+class Config2 {
+	public @Bean TestBean foo() {
+		TestBean foo = new TestBean("foo");
+		foo.setSpouse(bar());
+		return foo;
+	}
+	
+	public @Bean TestBean bar() {
+		TestBean bar = new TestBean("bar");
+		bar.setSpouse(baz());
+		return bar;
+	}
+	
+	@Bean(scope=DefaultScopes.PROTOTYPE) 
+	public TestBean baz() {
+		return new TestBean("bar");
+	}
+}
+
+class OtherConfig {
+}

org.springframework.config.java/src/test/java/test/beans/Colour.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2002-2008 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package test.beans;
+
+import org.springframework.core.enums.ShortCodedLabeledEnum;
+
+
+/**
+ * TODO: JAVADOC
+ *
+ * @author  Rob Harrop
+ */
+@SuppressWarnings("serial")
+public class Colour extends ShortCodedLabeledEnum {
+
+    public static final Colour RED = new Colour(0, "RED");
+
+    public static final Colour BLUE = new Colour(1, "BLUE");
+
+    public static final Colour GREEN = new Colour(2, "GREEN");
+
+    public static final Colour PURPLE = new Colour(3, "PURPLE");
+
+    private Colour(int code, String label) { super(code, label); }
+}

org.springframework.config.java/src/test/java/test/beans/DependsOnTestBean.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2002-2008 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package test.beans;
+
+
+/** TODO: JAVADOC */
+public class DependsOnTestBean {
+    public TestBean tb;
+
+    private int state;
+
+    public void setTestBean(TestBean tb) { this.tb = tb; }
+
+    public int getState() { return state; }
+
+    public TestBean getTestBean() { return tb; }
+
+}

org.springframework.config.java/src/test/java/test/beans/INestedTestBean.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2002-2008 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package test.beans;
+
+
+/** TODO: JAVADOC */
+public interface INestedTestBean {
+
+    String getCompany();
+
+}

org.springframework.config.java/src/test/java/test/beans/IOther.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2002-2008 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package test.beans;
+
+
+/** TODO: JAVADOC */
+public interface IOther {
+
+    void absquatulate();
+
+}

org.springframework.config.java/src/test/java/test/beans/ITestBean.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2002-2008 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package test.beans;
+
+import java.io.IOException;
+
+
+/**
+ * Interface used for test beans. Two methods are the same as on Person, but if
+ * this extends person it breaks quite a few tests
+ *
+ * @author  Rod Johnson
+ */
+public interface ITestBean {
+
+    int getAge();
+
+    void setAge(int age);
+
+    String getName();
+
+    void setName(String name);
+
+    ITestBean getSpouse();
+
+    void setSpouse(ITestBean spouse);
+
+    /**
+     * t null no error.
+     */
+    void exceptional(Throwable t) throws Throwable;
+
+    Object returnsThis();
+
+    INestedTestBean getDoctor();
+
+    INestedTestBean getLawyer();
+
+    IndexedTestBean getNestedIndexedBean();
+
+    /**
+     * Increment the age by one.
+     *
+     * @return  the previous age
+     */
+    int haveBirthday();
+
+    void unreliableFileOperation() throws IOException;
+}

org.springframework.config.java/src/test/java/test/beans/IndexedTestBean.java

@@ -0,0 +1,115 @@
+/*
+ * Copyright 2002-2008 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package test.beans;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+
+/**
+ * TODO: JAVADOC 
+ *
+ * @author  Juergen Hoeller
+ * @since   11.11.2003
+ */
+public class IndexedTestBean {
+
+    private TestBean[] array;
+
+    private Collection<TestBean> collection;
+
+    private List<TestBean> list;
+
+    private Set<TestBean> set;
+
+    private SortedSet<TestBean> sortedSet;
+
+    private Map<String, Object> map;
+
+    private SortedMap<String, TestBean> sortedMap;
+
+    public IndexedTestBean() { this(true); }
+
+    public IndexedTestBean(boolean populate) {
+        if (populate) {
+            populate();
+        }
+    }
+
+    public void populate() {
+        TestBean tb0 = new TestBean("name0", 0);
+        TestBean tb1 = new TestBean("name1", 0);
+        TestBean tb2 = new TestBean("name2", 0);
+        TestBean tb3 = new TestBean("name3", 0);
+        TestBean tb4 = new TestBean("name4", 0);
+        TestBean tb5 = new TestBean("name5", 0);
+        TestBean tb6 = new TestBean("name6", 0);
+        TestBean tb7 = new TestBean("name7", 0);
+        TestBean tbX = new TestBean("nameX", 0);
+        TestBean tbY = new TestBean("nameY", 0);
+        this.array = new TestBean[] { tb0, tb1 };
+        this.list = new ArrayList<TestBean>();
+        this.list.add(tb2);
+        this.list.add(tb3);
+        this.set = new TreeSet<TestBean>();
+        this.set.add(tb6);
+        this.set.add(tb7);
+        this.map = new HashMap<String, Object>();
+        this.map.put("key1", tb4);
+        this.map.put("key2", tb5);
+        this.map.put("key.3", tb5);
+        List<TestBean> list = new ArrayList<TestBean>();
+        list.add(tbX);
+        list.add(tbY);
+        this.map.put("key4", list);
+    }
+
+    public TestBean[] getArray() { return array; }
+
+    public void setArray(TestBean[] array) { this.array = array; }
+
+    public Collection<?> getCollection() { return collection; }
+
+    public void setCollection(Collection<TestBean> collection) { this.collection = collection; }
+
+    public List<TestBean> getList() { return list; }
+
+    public void setList(List<TestBean> list) { this.list = list; }
+
+    public Set<TestBean> getSet() { return set; }
+
+    public void setSet(Set<TestBean> set) { this.set = set; }
+
+    public SortedSet<TestBean> getSortedSet() { return sortedSet; }
+
+    public void setSortedSet(SortedSet<TestBean> sortedSet) { this.sortedSet = sortedSet; }
+
+    public Map<String, Object> getMap() { return map; }
+
+    public void setMap(Map<String, Object> map) { this.map = map; }
+
+    public SortedMap<String, TestBean> getSortedMap() { return sortedMap; }
+
+    public void setSortedMap(SortedMap<String, TestBean> sortedMap) { this.sortedMap = sortedMap; }
+
+}

org.springframework.config.java/src/test/java/test/beans/NestedTestBean.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2002-2008 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package test.beans;
+
+/**
+ * Simple nested test bean used for testing bean factories, AOP framework etc.
+ *
+ * @author  Trevor D. Cook
+ * @since   30.09.2003
+ */
+public class NestedTestBean implements INestedTestBean {
+
+    private String company = "";
+
+    public NestedTestBean() { }
+
+    public NestedTestBean(String company) {
+        setCompany(company);
+    }
+
+    public void setCompany(String company) {
+        this.company = ((company != null) ? company : "");
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof NestedTestBean)) {
+            return false;
+        }
+
+        NestedTestBean ntb = (NestedTestBean) obj;
+        return this.company.equals(ntb.company);
+    }
+
+    @Override
+    public int hashCode() {
+        return this.company.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return "NestedTestBean: " + this.company;
+    }
+
+}

org.springframework.config.java/src/test/java/test/beans/TestBean.java

@@ -0,0 +1,295 @@
+/*
+ * Copyright 2002-2008 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package test.beans;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.BeanNameAware;
+
+import org.springframework.util.ObjectUtils;
+
+import java.io.IOException;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+
+/**
+ * Simple test bean used for testing bean factories, AOP framework etc.
+ *
+ * @author  Rod Johnson
+ * @since   15 April 2001
+ */
+public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable<Object> {
+
+    private String beanName;
+
+    private String country;
+
+    private BeanFactory beanFactory;
+
+    private boolean postProcessed;
+
+    private String name;
+
+    private String sex;
+
+    private int age;
+
+    private boolean jedi;
+
+    private ITestBean spouse;
+
+    private String touchy;
+
+    private String[] stringArray;
+
+    private Integer[] someIntegerArray;
+
+    private Date date = new Date();
+
+    private Float myFloat = new Float(0.0);
+
+    private Collection<?> friends = new LinkedList<Object>();
+
+    private Set<?> someSet = new HashSet<Object>();
+
+    private Map<?, ?> someMap = new HashMap<Object, Object>();
+
+    private List<?> someList = new ArrayList<Object>();
+
+    private Properties someProperties = new Properties();
+
+    private INestedTestBean doctor = new NestedTestBean();
+
+    private INestedTestBean lawyer = new NestedTestBean();
+
+    private IndexedTestBean nestedIndexedBean;
+
+    private boolean destroyed;
+
+    private Number someNumber;
+
+    private Colour favouriteColour;
+
+    private Boolean someBoolean;
+
+    private List<?> otherColours;
+
+    private List<?> pets;
+
+    public TestBean() { }
+
+    public TestBean(String name) { this.name = name; }
+
+    public TestBean(ITestBean spouse) { this.spouse = spouse; }
+
+    public TestBean(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    public TestBean(ITestBean spouse, Properties someProperties) {
+        this.spouse = spouse;
+        this.someProperties = someProperties;
+    }
+
+    public void setBeanName(String beanName) { this.beanName = beanName; }
+
+    public String getBeanName() { return beanName; }
+
+    public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; }
+
+    public BeanFactory getBeanFactory() { return beanFactory; }
+
+    public void setPostProcessed(boolean postProcessed) { this.postProcessed = postProcessed; }
+
+    public boolean isPostProcessed() { return postProcessed; }
+
+    public String getName() { return name; }
+
+    public void setName(String name) { this.name = name; }
+
+    public String getSex() { return sex; }
+
+    public void setSex(String sex) { this.sex = sex; }
+
+    public int getAge() { return age; }
+
+    public void setAge(int age) { this.age = age; }
+
+    public boolean isJedi() { return jedi; }
+
+    public void setJedi(boolean jedi) { this.jedi = jedi; }
+
+    public ITestBean getSpouse() { return spouse; }
+
+    public void setSpouse(ITestBean spouse) { this.spouse = spouse; }
+
+    public String getTouchy() { return touchy; }
+
+    public void setTouchy(String touchy) throws Exception {
+        if (touchy.indexOf('.') != -1) {
+            throw new Exception("Can't contain a .");
+        }
+
+        if (touchy.indexOf(',') != -1) {
+            throw new NumberFormatException("Number format exception: contains a ,");
+        }
+
+        this.touchy = touchy;
+    }
+
+    public String getCountry() { return country; }
+
+    public void setCountry(String country) { this.country = country; }
+
+    public String[] getStringArray() { return stringArray; }
+
+    public void setStringArray(String[] stringArray) { this.stringArray = stringArray; }
+
+    public Integer[] getSomeIntegerArray() { return someIntegerArray; }
+
+    public void setSomeIntegerArray(Integer[] someIntegerArray) { this.someIntegerArray = someIntegerArray; }
+
+    public Date getDate() { return date; }
+
+    public void setDate(Date date) { this.date = date; }
+
+    public Float getMyFloat() { return myFloat; }
+
+    public void setMyFloat(Float myFloat) { this.myFloat = myFloat; }
+
+    public Collection<?> getFriends() { return friends; }
+
+    public void setFriends(Collection<?> friends) { this.friends = friends; }
+
+    public Set<?> getSomeSet() { return someSet; }
+
+    public void setSomeSet(Set<?> someSet) { this.someSet = someSet; }
+
+    public Map<?, ?> getSomeMap() { return someMap; }
+
+    public void setSomeMap(Map<?, ?> someMap) { this.someMap = someMap; }
+
+    public List<?> getSomeList() { return someList; }
+
+    public void setSomeList(List<?> someList) { this.someList = someList; }
+
+    public Properties getSomeProperties() { return someProperties; }
+
+    public void setSomeProperties(Properties someProperties) { this.someProperties = someProperties; }
+
+    public INestedTestBean getDoctor() { return doctor; }
+
+    public INestedTestBean getLawyer() { return lawyer; }
+
+    public void setDoctor(INestedTestBean bean) { doctor = bean; }
+
+    public void setLawyer(INestedTestBean bean) { lawyer = bean; }
+
+    public Number getSomeNumber() { return someNumber; }
+
+    public void setSomeNumber(Number someNumber) { this.someNumber = someNumber; }
+
+    public Colour getFavouriteColour() { return favouriteColour; }
+
+    public void setFavouriteColour(Colour favouriteColour) { this.favouriteColour = favouriteColour; }
+
+    public Boolean getSomeBoolean() { return someBoolean; }
+
+    public void setSomeBoolean(Boolean someBoolean) { this.someBoolean = someBoolean; }
+
+    public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; }
+
+    public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) { this.nestedIndexedBean = nestedIndexedBean; }
+
+    public List<?> getOtherColours() { return otherColours; }
+
+    public void setOtherColours(List<?> otherColours) { this.otherColours = otherColours; }
+
+    public List<?> getPets() { return pets; }
+
+    public void setPets(List<?> pets) { this.pets = pets; }
+
+    /**
+     * @see  ITestBean#exceptional(Throwable)
+     */
+    public void exceptional(Throwable t) throws Throwable {
+        if (t != null) {
+            throw t;
+        }
+    }
+
+    public void unreliableFileOperation() throws IOException { throw new IOException(); }
+
+    /**
+     * @see  ITestBean#returnsThis()
+     */
+    public Object returnsThis() { return this; }
+
+    /**
+     * @see  IOther#absquatulate()
+     */
+    public void absquatulate() { }
+
+    public int haveBirthday() { return age++; }
+
+    public void destroy() { this.destroyed = true; }
+
+    public boolean wasDestroyed() { return destroyed; }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+
+        if ((other == null) || !(other instanceof TestBean)) {
+            return false;
+        }
+
+        TestBean tb2 = (TestBean) other;
+        return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && (this.age == tb2.age));
+    }
+
+    @Override
+    public int hashCode() { return this.age; }
+
+    public int compareTo(Object other) {
+        if ((this.name != null) && (other instanceof TestBean)) {
+            return this.name.compareTo(((TestBean) other).getName());
+        }
+
+        return 1;
+    }
+
+    @Override
+    public String toString() {
+        String s = "name=" + name + "; age=" + age + "; touchy=" + touchy;
+        s += "; spouse={" + ((spouse != null) ? spouse.getName() : null) + "}";
+        return s;
+    }
+
+}