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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2014-08-15 00:55:40 +02:00
parent d2e269e697
commit b3add794d7
3 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 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.
@@ -27,24 +27,26 @@ import java.util.Set;
import javax.sql.DataSource;
import org.springframework.beans.BeansException;
import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.IndexedTestBean;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.tests.sample.beans.factory.DummyFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.beans.factory.support.MethodReplacer;
import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.IndexedTestBean;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.tests.sample.beans.factory.DummyFactory;
/**
* Types used by {@link XmlBeanFactoryTests} and its attendant XML config files.
*
* @author Chris Beams
*/
final class XmlBeanFactoryTestTypes { }
final class XmlBeanFactoryTestTypes {
}
/**
* Simple bean used to check constructor dependency checking.
@@ -176,15 +178,10 @@ abstract class ConstructorInjectedOverrides {
protected abstract FactoryMethods createFactoryMethods();
/**
* @return Returns the setterString.
*/
public String getSetterString() {
return setterString;
}
/**
* @param setterString The setterString to set.
*/
public void setSetterString(String setterString) {
this.setterString = setterString;
}
@@ -502,7 +499,7 @@ abstract class OverrideOneMethod extends MethodReplaceCandidate implements Overr
return new TestBean();
}
public TestBean invokesOverridenMethodOnSelf() {
public TestBean invokesOverriddenMethodOnSelf() {
return getPrototypeDependency();
}

2
spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
View File

@@ -1332,7 +1332,7 @@ public final class XmlBeanFactoryTests {
// This differs from Spring's AOP support, which has a distinct notion
// of a "target" object, meaning that the target needs explicit knowledge
// of AOP proxying to invoke an advised method on itself.
TestBean jenny3 = oom.invokesOverridenMethodOnSelf();
TestBean jenny3 = oom.invokesOverriddenMethodOnSelf();
assertEquals("Jenny", jenny3.getName());
assertNotSame(jenny1, jenny3);